Better support for tables

2 files changed, 29 insertions, 0 deletions

diff --git a/librabbitmq/amqp.h b/librabbitmq/amqp.h
index c5314fb..f27af7f 100644
--- a/librabbitmq/amqp.h
+++ b/librabbitmq/amqp.h
@@ -20,6 +20,8 @@ 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;
@@ -37,6 +39,13 @@ typedef struct amqp_table_entry_t_ {
   } value;
 } amqp_table_entry_t;
 
+#define _AMQP_TE_INIT(ke,ki,v) { .key = (ke), .kind = (ki), .value = { v } }
+#define AMQP_TABLE_ENTRY_S(k,v) _AMQP_TE_INIT(amqp_cstring_bytes(k), 'S', .bytes = (v))
+#define AMQP_TABLE_ENTRY_I(k,v) _AMQP_TE_INIT(amqp_cstring_bytes(k), 'I', .i32 = (v))
+#define AMQP_TABLE_ENTRY_D(k,v) _AMQP_TE_INIT(amqp_cstring_bytes(k), 'D', .decimal = (v))
+#define AMQP_TABLE_ENTRY_T(k,v) _AMQP_TE_INIT(amqp_cstring_bytes(k), 'T', .u64 = (v))
+#define AMQP_TABLE_ENTRY_F(k,v) _AMQP_TE_INIT(amqp_cstring_bytes(k), 'F', .table = (v))
+
 typedef struct amqp_pool_blocklist_t_ {
   int num_blocks;
   void **blocklist;
diff --git a/librabbitmq/amqp_table.c b/librabbitmq/amqp_table.c
index e881f7b..16d85ff 100644
--- a/librabbitmq/amqp_table.c
+++ b/librabbitmq/amqp_table.c
@@ -7,6 +7,8 @@
 #include "amqp.h"
 #include "amqp_private.h"
 
+#include <assert.h>
+
 #define INITIAL_TABLE_SIZE 16
 
 int amqp_decode_table(amqp_bytes_t encoded,
@@ -148,3 +150,21 @@ int amqp_encode_table(amqp_bytes_t encoded,
   *offsetptr = offset;
   return 0;
 }
+
+int amqp_table_entry_cmp(void const *entry1, void const *entry2) {
+  amqp_table_entry_t const *p1 = (amqp_table_entry_t const *) entry1;
+  amqp_table_entry_t const *p2 = (amqp_table_entry_t const *) entry2;
+
+  int d;
+  int minlen;
+
+  minlen = p1->key.len;
+  if (p2->key.len < minlen) minlen = p2->key.len;
+
+  d = memcmp(p1->key.bytes, p2->key.bytes, minlen);
+  if (d != 0) {
+    return d;
+  }
+
+  return p1->key.len - p2->key.len;
+}