Merge branch 'main' into dev

Author: thiagomacieira

.appveyor.yml

@@ -8,7 +8,7 @@ install:
 - cmd: >-
     if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.13\msvc2017)
 
-    if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.1\msvc2019_64)
+    if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.5\msvc2019_64)
 
     set path=%PATH%;%QTDIR%\bin
 build_script:

Makefile

@@ -240,7 +240,7 @@ cflags += -std=gnu99 $(CFLAGS)
 
 ifneq ($(DISABLE_WERROR),1)
 cflags += \
-	-Werror=discarded-qualifiers \
+	$(shell $(CC) -S -Werror -Wdiscarded-qualifiers -o - -xc /dev/null >/dev/null 2>&1 && echo -Werror=discarded-qualifiers) \
 	-Werror=incompatible-pointer-types \
 	-Werror=implicit-function-declaration \
 	-Werror=int-conversion

src/cbor.h

@@ -34,6 +34,10 @@
 #include <string.h>
 #include <stdio.h>
 
+#ifdef CBOR_EXTERNAL_CFG
+#include "cbor_cfg.h"
+#endif
+
 #include "tinycbor-version.h"
 
 #define TINYCBOR_VERSION            ((TINYCBOR_VERSION_MAJOR << 16) | (TINYCBOR_VERSION_MINOR << 8) | TINYCBOR_VERSION_PATCH)

src/cborencoder.c

@@ -31,6 +31,7 @@
 #ifndef __STDC_LIMIT_MACROS
 #  define __STDC_LIMIT_MACROS 1
 #endif
+#define __STDC_WANT_IEC_60559_TYPES_EXT__
 
 #include "cbor.h"
 #include "cborinternal_p.h"
@@ -101,7 +102,7 @@
  * complete the encoding. At the end, you can obtain that count by calling
  * cbor_encoder_get_extra_bytes_needed().
  *
- * \section1 Finalizing the encoding
+ * \section Finalizing the encoding
  *
  * Once all items have been appended and the containers have all been properly
  * closed, the user-supplied buffer will contain the CBOR stream and may be
