Try to use smartlist_add_asprintf consistently

(To ensure correctness, in every case, make sure that the temporary
variable is deleted, renamed, or lowered in scope, so we can't have
any bugs related to accidentally relying on the no-longer-filled
variable.)

1 files changed, 27 insertions, 38 deletions

diff --git a/src/or/rephist.c b/src/or/rephist.c
index 6bbb93b821..b7bd2387fe 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1588,7 +1588,6 @@ rep_hist_update_bwhist_state_section(or_state_t *state,
                                      time_t *s_begins,
                                      int *s_interval)
 {
-  char *cp;
   int i,j;
   uint64_t maxval;
 
@@ -1626,17 +1625,17 @@ rep_hist_update_bwhist_state_section(or_state_t *state,
   for (j=0; j < b->num_maxes_set; ++j,++i) {
     if (i >= NUM_TOTALS)
       i = 0;
-    tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->totals[i] & ~0x3ff));
-    smartlist_add(*s_values, cp);
+    smartlist_add_asprintf(*s_values, U64_FORMAT,
+                           U64_PRINTF_ARG(b->totals[i] & ~0x3ff));
     maxval = b->maxima[i] / NUM_SECS_ROLLING_MEASURE;
-    tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(maxval & ~0x3ff));
-    smartlist_add(*s_maxima, cp);
+    smartlist_add_asprintf(*s_maxima, U64_FORMAT,
+                           U64_PRINTF_ARG(maxval & ~0x3ff));
   }
-  tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->total_in_period & ~0x3ff));
-  smartlist_add(*s_values, cp);
+  smartlist_add_asprintf(*s_values, U64_FORMAT,
+                         U64_PRINTF_ARG(b->total_in_period & ~0x3ff));
   maxval = b->max_total / NUM_SECS_ROLLING_MEASURE;
-  tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(maxval & ~0x3ff));
-  smartlist_add(*s_maxima, cp);
+  smartlist_add_asprintf(*s_maxima, U64_FORMAT,
+                         U64_PRINTF_ARG(maxval & ~0x3ff));
 }
 
 /** Update <b>state</b> with the newest bandwidth history. Done before
@@ -2125,7 +2124,6 @@ rep_hist_format_exit_stats(time_t now)
   uint64_t cur_bytes = 0, other_read = 0, other_written = 0,
            total_read = 0, total_written = 0;
   uint32_t total_streams = 0, other_streams = 0;
-  char *buf;
   smartlist_t *written_strings, *read_strings, *streams_strings;
   char *written_string, *read_string, *streams_string;
   char t[ISO_TIME_LEN+1];
@@ -2204,9 +2202,8 @@ rep_hist_format_exit_stats(time_t now)
                      exit_bytes_written[cur_port],
                      EXIT_STATS_ROUND_UP_BYTES);
       num /= 1024;
-      buf = NULL;
-      tor_asprintf(&buf, "%d="U64_FORMAT, cur_port, U64_PRINTF_ARG(num));
-      smartlist_add(written_strings, buf);
+      smartlist_add_asprintf(written_strings, "%d="U64_FORMAT,
+                             cur_port, U64_PRINTF_ARG(num));
       other_written -= exit_bytes_written[cur_port];
     }
     if (exit_bytes_read[cur_port] > 0) {
@@ -2214,18 +2211,15 @@ rep_hist_format_exit_stats(time_t now)
                      exit_bytes_read[cur_port],
                      EXIT_STATS_ROUND_UP_BYTES);
       num /= 1024;
-      buf = NULL;
-      tor_asprintf(&buf, "%d="U64_FORMAT, cur_port, U64_PRINTF_ARG(num));
-      smartlist_add(read_strings, buf);
+      smartlist_add_asprintf(read_strings, "%d="U64_FORMAT,
+                             cur_port, U64_PRINTF_ARG(num));
       other_read -= exit_bytes_read[cur_port];
     }
     if (exit_streams[cur_port] > 0) {
       uint32_t num = round_uint32_to_next_multiple_of(
                      exit_streams[cur_port],
                      EXIT_STATS_ROUND_UP_STREAMS);
-      buf = NULL;
-      tor_asprintf(&buf, "%d=%u", cur_port, num);
-      smartlist_add(streams_strings, buf);
+      smartlist_add_asprintf(streams_strings, "%d=%u", cur_port, num);
       other_streams -= exit_streams[cur_port];
     }
   }
@@ -2234,20 +2228,16 @@ rep_hist_format_exit_stats(time_t now)
   other_written = round_uint64_to_next_multiple_of(other_written,
                   EXIT_STATS_ROUND_UP_BYTES);
   other_written /= 1024;
-  buf = NULL;
-  tor_asprintf(&buf, "other="U64_FORMAT, U64_PRINTF_ARG(other_written));
-  smartlist_add(written_strings, buf);
+  smartlist_add_asprintf(written_strings, "other="U64_FORMAT,
+                         U64_PRINTF_ARG(other_written));
   other_read = round_uint64_to_next_multiple_of(other_read,
                EXIT_STATS_ROUND_UP_BYTES);
   other_read /= 1024;
-  buf = NULL;
-  tor_asprintf(&buf, "other="U64_FORMAT, U64_PRINTF_ARG(other_read));
-  smartlist_add(read_strings, buf);
+  smartlist_add_asprintf(read_strings, "other="U64_FORMAT,
+                         U64_PRINTF_ARG(other_read));
   other_streams = round_uint32_to_next_multiple_of(other_streams,
                   EXIT_STATS_ROUND_UP_STREAMS);
-  buf = NULL;
-  tor_asprintf(&buf, "other=%u", other_streams);
-  smartlist_add(streams_strings, buf);
+  smartlist_add_asprintf(streams_strings, "other=%u", other_streams);
 
   /* Join all observations in single strings. */
   written_string = smartlist_join_strings(written_strings, ",", 0, NULL);
