Skip to content

Commit

Permalink
Nuke unused options bitfield
Browse files Browse the repository at this point in the history
  • Loading branch information
@PJK
PJK committed Apr 26, 2015
1 parent 586ee7f commit 6af430b
Show file tree
Hide file tree
Showing 12 changed files with 90 additions and 111 deletions.
6 changes: 3 additions & 3 deletions demo/demo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ unsigned char data2[] = { 0x18, 0xFF };
unsigned char data3[] = { 0x19, 0x01, 0xf4 };

int main() {
number = cbor_load(data, 1, CBOR_FLAGS_NONE, &res);
number = cbor_load(data, 1, &res);
printf("Hello world, this is libcbor v%s\n", CBOR_VERSION);
printf("Result: %u\n", res.error.code);
printf("Result: %d, %hhu\n", cbor_typeof(number), cbor_get_uint8(number));

number = cbor_load(data2, 2, CBOR_FLAGS_NONE, &res);
number = cbor_load(data2, 2, &res);
printf("Result: %u\n", res.error.code);
printf("Result: %d, %hhu\n", cbor_typeof(number), cbor_get_uint8(number));

number = cbor_load(data3, 3, CBOR_FLAGS_NONE, &res);
number = cbor_load(data3, 3, &res);
printf("Result: %u\n", res.error.code);
printf("Result: %d, %u\n", cbor_typeof(number), cbor_get_uint16(number));
}
1 change: 0 additions & 1 deletion src/cbor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ void cbor_decref(cbor_item_t ** item)

