Commit 93f32db4 authored by Nick Mathewson's avatar Nick Mathewson 🐻
Browse files

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
parent 99792df6
...@@ -663,10 +663,10 @@ smartlist_uniq_digests(smartlist_t *sl) ...@@ -663,10 +663,10 @@ smartlist_uniq_digests(smartlist_t *sl)
} prefix ## entry_t; \ } prefix ## entry_t; \
struct maptype { \ struct maptype { \
HT_HEAD(prefix ## impl, prefix ## entry_t) head; \ HT_HEAD(prefix ## impl, prefix ## entry_t) head; \
}; }
DEFINE_MAP_STRUCTS(strmap_t, char *key, strmap_); DEFINE_MAP_STRUCTS(strmap_t, char *key, strmap_)
DEFINE_MAP_STRUCTS(digestmap_t, char key[DIGEST_LEN], digestmap_); DEFINE_MAP_STRUCTS(digestmap_t, char key[DIGEST_LEN], digestmap_)
/** Helper: compare strmap_entry_t objects by key value. */ /** Helper: compare strmap_entry_t objects by key value. */
static INLINE int static INLINE int
...@@ -698,14 +698,14 @@ digestmap_entry_hash(const digestmap_entry_t *a) ...@@ -698,14 +698,14 @@ digestmap_entry_hash(const digestmap_entry_t *a)
} }
HT_PROTOTYPE(strmap_impl, strmap_entry_t, node, strmap_entry_hash, 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, 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, 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, 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. /** Constructor to create a new empty map from strings to void*'s.
*/ */
......
...@@ -193,7 +193,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, ...@@ -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); \ 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); \ void prefix##iter_get(prefix##iter_t *iter, keytype *keyp, void **valp); \
int prefix##iter_done(prefix##iter_t *iter); \ 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. */ /* Map from const char * to void *. Implemented with a hash table. */
DECLARE_MAP_FNS(strmap_t, const char *, strmap_); DECLARE_MAP_FNS(strmap_t, const char *, strmap_);
......
/* Copyright 2007 Nick Mathewson */ /* Copyright 2007 Nick Mathewson */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
/* $Id$ */ /* $Id$ */
#if 1
/* Tor dependencies */
#include "orconfig.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
......
...@@ -128,9 +128,9 @@ cached_resolve_hash(cached_resolve_t *a) ...@@ -128,9 +128,9 @@ cached_resolve_hash(cached_resolve_t *a)
} }
HT_PROTOTYPE(cache_map, cached_resolve_t, node, cached_resolve_hash, 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, 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. */ /** Initialize the DNS cache. */
static void static void
......
...@@ -1408,7 +1408,7 @@ test_threads(void) ...@@ -1408,7 +1408,7 @@ test_threads(void)
/* Skip this test if we aren't threading. We should be threading most /* Skip this test if we aren't threading. We should be threading most
* everywhere by now. */ * everywhere by now. */
if (1) if (1)
return 0; return;
#endif #endif
_thread_test_mutex = tor_mutex_new(); _thread_test_mutex = tor_mutex_new();
_thread_test_start1 = tor_mutex_new(); _thread_test_start1 = tor_mutex_new();
...@@ -1520,7 +1520,7 @@ test_gzip(void) ...@@ -1520,7 +1520,7 @@ test_gzip(void)
test_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1, test_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1,
GZIP_METHOD)); GZIP_METHOD));
test_assert(buf2); 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(detect_compression_method(buf2, len1) == GZIP_METHOD);
test_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1, test_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment