[tor-commits] [tor/master] Rename free_voting_schedule to voting_schedule_free. Wrap line. Follow if convention.

[nickm at torproject.org]

commit 5aad921e3a02cd96158cc54d309d072ed21b3aba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 19 19:44:19 2016 -0400

    Rename free_voting_schedule to voting_schedule_free. Wrap line. Follow if convention.
---
 src/or/dirvote.c             | 11 +++++++----
 src/or/dirvote.h             |  2 +-
 src/or/shared_random.c       |  2 +-
 src/or/shared_random_state.c |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 7c80868..9748f4a 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2577,7 +2577,7 @@ get_next_valid_after_time(time_t now)
   tor_assert(new_voting_schedule);
 
   next_valid_after_time = new_voting_schedule->interval_starts;
-  free_voting_schedule(new_voting_schedule);
+  voting_schedule_free(new_voting_schedule);
 
   return next_valid_after_time;
 }
@@ -2601,7 +2601,7 @@ dirvote_recalculate_timing(const or_options_t *options, time_t now)
 
   /* Fill in the global static struct now */
   memcpy(&voting_schedule, new_voting_schedule, sizeof(voting_schedule));
-  free_voting_schedule(new_voting_schedule);
+  voting_schedule_free(new_voting_schedule);
 }
 
 /* Populate and return a new voting_schedule_t that can be used to schedule
@@ -2660,10 +2660,13 @@ get_voting_schedule(const or_options_t *options, time_t now, int severity)
   return new_voting_schedule;
 }
 
-/** Frees a voting_schedule_t. This should be used instead of the generic tor_free. */
+/** Frees a voting_schedule_t. This should be used instead of the generic
+ * tor_free. */
 void
-free_voting_schedule(voting_schedule_t *voting_schedule_to_free)
+voting_schedule_free(voting_schedule_t *voting_schedule_to_free)
 {
+  if (!voting_schedule_to_free)
+    return;
   tor_free(voting_schedule_to_free);
 }
 
diff --git a/src/or/dirvote.h b/src/or/dirvote.h
index 23084cd..a1f71ce 100644
--- a/src/or/dirvote.h
+++ b/src/or/dirvote.h
@@ -157,7 +157,7 @@ typedef struct {
 voting_schedule_t *get_voting_schedule(const or_options_t *options,
                                        time_t now, int severity);
 
-void free_voting_schedule(voting_schedule_t *voting_schedule_to_free);
+void voting_schedule_free(voting_schedule_t *voting_schedule_to_free);
 
 void dirvote_get_preferred_voting_intervals(vote_timing_t *timing_out);
 time_t dirvote_get_start_of_next_interval(time_t now,
diff --git a/src/or/shared_random.c b/src/or/shared_random.c
index 4453052..19564f5 100644
--- a/src/or/shared_random.c
+++ b/src/or/shared_random.c
@@ -1328,7 +1328,7 @@ sr_act_post_consensus(const networkstatus_t *consensus)
       get_voting_schedule(options,time(NULL), LOG_NOTICE);
     time_t interval_starts = voting_schedule->interval_starts;
     sr_state_update(interval_starts);
-    free_voting_schedule(voting_schedule);
+    voting_schedule_free(voting_schedule);
   }
 }
 
diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c
index 4985af1..655b950 100644
--- a/src/or/shared_random_state.c
+++ b/src/or/shared_random_state.c
@@ -150,7 +150,7 @@ get_start_time_of_current_round(time_t now)
                                      voting_interval,
                                      options->TestingV3AuthVotingStartOffset);
 
-  free_voting_schedule(new_voting_schedule);
+  voting_schedule_free(new_voting_schedule);
 
   return curr_start;
 }