@@ -2468,7 +2458,6 @@ rep_hist_format_buffer_stats(time_t now)
   int processed_cells[SHARES], circs_in_share[SHARES],
       number_of_circuits, i;
   double queued_cells[SHARES], time_in_queue[SHARES];
-  char *buf = NULL;
   smartlist_t *processed_cells_strings, *queued_cells_strings,
               *time_in_queue_strings;
   char *processed_cells_string, *queued_cells_string,
@@ -2510,19 +2499,19 @@ rep_hist_format_buffer_stats(time_t now)
   queued_cells_strings = smartlist_create();
   time_in_queue_strings = smartlist_create();
   for (i = 0; i < SHARES; i++) {
-    tor_asprintf(&buf,"%d", !circs_in_share[i] ? 0 :
-                 processed_cells[i] / circs_in_share[i]);
-    smartlist_add(processed_cells_strings, buf);
+    smartlist_add_asprintf(processed_cells_strings,
+                           "%d", !circs_in_share[i] ? 0 :
+                              processed_cells[i] / circs_in_share[i]);
   }
   for (i = 0; i < SHARES; i++) {
-    tor_asprintf(&buf, "%.2f", circs_in_share[i] == 0 ? 0.0 :
-                 queued_cells[i] / (double) circs_in_share[i]);
-    smartlist_add(queued_cells_strings, buf);
+    smartlist_add_asprintf(queued_cells_strings, "%.2f",
+                           circs_in_share[i] == 0 ? 0.0 :
+                             queued_cells[i] / (double) circs_in_share[i]);
   }
   for (i = 0; i < SHARES; i++) {
-    tor_asprintf(&buf, "%.0f", circs_in_share[i] == 0 ? 0.0 :
-                 time_in_queue[i] / (double) circs_in_share[i]);
-    smartlist_add(time_in_queue_strings, buf);
+    smartlist_add_asprintf(time_in_queue_strings, "%.0f",
+                           circs_in_share[i] == 0 ? 0.0 :
+                             time_in_queue[i] / (double) circs_in_share[i]);
   }
 
   /* Join all observations in single strings. */