@@ -558,7 +559,7 @@ CborError cbor_encoder_create_array(CborEncoder *parentEncoder, CborEncoder *arr
  * when creating the map, the constant \ref CborIndefiniteLength may be passed as
  * length instead, and an indefinite length map is created.
  *
- * \b{Implementation limitation:} TinyCBOR cannot encode more than SIZE_MAX/2
+ * <b>Implementation limitation:</b> TinyCBOR cannot encode more than SIZE_MAX/2
  * key-value pairs in the stream. If the length \a length is larger than this
  * value (and is not \ref CborIndefiniteLength), this function returns error
  * CborErrorDataTooLarge.

src/cborencoder_close_container_checked.c

@@ -27,6 +27,7 @@
 #ifndef __STDC_LIMIT_MACROS
 #  define __STDC_LIMIT_MACROS 1
 #endif
+#define __STDC_WANT_IEC_60559_TYPES_EXT__
 
 #include "cbor.h"
 

src/cborencoder_float.c

@@ -27,6 +27,7 @@
 #ifndef __STDC_LIMIT_MACROS
 #  define __STDC_LIMIT_MACROS 1
 #endif
+#define __STDC_WANT_IEC_60559_TYPES_EXT__
 
 #include "cbor.h"
 

src/cborinternal_p.h

@@ -25,19 +25,46 @@
 #ifndef CBORINTERNAL_P_H
 #define CBORINTERNAL_P_H
 
+/* Dependent source files (*.c) must define __STDC_WANT_IEC_60559_TYPES_EXT__
+ * before <float.h> is (transitively) first included.
+ */
+#if !defined(__STDC_WANT_IEC_60559_TYPES_EXT__)
+#  error __STDC_WANT_IEC_60559_TYPES_EXT__ not defined
+#endif
+
 #include "compilersupport_p.h"
 
 #ifndef CBOR_NO_FLOATING_POINT
 #  include <float.h>
 #  include <math.h>
+#  include <string.h>
 #else
 #  ifndef CBOR_NO_HALF_FLOAT_TYPE
 #    define CBOR_NO_HALF_FLOAT_TYPE     1
 #  endif
 #endif
 
 #ifndef CBOR_NO_HALF_FLOAT_TYPE
-#  if defined(__F16C__) || defined(__AVX2__)
+/* Check for FLT16_MANT_DIG using integer comparison. Clang headers incorrectly
+ * define this macro unconditionally when __STDC_WANT_IEC_60559_TYPES_EXT__
+ * is defined (regardless of actual support for _Float16).
+ */
+#  if FLT16_MANT_DIG > 0 || __FLT16_MANT_DIG__ > 0
+static inline unsigned short encode_half(float x)
+{
+    unsigned short h;
+    _Float16 f = (_Float16)x;
+    memcpy(&h, &f, 2);
+    return h;
+}
+
+static inline float decode_half(unsigned short x)
+{
+    _Float16 f;
+    memcpy(&f, &x, 2);
+    return (float)f;
+}
+#  elif defined(__F16C__) || defined(__AVX2__)
 #    include <immintrin.h>
 static inline unsigned short encode_half(float val)
 {

src/cborparser.c

@@ -31,6 +31,7 @@
 #ifndef __STDC_LIMIT_MACROS
 #  define __STDC_LIMIT_MACROS 1
 #endif
+#define __STDC_WANT_IEC_60559_TYPES_EXT__
 
 #include "cbor.h"
 #include "cborinternal_p.h"
@@ -93,7 +94,7 @@
  *
  * The code above does not execute a range-check either: it is possible that
  * the value decoded from the CBOR stream encodes a number larger than what can
- * be represented in a variable of type \c{int}. If detecting that case is
+ * be represented in a variable of type \c int. If detecting that case is
  * important, the code should call cbor_value_get_int_checked() instead.
  *
  * <h3 class="groupheader">Memory and parsing constraints</h3>
@@ -133,12 +134,10 @@
  *
  * \if privatedocs
  * Implementation details: the CborValue contains these fields:
- * \list
- *   \li ptr: pointer to the actual data
- *   \li flags: flags from the decoder
- *   \li extra: partially decoded integer value (0, 1 or 2 bytes)
- *   \li remaining: remaining items in this collection after this item or UINT32_MAX if length is unknown
- * \endlist
+ *   - ptr: pointer to the actual data
+ *   - flags: flags from the decoder
+ *   - extra: partially decoded integer value (0, 1 or 2 bytes)
+ *   - remaining: remaining items in this collection after this item or UINT32_MAX if length is unknown
  * \endif
  */
 
@@ -428,12 +427,10 @@ CborError cbor_value_reparse(CborValue *it)
  * will appear during parsing.
  *
  * A basic validation checks for:
- * \list
- *   \li absence of undefined additional information bytes;
- *   \li well-formedness of all numbers, lengths, and simple values;
- *   \li string contents match reported sizes;
- *   \li arrays and maps contain the number of elements they are reported to have;
- * \endlist
+ *   - absence of undefined additional information bytes;
+ *   - well-formedness of all numbers, lengths, and simple values;
+ *   - string contents match reported sizes;
+ *   - arrays and maps contain the number of elements they are reported to have;
  *
  * For further checks, see cbor_value_validate().
  *
@@ -744,7 +741,7 @@ CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed)
  * \ref cbor_value_is_integer is recommended.
  *
  * Note that this function does not do range-checking: integral values that do
- * not fit in a variable of type \c{int} are silently truncated to fit. Use
+ * not fit in a variable of type \c int are silently truncated to fit. Use
  * cbor_value_get_int_checked() if that is not acceptable.
  *
  * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer()
@@ -759,7 +756,7 @@ CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed)
  * \ref cbor_value_is_integer is recommended.
  *
  * Note that this function does not do range-checking: integral values that do
- * not fit in a variable of type \c{int64_t} are silently truncated to fit. Use
+ * not fit in a variable of type \c int64_t are silently truncated to fit. Use
  * cbor_value_get_int64_checked() that is not acceptable.
  *
  * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer()
@@ -790,7 +787,7 @@ CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed)
  * If the integer is unsigned (that is, if cbor_value_is_unsigned_integer()
  * returns true), then \a result will contain the actual value. If the integer
  * is negative, then \a result will contain the absolute value of that integer,
- * minus one. That is, \c {actual = -result - 1}. On architectures using two's
+ * minus one. That is, <tt>actual = -result - 1</tt>. On architectures using two's
  * complement for representation of negative integers, it is equivalent to say
  * that \a result will contain the bitwise negation of the actual value.
  *
