Rename cbor_encoder_write() to cn_cbor_encoder_write() The public API prefixes all symbols with cn_cbor_, so it seems reasonable to rename cbor_encoder_write() to cn_cbor_encoder_write().
diff --git a/include/cn-cbor/cn-cbor.h b/include/cn-cbor/cn-cbor.h index 7dc67a3..86e4a4c 100644 --- a/include/cn-cbor/cn-cbor.h +++ b/include/cn-cbor/cn-cbor.h
@@ -263,10 +263,10 @@ * @param[in] cb [description] * @return -1 on fail, or number of bytes written */ -ssize_t cbor_encoder_write(uint8_t *buf, - size_t buf_offset, - size_t buf_size, - const cn_cbor *cb); +ssize_t cn_cbor_encoder_write(uint8_t *buf, + size_t buf_offset, + size_t buf_size, + const cn_cbor *cb); /** * Create a CBOR map.
diff --git a/src/cn-encoder.c b/src/cn-encoder.c index f53e2c6..8593b39 100644 --- a/src/cn-encoder.c +++ b/src/cn-encoder.c
@@ -291,10 +291,10 @@ write_byte_ensured(IB_BREAK); } -ssize_t cbor_encoder_write(uint8_t *buf, - size_t buf_offset, - size_t buf_size, - const cn_cbor *cb) +ssize_t cn_cbor_encoder_write(uint8_t *buf, + size_t buf_offset, + size_t buf_size, + const cn_cbor *cb) { cn_write_state ws = { buf, buf_offset, buf_size }; _visit(cb, _encoder_visitor, _encoder_breaker, &ws);
diff --git a/test/cbor_test.c b/test/cbor_test.c index 43f73a4..ebd5edd 100644 --- a/test/cbor_test.c +++ b/test/cbor_test.c
@@ -125,7 +125,7 @@ ASSERT_EQUAL(err.err, CN_CBOR_NO_ERROR); ASSERT_NOT_NULL(cb); - enc_sz = cbor_encoder_write(encoded, 0, sizeof(encoded), cb); + enc_sz = cn_cbor_encoder_write(encoded, 0, sizeof(encoded), cb); ASSERT_DATA(b.ptr, b.sz, encoded, enc_sz); free(b.ptr); cn_cbor_free(cb CONTEXT_NULL); @@ -174,7 +174,7 @@ ASSERT_EQUAL(err.err, CN_CBOR_NO_ERROR); ASSERT_NOT_NULL(cb); - enc_sz = cbor_encoder_write(encoded, 0, sizeof(encoded), cb); + enc_sz = cn_cbor_encoder_write(encoded, 0, sizeof(encoded), cb); ASSERT_DATA(b2.ptr, b2.sz, encoded, enc_sz); free(b.ptr); free(b2.ptr); @@ -195,7 +195,7 @@ ASSERT_NULL(cb); #endif /* CBOR_NO_FLOAT */ - /* enc_sz = cbor_encoder_write(encoded, 0, sizeof(encoded), cb); */ + /* enc_sz = cn_cbor_encoder_write(encoded, 0, sizeof(encoded), cb); */ /* ASSERT_DATA(b2.ptr, b2.sz, encoded, enc_sz); */ free(b.ptr); free(b2.ptr); @@ -227,7 +227,7 @@ uint8_t buf[10]; cn_cbor inv = {CN_CBOR_INVALID, 0, {0}, 0, NULL, NULL, NULL, NULL}; - ASSERT_EQUAL(-1, cbor_encoder_write(buf, 0, sizeof(buf), &inv)); + ASSERT_EQUAL(-1, cn_cbor_encoder_write(buf, 0, sizeof(buf), &inv)); for (i=0; i<sizeof(tests)/sizeof(cbor_failure); i++) { ASSERT_TRUE(parse_hex(tests[i].hex, &b)); @@ -264,7 +264,7 @@ cb = cn_cbor_decode(b.ptr, b.sz CONTEXT_NULL, &err); ASSERT_NOT_NULL(cb); - enc_sz = cbor_encoder_write(encoded, 0, sizeof(encoded), cb); + enc_sz = cn_cbor_encoder_write(encoded, 0, sizeof(encoded), cb); ASSERT_DATA(b.ptr, b.sz, encoded, enc_sz); free(b.ptr); @@ -425,6 +425,6 @@ ASSERT_NOT_NULL(cdata); ASSERT_TRUE(cn_cbor_mapput_int(map, 0, cdata, CONTEXT_NULL_COMMA NULL)); - enc_sz = cbor_encoder_write(encoded, 0, sizeof(encoded), map); + enc_sz = cn_cbor_encoder_write(encoded, 0, sizeof(encoded), map); ASSERT_EQUAL(7, enc_sz); }