X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdynamic-string.c;h=3af7fc9f56634e169b757e93c1abf8f39095597a;hb=d530fcd2425c2443c1a1c093903b6932c4c5814c;hp=180a4301c3fe218eb3b65e69713f006b70a217dc;hpb=c73814a3e6cbdf8c4083ef1d510377e41cb82f6a;p=openvswitch diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c index 180a4301..3af7fc9f 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; } @@ -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) { @@ -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)); } }