[or-cvs] suppress all our usual compiler warnings, including a longs...

Nick Mathewson nickm at seul.org
Thu Sep 29 20:49:44 UTC 2005


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

Modified Files:
	circuitlist.c control.c 
Log Message:
suppress all our usual compiler warnings, including a longstanding one from tree.h

Index: circuitlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitlist.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- circuitlist.c	22 Jul 2005 21:12:10 -0000	1.56
+++ circuitlist.c	29 Sep 2005 20:49:41 -0000	1.57
@@ -11,6 +11,10 @@
  **/
 
 #include "or.h"
+
+/* Define RB_AUGMENT to avoid warnings about if statements with emtpy bodies.
+ */
+#define RB_AUGMENT(x) do{}while(0)
 #include "tree.h"
 
 /********* START VARIABLES **********/

Index: control.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/control.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- control.c	21 Sep 2005 23:30:15 -0000	1.132
+++ control.c	29 Sep 2005 20:49:41 -0000	1.133
@@ -319,7 +319,7 @@
   *outp++ = '\r';
   *outp++ = '\n';
   *outp = '\0'; /* NUL-terminate just in case. */
-  tor_assert((outp - *out) <= (sz_out));
+  tor_assert((outp - *out) <= (int)sz_out);
   return outp - *out;
 }
 



More information about the tor-commits mailing list