X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdynamic-string.c;h=3af7fc9f56634e169b757e93c1abf8f39095597a;hb=cf6cb3a2ab31a16b01e18e1db2d601e92f2a405e;hp=c3338180d250aed389c432031598fde630cb8afa;hpb=a0bc29a541fc7dc6e20137d5558e2094d614e6ab;p=sliver-openvswitch.git

diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c
index c3338180d..3af7fc9f5 100644
--- a/lib/dynamic-string.c
+++ b/lib/dynamic-string.c
@@ -32,7 +32,7 @@ ds_init(struct ds *ds)
 }
 
 void
-ds_clear(struct ds *ds) 
+ds_clear(struct ds *ds)
 {
     ds->length = 0;
 }
@@ -66,7 +66,7 @@ ds_put_uninit(struct ds *ds, size_t n)
 }
 
 void
-ds_put_char(struct ds *ds, char c)
+ds_put_char__(struct ds *ds, char c)
 {
     *ds_put_uninit(ds, 1) = c;
 }
@@ -147,8 +147,6 @@ ds_put_format_valist(struct ds *ds, const char *format, va_list args_)
     if (needed < available) {
         ds->length += needed;
     } else {
-        size_t available;
-
         ds_reserve(ds, ds->length + needed);
 
         va_copy(args, args_);
@@ -162,7 +160,7 @@ ds_put_format_valist(struct ds *ds, const char *format, va_list args_)
 }
 
 void
-ds_put_printable(struct ds *ds, const char *s, size_t n) 
+ds_put_printable(struct ds *ds, const char *s, size_t n)
 {
     ds_reserve(ds, ds->length + n);
     while (n-- > 0) {
@@ -179,7 +177,7 @@ void
 ds_put_strftime(struct ds *ds, const char *template, const struct tm *tm)
 {
     if (!tm) {
-        time_t now = time_now();
+        time_t now = time_wall();
         tm = localtime(&now);
     }
     for (;;) {
@@ -189,7 +187,7 @@ ds_put_strftime(struct ds *ds, const char *template, const struct tm *tm)
             ds->length += used;
             return;
         }
-        ds_reserve(ds, ds->length + (avail < 32 ? 64 : 2 * avail)); 
+        ds_reserve(ds, ds->length + (avail < 32 ? 64 : 2 * avail));
     }
 }