[or-cvs] r10196: Enable (and cope with) more GCC 4.2 warnings. (in tor/trunk: . src/common src/or src/tools)
nickm at seul.org
nickm at seul.org
Tue May 15 21:18:07 UTC 2007
Author: nickm
Date: 2007-05-15 17:17:48 -0400 (Tue, 15 May 2007)
New Revision: 10196
Modified:
tor/trunk/
tor/trunk/configure.in
tor/trunk/src/common/compat.h
tor/trunk/src/common/container.c
tor/trunk/src/common/util.c
tor/trunk/src/or/buffers.c
tor/trunk/src/or/control.c
tor/trunk/src/or/cpuworker.c
tor/trunk/src/or/rendclient.c
tor/trunk/src/or/test.c
tor/trunk/src/tools/tor-resolve.c
Log:
r12764 at catbus: nickm | 2007-05-15 17:17:39 -0400
Enable (and cope with) more GCC 4.2 warnings.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r12764] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/configure.in 2007-05-15 21:17:48 UTC (rev 10196)
@@ -615,6 +615,11 @@
#error
#endif]), have_gcc4=yes, have_gcc4=no)
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], [
+#if !defined(__GNUC__) || (__GNUC_MINOR__ < 2)
+#error
+#endif]), have_gcc42=yes, have_gcc42=no)
+
CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2 -Wwrite-strings -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wbad-function-cast -Wswitch-enum -Werror"
if test x$have_gcc4 = xyes ; then
@@ -622,6 +627,14 @@
CFLAGS="$CFLAGS -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement -Wold-style-definition"
fi
+ if test x$have_gcc42 = xyes ; then
+ # These warnings break gcc 4.0.2 and work on gcc 4.2
+ # XXXX020 Use -fstack-protector.
+ # XXXX020 See if any of these work with earlier versions.
+ # XXXX020 See if we can get -Wstrict-overflow=x for x>1 working.
+ CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -W"
+ fi
+
##This will break the world on some 64-bit architectures
# CFLAGS="$CFLAGS -Winline"
Modified: tor/trunk/src/common/compat.h
===================================================================
--- tor/trunk/src/common/compat.h 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/src/common/compat.h 2007-05-15 21:17:48 UTC (rev 10196)
@@ -97,6 +97,7 @@
#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 @@
#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)
Modified: tor/trunk/src/common/container.c
===================================================================
--- tor/trunk/src/common/container.c 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/src/common/container.c 2007-05-15 21:17:48 UTC (rev 10196)
@@ -87,7 +87,7 @@
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);
}
Modified: tor/trunk/src/common/util.c
===================================================================
--- tor/trunk/src/common/util.c 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/src/common/util.c 2007-05-15 21:17:48 UTC (rev 10196)
@@ -858,8 +858,9 @@
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;
}
Modified: tor/trunk/src/or/buffers.c
===================================================================
--- tor/trunk/src/or/buffers.c 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/src/or/buffers.c 2007-05-15 21:17:48 UTC (rev 10196)
@@ -1093,7 +1093,7 @@
fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
int log_sockstype, int safe_socks)
{
- unsigned char len;
+ unsigned int len;
char tmpbuf[INET_NTOA_BUF_LEN];
uint32_t destip;
enum {socks4, socks4a} socks4_prot = socks4a;
@@ -1191,8 +1191,13 @@
return 1;
case 3: /* fqdn */
log_debug(LD_APP,"socks5: fqdn address type");
+ if (req->command == SOCKS_COMMAND_RESOLVE_PTR) {
+ log_warn(LD_APP, "socks5 received RESOLVE_PTR command with "
+ "hostname type. Rejecting.");
+ return -1;
+ }
len = (unsigned char)*(buf->cur+4);
- if (buf->datalen < 7u+len) /* addr/port there? */
+ if (buf->datalen < 7+len) /* addr/port there? */
return 0; /* not yet */
if (len+1 > MAX_SOCKS_ADDR_LEN) {
log_warn(LD_APP,
@@ -1200,11 +1205,6 @@
"%d. Rejecting.", len+1,MAX_SOCKS_ADDR_LEN);
return -1;
}
- if (req->command == SOCKS_COMMAND_RESOLVE_PTR) {
- log_warn(LD_APP, "socks5 received RESOLVE_PTR command with "
- "hostname type. Rejecting.");
- return -1;
- }
memcpy(req->address,buf->cur+5,len);
req->address[len] = 0;
req->port = ntohs(get_uint16(buf->cur+5+len));
Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/src/or/control.c 2007-05-15 21:17:48 UTC (rev 10196)
@@ -943,13 +943,18 @@
const char *errstr = NULL;
char *password;
size_t password_len;
+ const char *cp;
+ int i;
if (TOR_ISXDIGIT(body[0])) {
- int i = 0;
- while (TOR_ISXDIGIT(body[i]))
- ++i;
- password = tor_malloc(i/2 + 1);
- if (base16_decode(password, i/2+1, body, i)<0) {
+ cp = body;
+ while (TOR_ISXDIGIT(*cp))
+ ++cp;
+ i = cp - body;
+ tor_assert(i>0);
+ password_len = i/2;
+ password = tor_malloc(password_len + 1);
+ if (base16_decode(password, password_len+1, body, i)<0) {
connection_write_str_to_buf(
"551 Invalid hexadecimal encoding. Maybe you tried a plain text "
"password? If so, the standard requires that you put it in "
@@ -957,7 +962,6 @@
tor_free(password);
return 0;
}
- password_len = i/2;
} else if (TOR_ISSPACE(body[0])) {
password = tor_strdup("");
password_len = 0;
Modified: tor/trunk/src/or/cpuworker.c
===================================================================
--- tor/trunk/src/or/cpuworker.c 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/src/or/cpuworker.c 2007-05-15 21:17:48 UTC (rev 10196)
@@ -36,7 +36,7 @@
* the last time we got a key rotation event. */
static time_t last_rotation_time=0;
-static void cpuworker_main(void *data);
+static void cpuworker_main(void *data) ATTR_NORETURN;
static int spawn_cpuworker(void);
static void spawn_enough_cpuworkers(void);
static void process_pending_task(connection_t *cpuworker);
Modified: tor/trunk/src/or/rendclient.c
===================================================================
--- tor/trunk/src/or/rendclient.c 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/src/or/rendclient.c 2007-05-15 21:17:48 UTC (rev 10196)
@@ -141,8 +141,8 @@
goto err;
}
- tor_assert(DIGEST_LEN + r <= RELAY_PAYLOAD_SIZE); /* we overran something */
payload_len = DIGEST_LEN + r;
+ tor_assert(payload_len <= RELAY_PAYLOAD_SIZE); /* we overran something */
if (relay_send_command_from_edge(0, TO_CIRCUIT(introcirc),
RELAY_COMMAND_INTRODUCE1,
Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/src/or/test.c 2007-05-15 21:17:48 UTC (rev 10196)
@@ -1207,6 +1207,8 @@
static tor_mutex_t *_thread_test_start2 = NULL;
static strmap_t *_thread_test_strmap = NULL;
+static void _thread_test_func(void* _s) ATTR_NORETURN;
+
static void
_thread_test_func(void* _s)
{
Modified: tor/trunk/src/tools/tor-resolve.c
===================================================================
--- tor/trunk/src/tools/tor-resolve.c 2007-05-15 21:17:42 UTC (rev 10195)
+++ tor/trunk/src/tools/tor-resolve.c 2007-05-15 21:17:48 UTC (rev 10196)
@@ -44,6 +44,8 @@
do { log_fn(LOG_ERR, LD_NET, "Error while %s: %s", act, \
tor_socket_strerror(tor_socket_errno(_s))); } while (0)
+static void usage(void) ATTR_NORETURN;
+
/** Set *<b>out</b> to a newly allocated SOCKS4a resolve request with
* <b>username</b> and <b>hostname</b> as provided. Return the number
* of bytes in the request. */
More information about the tor-commits
mailing list