Unify definite/indefinite enums 2/2

Author: PJK

src/cbor.c

@@ -1005,7 +1005,7 @@ cbor_item_t * cbor_new_definite_string()
 	*item = (cbor_item_t){
 		.refcount = 1,
 		.type = CBOR_TYPE_STRING,
-		.metadata = { .string_metadata = { _CBOR_STRING_METADATA_DEFINITE, 0 } }
+		.metadata = { .string_metadata = { _CBOR_METADATA_DEFINITE, 0 } }
 	};
 	return item;
 }
@@ -1016,7 +1016,7 @@ cbor_item_t * cbor_new_indefinite_string()
 	*item = (cbor_item_t){
 		.refcount = 1,
 		.type = CBOR_TYPE_STRING,
-		.metadata = { .string_metadata = { .type = _CBOR_STRING_METADATA_INDEFINITE, .length = 0 } },
+		.metadata = { .string_metadata = { .type = _CBOR_METADATA_INDEFINITE, .length = 0 } },
 		.data = malloc(sizeof(struct cbor_indefinite_string_data))
 	};
 	*((struct cbor_indefinite_string_data *)item->data) = (struct cbor_indefinite_string_data){
@@ -1088,7 +1088,7 @@ size_t cbor_string_codepoint_count(const cbor_item_t * item)
 bool cbor_string_is_definite(const cbor_item_t * item)
 {
 	assert(cbor_isa_string(item));
-	return item->metadata.string_metadata.type == _CBOR_STRING_METADATA_DEFINITE;
+	return item->metadata.string_metadata.type == _CBOR_METADATA_DEFINITE;
 }
 
 bool cbor_string_is_indefinite(const cbor_item_t * item)
@@ -1103,7 +1103,7 @@ cbor_item_t * cbor_new_definite_bytestring()
 	*item = (cbor_item_t){
 		.refcount = 1,
 		.type = CBOR_TYPE_BYTESTRING,
-		.metadata = { .bytestring_metadata = { _CBOR_STRING_METADATA_DEFINITE, 0 } }
+		.metadata = { .bytestring_metadata = { _CBOR_METADATA_DEFINITE, 0 } }
 	};
 	return item;
 }
@@ -1114,7 +1114,7 @@ cbor_item_t * cbor_new_indefinite_bytestring()
 	*item = (cbor_item_t){
 		.refcount = 1,
 		.type = CBOR_TYPE_BYTESTRING,
-		.metadata = { .bytestring_metadata = { .type = _CBOR_STRING_METADATA_INDEFINITE, .length = 0 } },
+		.metadata = { .bytestring_metadata = { .type = _CBOR_METADATA_INDEFINITE, .length = 0 } },
 		.data = malloc(sizeof(struct cbor_indefinite_string_data))
 	};
 	*((struct cbor_indefinite_string_data *)item->data) = (struct cbor_indefinite_string_data){
@@ -1356,7 +1356,7 @@ unsigned char * cbor_bytestring_handle(const cbor_item_t * item) {
 bool cbor_bytestring_is_definite(const cbor_item_t * item)
 {
 	assert(cbor_isa_bytestring(item));
-	return item->metadata.bytestring_metadata.type == _CBOR_STRING_METADATA_DEFINITE;
+	return item->metadata.bytestring_metadata.type == _CBOR_METADATA_DEFINITE;
 }
 
 bool cbor_bytestring_is_indefinite(const cbor_item_t * item)

src/cbor.h

@@ -82,33 +82,29 @@ typedef enum {
 	_CBOR_METADATA_RESUMABLE = 0x02,	/* Parsing may be resumed */
 } _cbor_metadata;
 
+typedef enum {
+	_CBOR_METADATA_DEFINITE,
+	_CBOR_METADATA_INDEFINITE
+} _cbor_dst_metadata;
+
+
 struct _cbor_int_metadata {
 	cbor_int_width width;
 };
 
-typedef enum {
-	_CBOR_STRING_METADATA_DEFINITE,
-	_CBOR_STRING_METADATA_INDEFINITE
-} _cbor_string_type_metadata;
-
 struct _cbor_bytestring_metadata {
 	size_t length;
-	_cbor_string_type_metadata type;
+	_cbor_dst_metadata type;
 };
 
 struct _cbor_string_metadata {
-	size_t                     length;
-	size_t                     codepoint_count; /* Sum of chunks' codepoint_counts for indefinite strings */
-	_cbor_string_type_metadata type;
+	size_t             length;
+	size_t             codepoint_count; /* Sum of chunks' codepoint_counts for indefinite strings */
+	_cbor_dst_metadata type;
 };
 
-typedef enum {
-	_CBOR_METADATA_DEFINITE,
-	_CBOR_METADATA_INDEFINITE
-} _cbor_dst_metadata;
-
 struct _cbor_array_metadata {
-	size_t                  size;
+	size_t             size;
 	_cbor_dst_metadata type;
 };