[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Make some more verbose gcc warnings go away.
Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv4708/src/or
Modified Files:
dirserv.c test.c
Log Message:
Make some more verbose gcc warnings go away.
Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -p -d -r1.350 -r1.351
--- dirserv.c 22 Jun 2006 07:25:15 -0000 1.350
+++ dirserv.c 22 Jun 2006 07:34:04 -0000 1.351
@@ -1808,7 +1808,7 @@ connection_dirserv_add_servers_to_outbuf
while (smartlist_len(conn->fingerprint_stack) &&
buf_datalen(conn->outbuf) < DIRSERV_BUFFER_MIN) {
- char *body;
+ const char *body;
char *fp = smartlist_pop_last(conn->fingerprint_stack);
signed_descriptor_t *sd = NULL;
if (by_fp) {
Index: test.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/test.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -d -r1.229 -r1.230
--- test.c 22 Jun 2006 07:01:54 -0000 1.229
+++ test.c 22 Jun 2006 07:34:04 -0000 1.230
@@ -1002,15 +1002,15 @@ test_gzip(void)
len1 = 1024;
ccp2 = "ABCDEFGHIJABCDEFGHIJ";
len2 = 21;
- test_eq(tor_zlib_process(state, &cp1, &len1, &ccp2, &len2, 0),
- TOR_ZLIB_OK);
+ test_assert(tor_zlib_process(state, &cp1, &len1, &ccp2, &len2, 0)
+ == TOR_ZLIB_OK);
test_eq(len2, 0); /* Make sure we compressed it all. */
test_assert(cp1 > buf1);
len2 = 0;
cp2 = cp1;
- test_eq(tor_zlib_process(state, &cp1, &len1, &ccp2, &len2, 1),
- TOR_ZLIB_DONE);
+ test_assert(tor_zlib_process(state, &cp1, &len1, &ccp2, &len2, 1)
+ == TOR_ZLIB_DONE);
test_eq(len2, 0);
test_assert(cp1 > cp2); /* Make sure we really added something. */
@@ -1643,6 +1643,8 @@ main(int c, char**v)
{
or_options_t *options = options_new();
char *errmsg = NULL;
+ (void) c;
+ (void) v;
options->command = CMD_RUN_UNITTESTS;
network_init();
setup_directory();