diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-04-18 03:58:42 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-04-18 03:58:42 +0000 |
| commit | 8a13a7cfe891d4006a9d1feca61ffebcf4f1f4d8 (patch) | |
| tree | 02fc7df2b676efc8a3dec286a273bb6723d9f0d6 | |
| parent | 7484ca06a5aaf060736485e6115aa0b2771ef036 (diff) | |
| download | tor-8a13a7cfe891d4006a9d1feca61ffebcf4f1f4d8.tar.gz tor-8a13a7cfe891d4006a9d1feca61ffebcf4f1f4d8.zip | |
mainline branch. Remove some more dead XXXs.
svn:r6401
| -rw-r--r-- | src/common/ht.h | 72 | ||||
| -rw-r--r-- | src/common/log.h | 12 | ||||
| -rw-r--r-- | src/common/util.c | 6 |
3 files changed, 8 insertions, 82 deletions
diff --git a/src/common/ht.h b/src/common/ht.h index 81ff5cb630..9e8e38ecef 100644 --- a/src/common/ht.h +++ b/src/common/ht.h @@ -188,7 +188,6 @@ ht_string_hash(const char *s) int (*fn)(struct type *, void *), \ void *data) \ { \ - /* XXXX use tricks to prevent concurrent mod? */ \ unsigned idx; \ int remove; \ struct type **p, **nextp, *next; \ @@ -262,77 +261,6 @@ ht_string_hash(const char *s) } \ } -#if 0 -/* Helpers for an iterator type that saves some mod operations at the expense - * of many branches. Not worth it, it seems. */ - -#define HT_ITER(type) \ - struct type##_ITER { \ - struct type **hti_nextp; \ - unsigned hti_bucket; \ - } - - static INLINE void \ - name##_HT_ITER_START(struct name *head, struct type##_ITER *iter) \ - { \ - /* XXXX Magic to stop modifications? */ \ - iter->hti_bucket = 0; \ - while (iter->hti_bucket < head->hth_table_length) { \ - iter->hti_nextp = &head->hth_table[iter->hti_bucket]; \ - if (*iter->hti_nextp) \ - return; \ - ++iter->hti_bucket; \ - } \ - iter->hti_nextp = NULL; \ - } \ - static INLINE int \ - name##_HT_ITER_DONE(struct name *head, struct type##_ITER *iter) \ - { \ - return iter->hti_nextp == NULL; \ - } \ - static INLINE struct type * \ - name##_HT_ITER_GET(struct name *head, struct type##_ITER *iter) \ - { \ - return *iter->hti_nextp; \ - } \ - static INLINE void \ - name##_HT_ITER_NEXT(struct name *head, struct type##_ITER *iter) \ - { \ - if (!iter->hti_nextp) \ - return; \ - if ((*iter->hti_nextp)->field.hte_next) { \ - iter->hti_nextp = &(*iter->hti_nextp)->field.hte_next; \ - return; \ - } \ - while (++iter->hti_bucket < head->hth_table_length) { \ - iter->hti_nextp = &head->hth_table[iter->hti_bucket]; \ - if (*iter->hti_nextp) \ - return; \ - ++iter->hti_bucket; \ - } \ - iter->hti_nextp = NULL; \ - } \ - static INLINE void \ - name##_HT_ITER_NEXT_RMV(struct name *head, struct type##_ITER *iter) \ - { \ - if (!iter->hti_nextp) \ - return; \ - --head->hth_n_entries; \ - if ((*iter->hti_nextp)->field.hte_next) { \ - *iter->hti_nextp = (*iter->hti_nextp)->field.hte_next; \ - if (*iter->hti_nextp) \ - return; \ - } \ - while (++iter->hti_bucket < head->hth_table_length) { \ - iter->hti_nextp = &head->hth_table[iter->hti_bucket]; \ - if (*iter->hti_nextp) \ - return; \ - ++iter->hti_bucket; \ - } \ - iter->hti_nextp = NULL; \ - } -#endif - #define HT_GENERATE(name, type, field, hashfn, eqfn, load, mallocfn, \ reallocfn, freefn) \ static unsigned name##_PRIMES[] = { \ diff --git a/src/common/log.h b/src/common/log.h index 1b4c96e8fa..8122a94aa6 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -23,14 +23,12 @@ "We aren't prepared to deal with that." #endif #else -/* XXXX Note: The code was originally written to refer to severities, - * with 0 being the least severe; while syslog's logging code refers to - * priorities, with 0 being the most important. Thus, all our comparisons - * needed to be reversed when we added syslog support. +/* Note: Syslog's logging code refers to priorities, with 0 being the most + * important. Thus, all our comparisons needed to be reversed when we added + * syslog support. * - * The upshot of this is that comments about log levels may be messed - * up: for "maximum severity" read "most severe" and "numerically - * *lowest* severity". + * The upshot of this is that comments about log levels may be messed up: for + * "maximum severity" read "most severe" and "numerically *lowest* severity". */ /** Debug-level severity: for hyper-verbose messages of no interest to diff --git a/src/common/util.c b/src/common/util.c index b2dd2f4b43..9dcb8e8089 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -131,11 +131,11 @@ _tor_malloc(size_t size DMALLOC_PARAMS) if (!result) { log_err(LD_MM,"Out of memory. Dying."); - /* XXX if these functions die within a worker process, they won't - * call spawn_exit */ + /* If these functions die within a worker process, they won't call + * spawn_exit, but that's ok, since the parent will run out of memory soon + * anyway. */ exit(1); } -// memset(result,'X',size); /* deadbeef to encourage bugs */ return result; } |