cbor_item_t * cbor_load(cbor_data source,
size_t source_size,
cbor_flags_t flags,
struct cbor_load_result * result)
{
/* Context stack */
Expand Down
56 changes: 33 additions & 23 deletions src/cbor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,6 @@

_Static_assert(sizeof(size_t) >= 8, "size_t must be at least 64 bits"); /* Otherwise we cannot support reasonably sized chunks */

/*
* Packed bitfield
*/
// TODO ensure this works on big endian systems (I doubt it)
typedef union {
struct {
bool no_realloc : 1;
bool canonical : 1;
int : sizeof(int) * 8 - 2; /* Padding */
};
int raw;
} cbor_flags_t;

#define CBOR_FLAGS_NONE ((cbor_flags_t) { { 0 } })

typedef enum { /* Corresponding Major Type */
CBOR_TYPE_UINT, /* 0 */
CBOR_TYPE_NEGINT, /* 1 */
Expand Down Expand Up @@ -70,13 +55,6 @@ typedef enum {
CBOR_CTRL_UNDEF
} cbor_ctrl;

// TODO hook these into the parser
typedef enum {
_CBOR_METADATA_EMPTY = 0x00,
_CBOR_METADATA_COMPLETE = 0x01,
_CBOR_METADATA_RESUMABLE = 0x02, /* Parsing may be resumed */
} _cbor_metadata;

typedef enum {
_CBOR_METADATA_DEFINITE,
_CBOR_METADATA_INDEFINITE
Expand Down Expand Up @@ -264,10 +242,23 @@ struct cbor_decoder_result {
enum cbor_decoder_status status;
};


/*
* ============================================================================
* High level decoding
* ============================================================================
*/

struct cbor_decoder_result cbor_stream_decode(cbor_data, size_t, const struct cbor_callbacks *, void *);
cbor_item_t * cbor_load(cbor_data source, size_t source_size, cbor_flags_t flags, struct cbor_load_result * result);
cbor_item_t * cbor_load(cbor_data source, size_t source_size, struct cbor_load_result * result);


/*
* ============================================================================
* Primitives encoding
* ============================================================================
*/

size_t cbor_encode_uint8(uint8_t, unsigned char *, size_t);
size_t cbor_encode_uint16(uint16_t, unsigned char *, size_t);
size_t cbor_encode_uint32(uint32_t, unsigned char *, size_t);
Expand Down Expand Up @@ -302,6 +293,13 @@ size_t cbor_encode_float(float, unsigned char *, size_t);
size_t cbor_encode_double(double, unsigned char *, size_t);
size_t cbor_encode_break(unsigned char *, size_t);


/*
* ============================================================================
* High level encoding
* ============================================================================
*/

size_t cbor_serialize(const cbor_item_t *, unsigned char *, size_t);
size_t cbor_serialize_uint(const cbor_item_t *, unsigned char *, size_t);
size_t cbor_serialize_negint(const cbor_item_t *, unsigned char *, size_t);
Expand All @@ -312,9 +310,21 @@ size_t cbor_serialize_map(const cbor_item_t *, unsigned char *, size_t);
size_t cbor_serialize_tag(const cbor_item_t *, unsigned char *, size_t);
size_t cbor_serialize_float_ctrl(const cbor_item_t *, unsigned char *, size_t);

/*
* ============================================================================
* Memory management
* ============================================================================
*/

void cbor_incref(cbor_item_t * item);
void cbor_decref(cbor_item_t ** item);

/*
* ============================================================================
* Data manipulation
* ============================================================================
*/

cbor_type cbor_typeof(const cbor_item_t * item); /* Will be inlined iff link-time opt is enabled */

/* Standard item types as described by the RFC */
Expand Down
30 changes: 0 additions & 30 deletions test/bitfield_test.c
View file

This file was deleted.

16 changes: 8 additions & 8 deletions test/type_0_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ unsigned char data5[] = { 0x1b, 0xa5, 0xf7, 0x02, 0xb3, 0xa5, 0xf7, 0x02, 0xb3,


static void test_very_short_int(void **state) {
number = cbor_load(data1, 2, CBOR_FLAGS_NONE, &res);
number = cbor_load(data1, 2, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_8);
assert_true(cbor_isa_uint(number));
Expand All @@ -32,13 +32,13 @@ static void test_very_short_int(void **state) {
}

static void test_incomplete_data(void **state) {
number = cbor_load(data2, 1, CBOR_FLAGS_NONE, &res);
number = cbor_load(data2, 1, &res);
assert_null(number);
assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
}

static void test_short_int(void **state) {
number = cbor_load(data2, 3, CBOR_FLAGS_NONE, &res);
number = cbor_load(data2, 3, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_8);
assert_true(cbor_isa_uint(number));
Expand All @@ -52,7 +52,7 @@ static void test_short_int(void **state) {
}

static void test_half_int(void **state) {
number = cbor_load(data3, 5, CBOR_FLAGS_NONE, &res);
number = cbor_load(data3, 5, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_16);
assert_true(cbor_isa_uint(number));
Expand All @@ -66,7 +66,7 @@ static void test_half_int(void **state) {
}

static void test_int(void **state) {
number = cbor_load(data4, 6, CBOR_FLAGS_NONE, &res);
number = cbor_load(data4, 6, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_32);
assert_true(cbor_isa_uint(number));
Expand All @@ -80,7 +80,7 @@ static void test_int(void **state) {
}

static void test_long_int(void **state) {
number = cbor_load(data5, 10, CBOR_FLAGS_NONE, &res);
number = cbor_load(data5, 10, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_UINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_64);
assert_true(cbor_isa_uint(number));
Expand All @@ -94,7 +94,7 @@ static void test_long_int(void **state) {
}

static void test_refcounting(void **state) {
number = cbor_load(data5, 10, CBOR_FLAGS_NONE, &res);
number = cbor_load(data5, 10, &res);
cbor_incref(number);
assert_true(number->refcount == 2);
cbor_decref(&number);
Expand All @@ -104,7 +104,7 @@ static void test_refcounting(void **state) {
}

static void test_empty_input(void **state) {
number = cbor_load(data5, 0, CBOR_FLAGS_NONE, &res);
number = cbor_load(data5, 0, &res);
assert_null(number);
assert_true(res.error.code == CBOR_ERR_NODATA);
}
Expand Down
10 changes: 5 additions & 5 deletions test/type_1_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ unsigned char data5[] = { 0x3b, 0xa5, 0xf7, 0x02, 0xb3, 0xa5, 0xf7, 0x02, 0xb3,


static void test_very_short_int(void **state) {
number = cbor_load(data1, 2, CBOR_FLAGS_NONE, &res);
number = cbor_load(data1, 2, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_8);
assert_false(cbor_isa_uint(number));
Expand All @@ -32,7 +32,7 @@ static void test_very_short_int(void **state) {
}

static void test_short_int(void **state) {
number = cbor_load(data2, 3, CBOR_FLAGS_NONE, &res);
number = cbor_load(data2, 3, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_8);
assert_false(cbor_isa_uint(number));
Expand All @@ -46,7 +46,7 @@ static void test_short_int(void **state) {
}

static void test_half_int(void **state) {
number = cbor_load(data3, 5, CBOR_FLAGS_NONE, &res);
number = cbor_load(data3, 5, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_16);
assert_false(cbor_isa_uint(number));
Expand All @@ -60,7 +60,7 @@ static void test_half_int(void **state) {
}

static void test_int(void **state) {
number = cbor_load(data4, 6, CBOR_FLAGS_NONE, &res);
number = cbor_load(data4, 6, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_32);
assert_false(cbor_isa_uint(number));
Expand All @@ -74,7 +74,7 @@ static void test_int(void **state) {
}

static void test_long_int(void **state) {
number = cbor_load(data5, 10, CBOR_FLAGS_NONE, &res);
number = cbor_load(data5, 10, &res);
assert_true(cbor_typeof(number) == CBOR_TYPE_NEGINT);
assert_true(cbor_int_get_width(number) == CBOR_INT_64);
assert_false(cbor_isa_uint(number));
Expand Down
24 changes: 12 additions & 12 deletions test/type_2_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ unsigned char data7[] = { 0x5B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
unsigned char data8[] = { 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF};

static void test_empty_bs(void **state) {
bs = cbor_load(data1, 2, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data1, 2, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -32,7 +32,7 @@ static void test_empty_bs(void **state) {


static void test_embedded_bs(void **state) {
bs = cbor_load(data2, 2, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data2, 2, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -46,13 +46,13 @@ static void test_embedded_bs(void **state) {


static void test_notenough_data(void **state) {
bs = cbor_load(data3, 2, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data3, 2, &res);
assert_null(bs);
assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
}

static void test_short_bs1(void **state) {
bs = cbor_load(data3, 4, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data3, 4, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -65,7 +65,7 @@ static void test_short_bs1(void **state) {
}

static void test_short_bs2(void **state) {
bs = cbor_load(data4, 259, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data4, 259, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -77,7 +77,7 @@ static void test_short_bs2(void **state) {
}

static void test_half_bs(void **state) {
bs = cbor_load(data5, 259, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data5, 259, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -89,7 +89,7 @@ static void test_half_bs(void **state) {
}

static void test_int_bs(void **state) {
bs = cbor_load(data6, 261, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data6, 261, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -101,7 +101,7 @@ static void test_int_bs(void **state) {
}

static void test_long_bs(void **state) {
bs = cbor_load(data7, 265, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data7, 265, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -115,7 +115,7 @@ static void test_long_bs(void **state) {
unsigned char data9[] = { 0x5F, 0xFF };

static void test_zero_indef(void **state) {
bs = cbor_load(data9, 2, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data9, 2, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -130,7 +130,7 @@ unsigned char data10[] = { 0x5F, 0x58, 0x01, 0xA1, 0xFF, 0xFF };
/* start | bstring | break| extra */

static void test_short_indef(void **state) {
bs = cbor_load(data10, 6, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data10, 6, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -149,7 +149,7 @@ unsigned char data11[] = { 0x5F, 0x58, 0x01, 0xA1, 0x58, 0x01, 0xA2, 0xFF, 0xFF
/* start | bstring | bstring | break| extra */

static void test_two_indef(void **state) {
bs = cbor_load(data11, 9, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data11, 9, &res);
assert_non_null(bs);
assert_true(cbor_typeof(bs) == CBOR_TYPE_BYTESTRING);
assert_true(cbor_isa_bytestring(bs));
Expand All @@ -171,7 +171,7 @@ unsigned char data12[] = { 0x5F, 0x58, 0x01 };
/* start | bstring - too short */

static void test_missing_indef(void **state) {
bs = cbor_load(data12, 3, CBOR_FLAGS_NONE, &res);
bs = cbor_load(data12, 3, &res);
assert_true(res.error.code == CBOR_ERR_NOTENOUGHDATA);
assert_null(bs);
}
Expand Down

0 comments on commit 6af430b

Please sign in to comment.