@@ -1243,10 +1240,10 @@ static CborError iterate_string_chunks(const CborValue *value, char *buffer, siz
  * of the string in order to preallocate a buffer, use
  * cbor_value_calculate_string_length().
  *
- * On success, this function sets the number of bytes copied to \c{*buflen}. If
+ * On success, this function sets the number of bytes copied to \c *buflen. If
  * the buffer is large enough, this function will insert a null byte after the
  * last copied byte, to facilitate manipulation of text strings. That byte is
- * not included in the returned value of \c{*buflen}. If there was no space for
+ * not included in the returned value of \c *buflen. If there was no space for
  * the terminating null, no error is returned, so callers must check the value
  * of *buflen after the call, before relying on the '\0'; if it has not been
  * changed by the call, there is no '\0'-termination on the buffer's contents.
@@ -1280,10 +1277,10 @@ static CborError iterate_string_chunks(const CborValue *value, char *buffer, siz
  * of the string in order to preallocate a buffer, use
  * cbor_value_calculate_string_length().
  *
- * On success, this function sets the number of bytes copied to \c{*buflen}. If
+ * On success, this function sets the number of bytes copied to \c *buflen. If
  * the buffer is large enough, this function will insert a null byte after the
  * last copied byte, to facilitate manipulation of null-terminated strings.
- * That byte is not included in the returned value of \c{*buflen}.
+ * That byte is not included in the returned value of \c *buflen.
  *
  * The \a next pointer, if not null, will be updated to point to the next item
  * after this string. If \a value points to the last item, then \a next will be
@@ -1520,7 +1517,7 @@ CborError cbor_value_map_find_value(const CborValue *map, const char *string, Cb
  * cbor_value_is_half_float is recommended.
  *
  * Note: since the C language does not have a standard type for half-precision
- * floating point, this function takes a \c{void *} as a parameter for the
+ * floating point, this function takes a <tt>void *</tt> as a parameter for the
  * storage area, which must be at least 16 bits wide.
  *
  * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_half_float(), cbor_value_get_half_float_as_float(), cbor_value_get_float()

src/cborparser_dup_string.c

@@ -31,10 +31,18 @@
 #ifndef __STDC_LIMIT_MACROS
 #  define __STDC_LIMIT_MACROS 1
 #endif
+#define __STDC_WANT_IEC_60559_TYPES_EXT__
 
 #include "cbor.h"
 #include "compilersupport_p.h"
-#include <stdlib.h>
+
+#if defined(CBOR_CUSTOM_ALLOC_INCLUDE)
+#  include CBOR_CUSTOM_ALLOC_INCLUDE
+#else
+#  include <stdlib.h>
+#  define cbor_malloc malloc
+#  define cbor_free   free
+#endif
 
 /**
  * \fn CborError cbor_value_dup_text_string(const CborValue *value, char **buffer, size_t *buflen, CborValue *next)
@@ -50,8 +58,8 @@
  * If \c malloc returns a NULL pointer, this function will return error
  * condition \ref CborErrorOutOfMemory.
  *
- * On success, \c{*buffer} will contain a valid pointer that must be freed by
- * calling \c{free()}. This is the case even for zero-length strings.
+ * On success, \c *buffer will contain a valid pointer that must be freed by
+ * calling \c free(). This is the case even for zero-length strings.
  *
  * The \a next pointer, if not null, will be updated to point to the next item
  * after this string. If \a value points to the last item, then \a next will be
@@ -81,8 +89,8 @@
  * If \c malloc returns a NULL pointer, this function will return error
  * condition \ref CborErrorOutOfMemory.
  *
- * On success, \c{*buffer} will contain a valid pointer that must be freed by
- * calling \c{free()}. This is the case even for zero-length strings.
+ * On success, \c *buffer will contain a valid pointer that must be freed by
+ * calling \c free(). This is the case even for zero-length strings.
  *
  * The \a next pointer, if not null, will be updated to point to the next item
  * after this string. If \a value points to the last item, then \a next will be
@@ -105,14 +113,14 @@ CborError _cbor_value_dup_string(const CborValue *value, void **buffer, size_t *
         return err;
 
     ++*buflen;
-    *buffer = malloc(*buflen);
+    *buffer = cbor_malloc(*buflen);
     if (!*buffer) {
         /* out of memory */
         return CborErrorOutOfMemory;
     }
     err = _cbor_value_copy_string(value, *buffer, buflen, next);
     if (err) {
-        free(*buffer);
+        cbor_free(*buffer);
         return err;
     }
     return CborNoError;

src/cborparser_float.c

@@ -27,6 +27,7 @@
 #ifndef __STDC_LIMIT_MACROS
 #  define __STDC_LIMIT_MACROS 1
 #endif
+#define __STDC_WANT_IEC_60559_TYPES_EXT__
 
 #include "cbor.h"