summaryrefslogtreecommitdiff
path: root/ht-internal.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2011-07-02 21:49:07 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-02 21:49:07 -0400
commit8ee9f9c1cf3d2b7e3c17e9fedb9d740361bf8a69 (patch)
tree4c2a8f0681b33aede036d10e8ff3a4ba817e174c /ht-internal.h
parente934096490f6909cf22c8fbe34fe6ad41e5083af (diff)
downloadlibevent-8ee9f9c1cf3d2b7e3c17e9fedb9d740361bf8a69.tar.gz
Fix a few warnings on OpenBSD
- redeclaration of dst_size - arpa/inet.h requires netinet/in.h first - don't use a local with the same name as a global - it isn't needed so remove it
Diffstat (limited to 'ht-internal.h')
-rw-r--r--ht-internal.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/ht-internal.h b/ht-internal.h
index 57624af7..d20e14df 100644
--- a/ht-internal.h
+++ b/ht-internal.h
@@ -223,7 +223,6 @@ ht_string_hash(const char *s)
void *data) \
{ \
unsigned idx; \
- int remove; \
struct type **p, **nextp, *next; \
if (!head->hth_table) \
return; \
@@ -232,8 +231,7 @@ ht_string_hash(const char *s)
while (*p) { \
nextp = &(*p)->field.hte_next; \
next = *nextp; \
- remove = fn(*p, data); \
- if (remove) { \
+ if (fn(*p, data)) { \
--head->hth_n_entries; \
*p = next; \
} else { \