Переглянути джерело

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

Nick Mathewson 12 роки тому
батько
коміт
9c6d913b9e
3 змінених файлів з 8 додано та 8 видалено
  1. 4 4
      src/common/util.c
  2. 2 2
      src/common/util.h
  3. 2 2
      src/or/control.c

+ 4 - 4
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;

+ 2 - 2
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);

+ 2 - 2
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);