[or-cvs] simplify because we weren"t using those return values anyway

arma at seul.org arma at seul.org
Sat Dec 24 22:48:14 UTC 2005


Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitbuild.c or.h rephist.c 
Log Message:
simplify because we weren't using those return values anyway


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -d -r1.183 -r1.184
--- circuitbuild.c	24 Dec 2005 20:07:19 -0000	1.183
+++ circuitbuild.c	24 Dec 2005 22:48:12 -0000	1.184
@@ -2025,12 +2025,12 @@ helper_nodes_changed(void)
  * a new one out of the global helper_nodes list, and then mark
  * <b>state</b> dirty so it will know to get saved to disk.
  */
-int
+void
 helper_nodes_update_state(or_state_t *state)
 {
   config_line_t **next, *line;
   if (! helper_nodes_dirty)
-    return 0;
+    return;
 
   config_free_lines(state->HelperNodes);
   next = &state->HelperNodes;
@@ -2064,8 +2064,6 @@ helper_nodes_update_state(or_state_t *st
     });
   state->dirty = 1;
   helper_nodes_dirty = 0;
-
-  return 1;
 }
 
 /** DOCDOC */

Index: or.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.764
retrieving revision 1.765
diff -u -p -d -r1.764 -r1.765
--- or.h	23 Dec 2005 23:56:42 -0000	1.764
+++ or.h	24 Dec 2005 22:48:12 -0000	1.765
@@ -1468,7 +1468,7 @@ const char *build_state_get_exit_nicknam
 
 void helper_node_set_status(const char *digest, int succeeded);
 void helper_nodes_set_status_from_directory(void);
-int helper_nodes_update_state(or_state_t *state);
+void helper_nodes_update_state(or_state_t *state);
 int helper_nodes_parse_state(or_state_t *state, int set, const char **err);
 int helper_nodes_getinfo_helper(const char *question, char **answer);
 void helper_nodes_free_all(void);
@@ -2031,7 +2031,7 @@ void rep_hist_note_used_internal(time_t 
 int rep_hist_get_predicted_internal(time_t now, int *need_uptime,
                                     int *need_capacity);
 
-int rep_hist_update_state(or_state_t *state);
+void rep_hist_update_state(or_state_t *state);
 int rep_hist_load_state(or_state_t *state, const char **err);
 
 void rep_hist_free_all(void);

Index: rephist.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/rephist.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -d -r1.74 -r1.75
--- rephist.c	23 Dec 2005 23:56:42 -0000	1.74
+++ rephist.c	24 Dec 2005 22:48:12 -0000	1.75
@@ -646,11 +646,8 @@ rep_hist_get_bandwidth_lines(void)
   return buf;
 }
 
-/** Update the state with bandwidth history
- * A return value of 0 means nothing was updated,
- * a value of 1 means something has
- */
-int
+/** Update <b>state</b> with the newest bandwidth history. */
+void
 rep_hist_update_state(or_state_t *state)
 {
   int len, r;
@@ -684,7 +681,6 @@ rep_hist_update_state(or_state_t *state)
   }
   tor_free(buf);
   state->dirty = 1;
-  return 1;
 }
 
 /** Set bandwidth history from our saved state.



More information about the tor-commits mailing list