commit 7e4cb53adeb05c938807fb6aa196e6abac27eb0a
author Joe Hildebrand <joe-github@cursive.net> Wed Apr 01 16:26:02 2015 -0600
committer Joe Hildebrand <joe-github@cursive.net> Wed Apr 01 16:26:02 2015 -0600
tree 4b8f681b0c22a0bdb4ab50c907a150c2ed7cc0f4
parent 74954bbf2ade6cf97b9ac98b10326dedd8dcea3d

make it work with contexts again

include/cn-cbor/cn-cbor.h

diff --git a/include/cn-cbor/cn-cbor.h b/include/cn-cbor/cn-cbor.h
index 05f3628..ac8cfdd 100644
--- a/include/cn-cbor/cn-cbor.h
+++ b/include/cn-cbor/cn-cbor.h
@@ -322,12 +322,10 @@
  * @param[in]   cb_map       The map to insert into
  * @param[in]   key          The key
  * @param[in]   cb_value     The value
- * @param[in]   CBOR_CONTEXT Allocation context (only if USE_CBOR_CONTEXT is defined)
  * @param[out]  errp         Error
  */
 void cn_cbor_map_put(cn_cbor* cb_map,
-                     cn_cbor *cb_key, cn_cbor *cb_value
-                     CBOR_CONTEXT,
+                     cn_cbor *cb_key, cn_cbor *cb_value,
                      cn_cbor_errback *errp);
 
 /**

src/cbor.h

diff --git a/src/cbor.h b/src/cbor.h
index 9900e55..1859f09 100644
--- a/src/cbor.h
+++ b/src/cbor.h
@@ -109,10 +109,10 @@
 #define CN_FREE free
 #endif
 
+#endif // USE_CBOR_CONTEXT
+
 #ifndef UNUSED_PARAM
 #define UNUSED_PARAM(p) ((void)&(p))
 #endif
 
-#endif // USE_CBOR_CONTEXT
-
 #endif // CBOR_PROTOCOL_H__

src/cn-create.c

diff --git a/src/cn-create.c b/src/cn-create.c
index 88c1460..d0780f7 100644
--- a/src/cn-create.c
+++ b/src/cn-create.c
@@ -91,8 +91,7 @@
 }
 
 void cn_cbor_map_put(cn_cbor* cb_map,
-                     cn_cbor *cb_key, cn_cbor *cb_value
-                     CBOR_CONTEXT,
+                     cn_cbor *cb_key, cn_cbor *cb_value,
                      cn_cbor_errback *errp)
 {
   //Make sure input is a map. Otherwise

test/cbor_test.c

diff --git a/test/cbor_test.c b/test/cbor_test.c
index 9c32725..5e0b302 100644
--- a/test/cbor_test.c
+++ b/test/cbor_test.c
@@ -266,8 +266,8 @@
 
     cn_cbor_map_put(cb_map,
                     cn_cbor_string_create("bar" CONTEXT_NULL, &err),
-                    cn_cbor_string_create("qux" CONTEXT_NULL, &err)
-                    CONTEXT_NULL, &err);
+                    cn_cbor_string_create("qux" CONTEXT_NULL, &err),
+                    &err);
     ASSERT_TRUE(err.err == CN_CBOR_NO_ERROR);
     ASSERT_TRUE(cb_map->length == 8);
 
@@ -291,7 +291,7 @@
     ASSERT_EQUAL(err.err, CN_CBOR_ERR_INVALID_PARAMETER);
     cn_cbor_mapput_string(ci, "foo", NULL, CONTEXT_NULL_COMMA &err);
     ASSERT_EQUAL(err.err, CN_CBOR_ERR_INVALID_PARAMETER);
-    cn_cbor_map_put(ci, NULL, NULL, CONTEXT_NULL_COMMA &err);
+    cn_cbor_map_put(ci, NULL, NULL, &err);
 }
 
 CTEST(cbor, array)