Better simple values encoding

src/cbor.c

@@ -443,7 +443,6 @@ struct cbor_decoder_result cbor_stream_decode(cbor_data source, size_t source_si
 	}
 	case 0x78:
 		/* One byte length string */
-		// TODO template this?
 	{
 		if (_cbor_claim_bytes(1, source_size, &result)) {
 			size_t length = (size_t) _cbor_load_uint8(source + 1);
@@ -834,7 +833,7 @@ cbor_int_width cbor_int_get_width(const cbor_item_t *item)
 
 uint8_t cbor_get_uint8(const cbor_item_t *item)
 {
-	return *(uint8_t *) item->data;
+	return *item->data;
 }
 
 uint16_t cbor_get_uint16(const cbor_item_t *item)
@@ -856,7 +855,7 @@ void cbor_set_uint8(cbor_item_t *item, uint8_t value)
 {
 	assert(cbor_is_int(item));
 	assert(cbor_int_get_width(item) == CBOR_INT_8);
-	*(uint8_t *) item->data = value;
+	*item->data = value;
 }
 
 void cbor_set_uint16(cbor_item_t *item, uint16_t value)

src/cbor.h

@@ -301,8 +301,7 @@ size_t cbor_encode_half(float, unsigned char *, size_t);
 size_t cbor_encode_single(float, unsigned char *, size_t);
 size_t cbor_encode_double(double, unsigned char *, size_t);
 size_t cbor_encode_break(unsigned char *, size_t);
-size_t cbor_encode_float(unsigned char *, size_t);
-size_t cbor_encode_ctrl(unsigned char *, size_t);
+size_t cbor_encode_ctrl(uint8_t, unsigned char *, size_t);
 
 
 /*

src/cbor_encoders.c

@@ -249,3 +249,8 @@ size_t cbor_encode_break(unsigned char *buffer, size_t buffer_size)
 {
 	return _cbor_encode_byte(0xFF, buffer, buffer_size);
 }
+
+size_t cbor_encode_ctrl(uint8_t value, unsigned char * buffer, size_t buffer_size)
+{
+	return _cbor_encode_uint8(value, buffer, buffer_size, 0xE0);
+}

src/cbor_serializers.c

@@ -225,10 +225,9 @@ size_t cbor_serialize_float_ctrl(const cbor_item_t *item, unsigned char *buffer,
 {
 	assert(cbor_isa_float_ctrl(item));
 	switch (cbor_float_get_width(item)) {
-	case CBOR_FLOAT_0: {
+	case CBOR_FLOAT_0:
 		/* CTRL - special treatment */
-		break;
-	}
+		return cbor_encode_ctrl(cbor_ctrl_value(item), buffer, buffer_size);
 	case CBOR_FLOAT_16:
 		return cbor_encode_half(cbor_float_get_float2(item), buffer, buffer_size);
 	case CBOR_FLOAT_32:

test/cbor_serialize_test.c

@@ -257,11 +257,20 @@ static void test_serialize_double(void **state)
 
 static void test_serialize_ctrl(void **state)
 {
-	cbor_item_t *item = cbor_new_float8();
-	cbor_set_float8(item, -4.1);
+	cbor_item_t *item = cbor_new_undef();
 
-	assert_int_equal(9, cbor_serialize(item, buffer, 512));
-	assert_memory_equal(buffer, ((unsigned char[]) {0xFB, 0xC0, 0x10, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66}), 9);
+	assert_int_equal(1, cbor_serialize(item, buffer, 512));
+	assert_memory_equal(buffer, ((unsigned char[]) {0xF7}), 1);
+	cbor_decref(&item);
+}
+
+static void test_serialize_long_ctrl(void **state)
+{
+	cbor_item_t *item = cbor_new_ctrl();
+	cbor_set_ctrl(item, 254);
+
+	assert_int_equal(2, cbor_serialize(item, buffer, 512));
+	assert_memory_equal(buffer, ((unsigned char[]) {0xF8, 0xFE}), 2);
 	cbor_decref(&item);
 }
 
@@ -288,7 +297,9 @@ int main(void)
 		unit_test(test_serialize_tags),
 		unit_test(test_serialize_half),
 		unit_test(test_serialize_single),
-		unit_test(test_serialize_double)
+		unit_test(test_serialize_double),
+		unit_test(test_serialize_ctrl),
+		unit_test(test_serialize_long_ctrl)
 	};
 	return run_tests(tests);
 }