diff options
author | David Wragg <david@rabbitmq.com> | 2010-10-21 17:49:04 +0100 |
---|---|---|
committer | David Wragg <david@rabbitmq.com> | 2010-10-21 17:49:04 +0100 |
commit | 1096c1dbdb961bab603f504b9aaee864f6192c97 (patch) | |
tree | deaa98bcb720f35ebc898537e19e6177a85185c3 /librabbitmq | |
parent | b4e92fd12d58e3baf3bc091114fcc57b88400544 (diff) | |
download | rabbitmq-c-github-ask-1096c1dbdb961bab603f504b9aaee864f6192c97.tar.gz |
Make test_tables.c ISO C90 clean
(As long as you have a stdint.h and inttypes.h available.)
And kill the unclean macros in amqp.h that were only used from
test_tables.c.
Diffstat (limited to 'librabbitmq')
-rw-r--r-- | librabbitmq/amqp.h | 49 | ||||
-rw-r--r-- | librabbitmq/amqp_private.h | 9 |
2 files changed, 9 insertions, 49 deletions
diff --git a/librabbitmq/amqp.h b/librabbitmq/amqp.h index c20f645..308119d 100644 --- a/librabbitmq/amqp.h +++ b/librabbitmq/amqp.h @@ -82,8 +82,6 @@ typedef struct amqp_decimal_t_ { uint32_t value; } amqp_decimal_t; -#define AMQP_DECIMAL(d,v) ((amqp_decimal_t) { .decimals = (d), .value = (v) }) - typedef struct amqp_table_t_ { int num_entries; struct amqp_table_entry_t_ *entries; @@ -184,44 +182,6 @@ typedef enum { AMQP_FIELD_KIND_BYTES = 'x' } amqp_field_value_kind_t; -#define _AMQP_TEINIT(ke,ki,v) {.key = (ke), .value = {.kind = AMQP_FIELD_KIND_##ki, .value = {v}}} -#define AMQP_TABLE_ENTRY_BOOLEAN(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), BOOLEAN, .boolean = (v)) -#define AMQP_TABLE_ENTRY_I8(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), I8, .i8 = (v)) -#define AMQP_TABLE_ENTRY_U8(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), U8, .u8 = (v)) -#define AMQP_TABLE_ENTRY_I16(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), I16, .i16 = (v)) -#define AMQP_TABLE_ENTRY_U16(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), U16, .u16 = (v)) -#define AMQP_TABLE_ENTRY_I32(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), I32, .i32 = (v)) -#define AMQP_TABLE_ENTRY_U32(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), U32, .u32 = (v)) -#define AMQP_TABLE_ENTRY_I64(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), I64, .i64 = (v)) -#define AMQP_TABLE_ENTRY_F32(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), F32, .f32 = (v)) -#define AMQP_TABLE_ENTRY_F64(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), F64, .f64 = (v)) -#define AMQP_TABLE_ENTRY_DECIMAL(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), DECIMAL, .decimal = (v)) -#define AMQP_TABLE_ENTRY_UTF8(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), UTF8, .bytes = (v)) -#define AMQP_TABLE_ENTRY_ARRAY(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), ARRAY, .array = (v)) -#define AMQP_TABLE_ENTRY_TIMESTAMP(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), TIMESTAMP, .u64 = (v)) -#define AMQP_TABLE_ENTRY_TABLE(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), TABLE, .table = (v)) -#define AMQP_TABLE_ENTRY_VOID(k) _AMQP_TEINIT(amqp_cstring_bytes(k), VOID, .u8 = 0) -#define AMQP_TABLE_ENTRY_BYTES(k,v) _AMQP_TEINIT(amqp_cstring_bytes(k), BYTES, .bytes = (v)) - -#define _AMQP_FVINIT(ki,v) {.kind = AMQP_FIELD_KIND_##ki, .value = {v}} -#define AMQP_FIELD_VALUE_BOOLEAN(v) _AMQP_FVINIT(BOOLEAN, .boolean = (v)) -#define AMQP_FIELD_VALUE_I8(v) _AMQP_FVINIT(I8, .i8 = (v)) -#define AMQP_FIELD_VALUE_U8(v) _AMQP_FVINIT(U8, .u8 = (v)) -#define AMQP_FIELD_VALUE_I16(v) _AMQP_FVINIT(I16, .i16 = (v)) -#define AMQP_FIELD_VALUE_U16(v) _AMQP_FVINIT(U16, .u16 = (v)) -#define AMQP_FIELD_VALUE_I32(v) _AMQP_FVINIT(I32, .i32 = (v)) -#define AMQP_FIELD_VALUE_U32(v) _AMQP_FVINIT(U32, .u32 = (v)) -#define AMQP_FIELD_VALUE_I64(v) _AMQP_FVINIT(I64, .i64 = (v)) -#define AMQP_FIELD_VALUE_F32(v) _AMQP_FVINIT(F32, .f32 = (v)) -#define AMQP_FIELD_VALUE_F64(v) _AMQP_FVINIT(F64, .f64 = (v)) -#define AMQP_FIELD_VALUE_DECIMAL(v) _AMQP_FVINIT(DECIMAL, .decimal = (v)) -#define AMQP_FIELD_VALUE_UTF8(v) _AMQP_FVINIT(UTF8, .bytes = (v)) -#define AMQP_FIELD_VALUE_ARRAY(v) _AMQP_FVINIT(ARRAY, .array = (v)) -#define AMQP_FIELD_VALUE_TIMESTAMP(v) _AMQP_FVINIT(TIMESTAMP, .u64 = (v)) -#define AMQP_FIELD_VALUE_TABLE(v) _AMQP_FVINIT(TABLE, .table = (v)) -#define AMQP_FIELD_VALUE_VOID(k) _AMQP_FVINIT(VOID, .u8 = 0) -#define AMQP_FIELD_VALUE_BYTES(v) _AMQP_FVINIT(BYTES, .bytes = (v)) - typedef struct amqp_pool_blocklist_t_ { int num_blocks; void **blocklist; @@ -497,6 +457,15 @@ RABBITMQ_EXPORT amqp_rpc_reply_t amqp_get_rpc_reply( */ RABBITMQ_EXPORT char *amqp_error_string(int err); +RABBITMQ_EXPORT int amqp_decode_table(amqp_bytes_t encoded, + amqp_pool_t *pool, + amqp_table_t *output, + size_t *offset); + +RABBITMQ_EXPORT int amqp_encode_table(amqp_bytes_t encoded, + amqp_table_t *input, + size_t *offset); + #ifdef __cplusplus } #endif diff --git a/librabbitmq/amqp_private.h b/librabbitmq/amqp_private.h index de2cd5c..2e2a7a2 100644 --- a/librabbitmq/amqp_private.h +++ b/librabbitmq/amqp_private.h @@ -246,15 +246,6 @@ static inline int amqp_decode_bytes(amqp_bytes_t encoded, size_t *offset, } } -extern int amqp_decode_table(amqp_bytes_t encoded, - amqp_pool_t *pool, - amqp_table_t *output, - size_t *offset); - -extern int amqp_encode_table(amqp_bytes_t encoded, - amqp_table_t *input, - size_t *offset); - extern void amqp_abort(const char *fmt, ...); #ifndef NDEBUG |