From: Karsten Loesing <karsten.loesing@gmx.net>
Date: Mon, 28 Oct 2013 09:48:18 +0000 (+0100)
Subject: squash! Pass const uint64_t pointers, document array length.
X-Git-Tag: tor-0.2.5.2-alpha~110^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e46de82c97e694d3bfa399af48b9de9365e264bd;p=thirdparty%2Ftor.git

squash! Pass const uint64_t pointers, document array length.

Don't cast uint64_t * to const uint64_t * explicitly.  The cast is always
safe, so C does it for us.  Doing the cast explitictly can hide bugs if
the input is secretly the wrong type.

Suggested by Nick.
---

diff --git a/src/or/control.c b/src/or/control.c
index 73769733cb..9e026b391c 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -4093,14 +4093,14 @@ format_cell_stats(char **event_string, circuit_t *circ,
     smartlist_add_asprintf(event_parts, "InboundConn="U64_FORMAT,
                  U64_PRINTF_ARG(or_circ->p_chan->global_identifier));
     append_cell_stats_by_command(event_parts, "InboundAdded",
-                 (const uint64_t *) cell_stats->added_cells_appward,
-                 (const uint64_t *) cell_stats->added_cells_appward);
+                                 cell_stats->added_cells_appward,
+                                 cell_stats->added_cells_appward);
     append_cell_stats_by_command(event_parts, "InboundRemoved",
-                 (const uint64_t *) cell_stats->removed_cells_appward,
-                 (const uint64_t *) cell_stats->removed_cells_appward);
+                                 cell_stats->removed_cells_appward,
+                                 cell_stats->removed_cells_appward);
     append_cell_stats_by_command(event_parts, "InboundTime",
-                 (const uint64_t *) cell_stats->removed_cells_appward,
-                 (const uint64_t *) cell_stats->total_time_appward);
+                                 cell_stats->removed_cells_appward,
+                                 cell_stats->total_time_appward);
   }
   if (circ->n_chan) {
     smartlist_add_asprintf(event_parts, "OutboundQueue=%lu",
@@ -4108,14 +4108,14 @@ format_cell_stats(char **event_string, circuit_t *circ,
     smartlist_add_asprintf(event_parts, "OutboundConn="U64_FORMAT,
                  U64_PRINTF_ARG(circ->n_chan->global_identifier));
     append_cell_stats_by_command(event_parts, "OutboundAdded",
-                 (const uint64_t *) cell_stats->added_cells_exitward,
-                 (const uint64_t *) cell_stats->added_cells_exitward);
+                                 cell_stats->added_cells_exitward,
+                                 cell_stats->added_cells_exitward);
     append_cell_stats_by_command(event_parts, "OutboundRemoved",
-                 (const uint64_t *) cell_stats->removed_cells_exitward,
-                 (const uint64_t *) cell_stats->removed_cells_exitward);
+                                 cell_stats->removed_cells_exitward,
+                                 cell_stats->removed_cells_exitward);
     append_cell_stats_by_command(event_parts, "OutboundTime",
-                 (const uint64_t *) cell_stats->removed_cells_exitward,
-                 (const uint64_t *) cell_stats->total_time_exitward);
+                                 cell_stats->removed_cells_exitward,
+                                 cell_stats->total_time_exitward);
   }
   *event_string = smartlist_join_strings(event_parts, " ", 0, NULL);
   SMARTLIST_FOREACH(event_parts, char *, cp, tor_free(cp));
diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c
index 0b5434cd38..04a04de5b0 100644
--- a/src/test/test_controller_events.c
+++ b/src/test/test_controller_events.c
@@ -159,31 +159,31 @@ test_cntev_append_cell_stats(void *arg)
 
   /* All array entries empty. */
   append_cell_stats_by_command(event_parts, key,
-                               (const uint64_t *) include_if_non_zero,
-                               (const uint64_t *) number_to_include);
+                               include_if_non_zero,
+                               number_to_include);
   tt_int_op(0, ==, smartlist_len(event_parts));
 
   /* There's a RELAY cell to include, but the corresponding field in
    * include_if_non_zero is still zero. */
   number_to_include[CELL_RELAY] = 1;
   append_cell_stats_by_command(event_parts, key,
-                               (const uint64_t *) include_if_non_zero,
-                               (const uint64_t *) number_to_include);
+                               include_if_non_zero,
+                               number_to_include);
   tt_int_op(0, ==, smartlist_len(event_parts));
 
   /* Now include single RELAY cell. */
   include_if_non_zero[CELL_RELAY] = 2;
   append_cell_stats_by_command(event_parts, key,
-                               (const uint64_t *) include_if_non_zero,
-                               (const uint64_t *) number_to_include);
+                               include_if_non_zero,
+                               number_to_include);
   tt_str_op("Z=relay:1", ==, smartlist_pop_last(event_parts));
 
   /* Add four CREATE cells. */
   include_if_non_zero[CELL_CREATE] = 3;
   number_to_include[CELL_CREATE] = 4;
   append_cell_stats_by_command(event_parts, key,
-                               (const uint64_t *) include_if_non_zero,
-                               (const uint64_t *) number_to_include);
+                               include_if_non_zero,
+                               number_to_include);
   tt_str_op("Z=create:4,relay:1", ==, smartlist_pop_last(event_parts));
 
  done: