[ovs-dev] [PATCH 10/11] lib: Avoid using C++ keywords as variable names

[Thomas Graf]

From: Amit Bose <bose at noironetworks.com>

Signed-off-by: Amit Bose <bose at noironetworks.com>
---
 AUTHORS              | 1 +
 lib/dynamic-string.h | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b5ac696..84fca3a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@ Alexey I. Froloff       raorn at altlinux.org
 Alex Wang               alexw at nicira.com
 Alfredo Finelli         alf at computationes.de
 Alin Serdean            aserdean at cloudbasesolutions.com
+Amit Bose               bose at noironetworks.com
 Andrew Evans            aevans at nicira.com
 Andrew Lambeth          wal at nicira.com
 Andy Hill               hillad at gmail.com
diff --git a/lib/dynamic-string.h b/lib/dynamic-string.h
index 2272343..396a24e 100644
--- 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 *);
-- 
1.9.3