diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-15 21:17:48 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-15 21:17:48 +0000 |
| commit | e043b86f47185e0d9df53dab12d42e46c8c35b83 (patch) | |
| tree | 0ebfb1bbce0fbcfa7d6e470b98d5bf90e9889a02 /src/common | |
| parent | bfdc366037690c74d1e6b73fc33e2f73842ed793 (diff) | |
| download | tor-e043b86f47185e0d9df53dab12d42e46c8c35b83.tar.gz tor-e043b86f47185e0d9df53dab12d42e46c8c35b83.zip | |
r12764@catbus: nickm | 2007-05-15 17:17:39 -0400
Enable (and cope with) more GCC 4.2 warnings.
svn:r10196
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compat.h | 2 | ||||
| -rw-r--r-- | src/common/container.c | 2 | ||||
| -rw-r--r-- | src/common/util.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 3f2abc1968..e5862f982a 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -97,6 +97,7 @@ extern INLINE double U64_TO_DBL(uint64_t x) { #define ATTR_NORETURN __attribute__((noreturn)) #define ATTR_PURE __attribute__((pure)) #define ATTR_MALLOC __attribute__((malloc)) +#define ATTR_NORETURN __attribute__((noreturn)) #define ATTR_NONNULL(x) __attribute__((nonnull x)) /** Macro: Evaluates to <b>exp</b> and hints the compiler that the value * of <b>exp</b> will probably be true. */ @@ -108,6 +109,7 @@ extern INLINE double U64_TO_DBL(uint64_t x) { #define ATTR_NORETURN #define ATTR_PURE #define ATTR_MALLOC +#define ATTR_NORETURN #define ATTR_NONNULL(x) #define PREDICT_LIKELY(exp) (exp) #define PREDICT_UNLIKELY(exp) (exp) diff --git a/src/common/container.c b/src/common/container.c index 36234743ac..e3523735dd 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -87,7 +87,7 @@ smartlist_ensure_capacity(smartlist_t *sl, int size) int higher = sl->capacity * 2; while (size > higher) higher *= 2; - tor_assert(higher > sl->capacity); /* detect overflow */ + tor_assert(higher > 0); /* detect overflow */ sl->capacity = higher; sl->list = tor_realloc(sl->list, sizeof(void*)*sl->capacity); } diff --git a/src/common/util.c b/src/common/util.c index ff658b7069..0c420f4602 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -858,8 +858,9 @@ tv_add(struct timeval *a, const struct timeval *b) void tv_addms(struct timeval *a, long ms) { - a->tv_usec += (ms * 1000) % 1000000; - a->tv_sec += ((ms * 1000) / 1000000) + (a->tv_usec / 1000000); + uint64_t us = ms * 1000; + a->tv_usec += us % 1000000; + a->tv_sec += (us / 1000000) + (a->tv_usec / 1000000); a->tv_usec %= 1000000; } |