diff options
| author | Michael Steinert <mike.steinert@gmail.com> | 2012-05-16 10:42:44 -0600 |
|---|---|---|
| committer | Michael Steinert <mike.steinert@gmail.com> | 2012-05-17 11:44:45 -0600 |
| commit | 162fc19f4d896c3db862f1da303823dcbe9780ec (patch) | |
| tree | 36656320e462ca62575afa30931a7301162732f8 /librabbitmq | |
| parent | a4881f40d2862f193cc38f9759564370004215c4 (diff) | |
| download | rabbitmq-c-github-ask-162fc19f4d896c3db862f1da303823dcbe9780ec.tar.gz | |
Fix compiler warnings (checked clang & gcc)
Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
Diffstat (limited to 'librabbitmq')
| -rw-r--r-- | librabbitmq/amqp_api.c | 5 | ||||
| -rw-r--r-- | librabbitmq/amqp_connection.c | 2 | ||||
| -rw-r--r-- | librabbitmq/amqp_private.h | 9 | ||||
| -rw-r--r-- | librabbitmq/amqp_socket.c | 2 | ||||
| -rw-r--r-- | librabbitmq/amqp_table.c | 2 |
5 files changed, 14 insertions, 6 deletions
diff --git a/librabbitmq/amqp_api.c b/librabbitmq/amqp_api.c index 4e0bb3e..b4effec 100644 --- a/librabbitmq/amqp_api.c +++ b/librabbitmq/amqp_api.c @@ -143,9 +143,8 @@ int amqp_basic_publish(amqp_connection_state_t state, return res; body_offset = 0; - while (1) { - int remaining = body.len - body_offset; - assert(remaining >= 0); + while (body_offset < body.len) { + size_t remaining = body.len - body_offset; if (remaining == 0) break; diff --git a/librabbitmq/amqp_connection.c b/librabbitmq/amqp_connection.c index 35d1e15..9289316 100644 --- a/librabbitmq/amqp_connection.c +++ b/librabbitmq/amqp_connection.c @@ -51,7 +51,7 @@ #define ENFORCE_STATE(statevec, statenum) \ { \ amqp_connection_state_t _check_state = (statevec); \ - int _wanted_state = (statenum); \ + size_t _wanted_state = (statenum); \ if (_check_state->state != _wanted_state) \ amqp_abort("Programming error: invalid AMQP connection state: expected %d, got %d", \ _wanted_state, \ diff --git a/librabbitmq/amqp_private.h b/librabbitmq/amqp_private.h index 7cfb65c..27ba3dd 100644 --- a/librabbitmq/amqp_private.h +++ b/librabbitmq/amqp_private.h @@ -57,6 +57,14 @@ #define ERROR_BAD_AMQP_URL 8 #define ERROR_MAX 8 +/* GCC attributes */ +#if __GNUC__ > 2 | (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +#define AMQP_NORETURN \ + __attribute__ ((__noreturn__)) +#else +#define AMQP_NORETURN +#endif + extern char *amqp_os_error_string(int err); #include "socket.h" @@ -253,6 +261,7 @@ static inline int amqp_decode_bytes(amqp_bytes_t encoded, size_t *offset, } } +AMQP_NORETURN extern void amqp_abort(const char *fmt, ...); #endif diff --git a/librabbitmq/amqp_socket.c b/librabbitmq/amqp_socket.c index 157aec8..60bb545 100644 --- a/librabbitmq/amqp_socket.c +++ b/librabbitmq/amqp_socket.c @@ -372,7 +372,7 @@ static int amqp_login_inner(amqp_connection_state_t state, { int res; amqp_method_t method; - uint32_t server_frame_max; + int server_frame_max; uint16_t server_channel_max; uint16_t server_heartbeat; diff --git a/librabbitmq/amqp_table.c b/librabbitmq/amqp_table.c index b3b33f3..ec098ba 100644 --- a/librabbitmq/amqp_table.c +++ b/librabbitmq/amqp_table.c @@ -413,7 +413,7 @@ int amqp_table_entry_cmp(void const *entry1, void const *entry2) { amqp_table_entry_t const *p2 = (amqp_table_entry_t const *) entry2; int d; - int minlen; + size_t minlen; minlen = p1->key.len; if (p2->key.len < minlen) minlen = p2->key.len; |