r13476@catbus: nickm | 2007-06-17 14:04:41 -0400

 Build with fewer compiler warnings on Sun.  (This and previous Sun patches are thanks to the tremendously handy services of unix-center.net.)


svn:r10644

5 files changed, 17 insertions, 12 deletions

diff --git a/src/common/container.c b/src/common/container.c
index 9333ccdb16..f903a28300 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -663,10 +663,10 @@ smartlist_uniq_digests(smartlist_t *sl)
   } prefix ## entry_t;                                    \
   struct maptype {                                        \
     HT_HEAD(prefix ## impl, prefix ## entry_t) head;      \
-  };
+  }
 
-DEFINE_MAP_STRUCTS(strmap_t, char *key, strmap_);
-DEFINE_MAP_STRUCTS(digestmap_t, char key[DIGEST_LEN], digestmap_);
+DEFINE_MAP_STRUCTS(strmap_t, char *key, strmap_)
+DEFINE_MAP_STRUCTS(digestmap_t, char key[DIGEST_LEN], digestmap_)
 
 /** Helper: compare strmap_entry_t objects by key value. */
 static INLINE int
@@ -698,14 +698,14 @@ digestmap_entry_hash(const digestmap_entry_t *a)
 }
 
 HT_PROTOTYPE(strmap_impl, strmap_entry_t, node, strmap_entry_hash,
-             strmap_entries_eq);
+             strmap_entries_eq)
 HT_GENERATE(strmap_impl, strmap_entry_t, node, strmap_entry_hash,
-            strmap_entries_eq, 0.6, malloc, realloc, free);
+            strmap_entries_eq, 0.6, malloc, realloc, free)
 
 HT_PROTOTYPE(digestmap_impl, digestmap_entry_t, node, digestmap_entry_hash,
-             digestmap_entries_eq);
+             digestmap_entries_eq)
 HT_GENERATE(digestmap_impl, digestmap_entry_t, node, digestmap_entry_hash,
-            digestmap_entries_eq, 0.6, malloc, realloc, free);
+            digestmap_entries_eq, 0.6, malloc, realloc, free)
 
 /** Constructor to create a new empty map from strings to void*'s.
  */
diff --git a/src/common/container.h b/src/common/container.h
index e926ce16d3..44ea81fa65 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -193,7 +193,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join,
   prefix##iter_t *prefix##iter_next_rmv(maptype *map, prefix##iter_t *iter); \
   void prefix##iter_get(prefix##iter_t *iter, keytype *keyp, void **valp); \
   int prefix##iter_done(prefix##iter_t *iter);                          \
-  void prefix##assert_ok(const maptype *map);
+  void prefix##assert_ok(const maptype *map)
 
 /* Map from const char * to void *. Implemented with a hash table. */
 DECLARE_MAP_FNS(strmap_t, const char *, strmap_);
diff --git a/src/common/mempool.c b/src/common/mempool.c
index f933f58440..cfa2b45e50 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -1,6 +1,11 @@
 /* Copyright 2007 Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
+#if 1
+/* Tor dependencies */
+#include "orconfig.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/or/dns.c b/src/or/dns.c
index 9f1a35a20f..764ce843b9 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -128,9 +128,9 @@ cached_resolve_hash(cached_resolve_t *a)
 }
 
 HT_PROTOTYPE(cache_map, cached_resolve_t, node, cached_resolve_hash,
-             cached_resolves_eq);
+             cached_resolves_eq)
 HT_GENERATE(cache_map, cached_resolve_t, node, cached_resolve_hash,
-            cached_resolves_eq, 0.6, malloc, realloc, free);
+            cached_resolves_eq, 0.6, malloc, realloc, free)
 
 /** Initialize the DNS cache. */
 static void
diff --git a/src/or/test.c b/src/or/test.c
index d02cd751f4..776cc2aff0 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1408,7 +1408,7 @@ test_threads(void)
   /* Skip this test if we aren't threading. We should be threading most
    * everywhere by now. */
   if (1)
-    return 0;
+    return;
 #endif
   _thread_test_mutex = tor_mutex_new();
   _thread_test_start1 = tor_mutex_new();
@@ -1520,7 +1520,7 @@ test_gzip(void)
     test_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1,
                                    GZIP_METHOD));
     test_assert(buf2);
-    test_assert(!memcmp(buf2, "\037\213", 2)); /* Gztip magic. */
+    test_assert(!memcmp(buf2, "\037\213", 2)); /* Gzip magic. */
     test_assert(detect_compression_method(buf2, len1) == GZIP_METHOD);
 
     test_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1,