git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Global replace of Nicira Networks.
[sliver-openvswitch.git]
/
lib
/
dynamic-string.c
diff --git
a/lib/dynamic-string.c
b/lib/dynamic-string.c
index
dbb33a3
..
e672af4
100644
(file)
--- a/
lib/dynamic-string.c
+++ b/
lib/dynamic-string.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2011
, 2012 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,6
+23,7
@@
#include "timeval.h"
#include "util.h"
#include "timeval.h"
#include "util.h"
+/* Initializes 'ds' as an empty string buffer. */
void
ds_init(struct ds *ds)
{
void
ds_init(struct ds *ds)
{
@@
-31,12
+32,16
@@
ds_init(struct ds *ds)
ds->allocated = 0;
}
ds->allocated = 0;
}
+/* Sets 'ds''s length to 0, effectively clearing any existing content. Does
+ * not free any memory. */
void
ds_clear(struct ds *ds)
{
ds->length = 0;
}
void
ds_clear(struct ds *ds)
{
ds->length = 0;
}
+/* Reduces 'ds''s length to no more than 'new_length'. (If its length is
+ * already 'new_length' or less, does nothing.) */
void
ds_truncate(struct ds *ds, size_t new_length)
{
void
ds_truncate(struct ds *ds, size_t new_length)
{
@@
-46,6
+51,9
@@
ds_truncate(struct ds *ds, size_t new_length)
}
}
}
}
+/* Ensures that at least 'min_length + 1' bytes (including space for a null
+ * terminator) are allocated for ds->string, allocating or reallocating memory
+ * as necessary. */
void
ds_reserve(struct ds *ds, size_t min_length)
{
void
ds_reserve(struct ds *ds, size_t min_length)
{
@@
-56,6
+64,9
@@
ds_reserve(struct ds *ds, size_t min_length)
}
}
}
}
+/* Appends space for 'n' bytes to the end of 'ds->string', increasing
+ * 'ds->length' by the same amount, and returns the first appended byte. The
+ * caller should fill in all 'n' bytes starting at the return value. */
char *
ds_put_uninit(struct ds *ds, size_t n)
{
char *
ds_put_uninit(struct ds *ds, size_t n)
{
@@
-173,13
+184,19
@@
ds_put_printable(struct ds *ds, const char *s, size_t n)
}
}
}
}
+/* Writes the current time to 'string' based on 'template'.
+ * The current time is either localtime or UTC based on 'utc'. */
void
void
-ds_put_strftime(struct ds *ds, const char *template,
const struct tm *tm
)
+ds_put_strftime(struct ds *ds, const char *template,
bool utc
)
{
{
- if (!tm) {
- time_t now = time_wall();
+ const struct tm *tm;
+ time_t now = time_wall();
+ if (utc) {
+ tm = gmtime(&now);
+ } else {
tm = localtime(&now);
}
tm = localtime(&now);
}
+
for (;;) {
size_t avail = ds->string ? ds->allocated - ds->length + 1 : 0;
size_t used = strftime(&ds->string[ds->length], avail, template, tm);
for (;;) {
size_t avail = ds->string ? ds->allocated - ds->length + 1 : 0;
size_t used = strftime(&ds->string[ds->length], avail, template, tm);