Make the default writer and reader conditional

Author: vrahane

include/tinycbor/cbor.h

@@ -218,16 +218,19 @@ struct CborEncoder
 {
     cbor_encoder_writer *writer;
     void *writer_arg;
+#ifndef NO_DFLT_WRITER
     struct cbor_buf_writer wr;
+#endif
     size_t added;
     size_t container_size;
     int flags;
 };
 
 typedef struct CborEncoder CborEncoder;
 
-
+#ifndef NO_DFLT_WRITER
 CBOR_API void cbor_encoder_init(CborEncoder *encoder, uint8_t *buffer, size_t size, int flags);
+#endif
 CBOR_API void cbor_encoder_cust_writer_init(CborEncoder *encoder, struct cbor_encoder_writer *w, int flags);
 CBOR_API CborError cbor_encode_uint(CborEncoder *encoder, uint64_t value);
 CBOR_API CborError cbor_encode_int(CborEncoder *encoder, int64_t value);
@@ -278,7 +281,9 @@ enum CborParserIteratorFlags
 
 struct CborParser
 {
+#ifndef NO_DFLT_READER
     struct cbor_buf_reader br;
+#endif
     struct cbor_decoder_reader *d;
     int end;
     int flags;
@@ -296,7 +301,9 @@ struct CborValue
 };
 typedef struct CborValue CborValue;
 
+#ifndef NO_DFLT_READER
 CBOR_API CborError cbor_parser_init(const uint8_t *buffer, size_t size, int flags, CborParser *parser, CborValue *it);
+#endif
 CBOR_API CborError cbor_parser_cust_reader_init(struct cbor_decoder_reader *r, int flags, CborParser *parser, CborValue *it);
 
 CBOR_API CborError cbor_value_validate_basic(const CborValue *it);

src/cborencoder.c

@@ -194,6 +194,7 @@
  * Structure used to encode to CBOR.
  */
 
+#ifndef NO_DFLT_WRITER
 /**
  * Initializes a CborEncoder structure \a encoder by pointing it to buffer \a
  * buffer of size \a size. The \a flags field is currently unused and must be
@@ -205,6 +206,7 @@ void cbor_encoder_init(CborEncoder *encoder, uint8_t *buffer, size_t size, int f
 
     cbor_encoder_cust_writer_init(encoder, &encoder->wr.enc, flags);
 }
+#endif
 
 /**
  * Initializes a CborEncoder structure \a encoder by pointing it to buffer \a

src/cborparser.c

@@ -316,6 +316,7 @@ uint64_t _cbor_value_decode_int64_internal(const CborValue *value)
         return value->parser->d->get64(value->parser->d, value->offset + 1);
 }
 
+#ifndef NO_DFLT_READER
 /**
  * Initializes the CBOR parser for parsing \a size bytes beginning at \a
  * buffer. Parsing will use flags set in \a flags. The iterator to the first
@@ -334,6 +335,7 @@ CborError cbor_parser_init(const uint8_t *buffer, size_t size, int flags, CborPa
 
     return cbor_parser_cust_reader_init(&parser->br.r, flags, parser, it);
 }
+#endif
 
 /**
  * Initializes the CBOR parser for parsing. It uses the \a decoder reader. Parsing will