[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] Clean up a few warnings that make gcc twig out a bit.



Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv30923/or

Modified Files:
	dirserv.c circuitbuild.c config.c 
Log Message:
Clean up a few warnings that make gcc twig out a bit.

Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- dirserv.c	13 Sep 2005 21:14:55 -0000	1.227
+++ dirserv.c	14 Sep 2005 20:59:25 -0000	1.228
@@ -554,7 +554,8 @@
   return 0;
 }
 
-int
+/* DOCDOC */
+static int
 _compare_tor_version_str_ptr(const void **_a, const void **_b)
 {
   const char *a = *_a, *b = *_b;
@@ -695,7 +696,7 @@
 static cached_dir_t the_directory = { NULL, NULL, 0, 0, 0 };
 
 /* Used only by non-auth dirservers: The directory and runningrouters we'll
-* serve when requested. */
+ * serve when requested. */
 static cached_dir_t cached_directory = { NULL, NULL, 0, 0, 0 };
 static cached_dir_t cached_runningrouters = { NULL, NULL, 0, 0, 0 };
 

Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- circuitbuild.c	13 Sep 2005 21:24:51 -0000	1.142
+++ circuitbuild.c	14 Sep 2005 20:59:25 -0000	1.143
@@ -461,7 +461,7 @@
 /** We've decided to start our reachability testing. If all
  * is set, log this to the user. Return 1 if we did, or 0 if
  * we chose not to log anything. */
-int
+static int
 inform_testing_reachability(void)
 {
   char dirbuf[128];

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -d -r1.420 -r1.421
--- config.c	14 Sep 2005 02:36:29 -0000	1.420
+++ config.c	14 Sep 2005 20:59:25 -0000	1.421
@@ -3171,7 +3171,7 @@
    */
   suppress_libevent_log_msg("Function not implemented");
 #ifdef __APPLE__
-  putenv("EVENT_NOKQUEUE=1");
+  setenv("EVENT_NOKQUEUE","1",1);
 #endif
   event_init();
   suppress_libevent_log_msg(NULL);