Rename smartlist_{v,}asprintf_add to smartlist_add_{v,}asprintf

diff --git a/src/common/util.c b/src/common/util.c
index 22c816abcc15e093f0c117ccbc8666a5ff6d7e52..a4a7006ad8b32eadffa0553d946b104940160758 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2757,17 +2757,17 @@ tor_sscanf(const char *buf, const char *pattern, ...)
 /** Append the string produced by tor_asprintf(<b>pattern</b>, <b>...</b>)
  * to <b>sl</b>. */
 void
-smartlist_asprintf_add(struct smartlist_t *sl, const char *pattern, ...)
+smartlist_add_asprintf(struct smartlist_t *sl, const char *pattern, ...)
 {
   va_list ap;
   va_start(ap, pattern);
-  smartlist_vasprintf_add(sl, pattern, ap);
+  smartlist_add_vasprintf(sl, pattern, ap);
   va_end(ap);
 }
 
-/** va_list-based backend of smartlist_asprintf_add. */
+/** va_list-based backend of smartlist_add_asprintf. */
 void
-smartlist_vasprintf_add(struct smartlist_t *sl, const char *pattern,
+smartlist_add_vasprintf(struct smartlist_t *sl, const char *pattern,
                         va_list args)
 {
   char *str = NULL;

diff --git a/src/common/util.h b/src/common/util.h
index cbc56d0816e511070037f4e529fe001d35a47754..b15b1ea56a4493c8140e7f7b6498c75248a3fcba 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -218,9 +218,9 @@ int tor_sscanf(const char *buf, const char *pattern, ...)
 #endif
   ;
 
-void smartlist_asprintf_add(struct smartlist_t *sl, const char *pattern, ...)
+void smartlist_add_asprintf(struct smartlist_t *sl, const char *pattern, ...)
   CHECK_PRINTF(2, 3);
-void smartlist_vasprintf_add(struct smartlist_t *sl, const char *pattern,
+void smartlist_add_vasprintf(struct smartlist_t *sl, const char *pattern,
                              va_list args);
 
 int hex_decode_digit(char c);

diff --git a/src/or/control.c b/src/or/control.c
index 60c62b15a59a70e88ea8ef9dd4b310399cfc660a..a6b8e4fa92c81d07afc6c7a263d1a302db5fdc7d 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -4239,9 +4239,9 @@ control_event_conf_changed(smartlist_t *elements)
     char *k = smartlist_get(elements, i);
     char *v = smartlist_get(elements, i+1);
     if (v == NULL) {
-      smartlist_asprintf_add(lines, "650-%s", k);
+      smartlist_add_asprintf(lines, "650-%s", k);
     } else {
-      smartlist_asprintf_add(lines, "650-%s=%s", k, v);
+      smartlist_add_asprintf(lines, "650-%s=%s", k, v);
     }
   }
   result = smartlist_join_strings(lines, "\r\n", 0, NULL);