lib: Avoid using C++ keywords as variable names in header files.

Otherwise C++ programs can't #include the headers.

Signed-off-by: Amit Bose <bose@noironetworks.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/AUTHORS b/AUTHORS
index 2d30cb1..cf8fda5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@ Alexey I. Froloff       raorn@altlinux.org
 Alex Wang               alexw@nicira.com
 Alfredo Finelli         alf@computationes.de
 Alin Serdean            aserdean@cloudbasesolutions.com
+Amit Bose               bose@noironetworks.com
 Andrew Evans            aevans@nicira.com
 Andrew Lambeth          wal@nicira.com
 Andy Hill               hillad@gmail.com

diff --git a/lib/dynamic-string.h b/lib/dynamic-string.h
index 2272343..396a24e 100644 (file)
--- a/lib/dynamic-string.h
+++ b/lib/dynamic-string.h
@@ -61,9 +61,9 @@ int ds_get_line(struct ds *, FILE *);
 int ds_get_preprocessed_line(struct ds *, FILE *, int *line_number);
 int ds_get_test_line(struct ds *, FILE *);
 
-void ds_put_strftime_msec(struct ds *, const char *template, long long int when,
+void ds_put_strftime_msec(struct ds *, const char *format, long long int when,
                          bool utc);
-char *xastrftime_msec(const char *template, long long int when, bool utc);
+char *xastrftime_msec(const char *format, long long int when, bool utc);
 
 char *ds_cstr(struct ds *);
 const char *ds_cstr_ro(const struct ds *);