Rename private functions to guard against name collisons (#194)
This makes names of functions that link into the target executable longer and more unique. This is doing the job of c++ name spaces.
This makes all the context variable names consistent "pMe" where sometimes "me" was used.
This pulls all the documentation of private functions that were publicly exposed into the .c files.
This cleans up other aspects of function definition/declaration.
Remove "inline" from functions in .c files. Assume that the compilers know better these days.
This adds "const" to arguments of lots of function implementations.
This makes no semantic changes. The generated object code should be identical.
* Rename private functions to avoid name collisons
* line lengths, consistent function naming
* More const
* const and missed rename
---------
Co-authored-by: Laurence Lundblade <lgl@securitytheory.com>
diff --git a/inc/qcbor/qcbor_decode.h b/inc/qcbor/qcbor_decode.h
index c75c923..bf4a042 100644
--- a/inc/qcbor/qcbor_decode.h
+++ b/inc/qcbor/qcbor_decode.h
@@ -1,6 +1,6 @@
/* ===========================================================================
* Copyright (c) 2016-2018, The Linux Foundation.
- * Copyright (c) 2018-2023, Laurence Lundblade.
+ * Copyright (c) 2018-2024, Laurence Lundblade.
* Copyright (c) 2021, Arm Limited.
* All rights reserved.
*
@@ -1481,7 +1481,7 @@
}
static inline bool
-QCBORDecode_IsNotWellFormedError(QCBORError uErr)
+QCBORDecode_IsNotWellFormedError(const QCBORError uErr)
{
if(uErr >= QCBOR_START_OF_NOT_WELL_FORMED_ERRORS &&
uErr <= QCBOR_END_OF_NOT_WELL_FORMED_ERRORS) {
@@ -1492,7 +1492,7 @@
}
static inline bool
-QCBORDecode_IsUnrecoverableError(QCBORError uErr)
+QCBORDecode_IsUnrecoverableError(const QCBORError uErr)
{
if(uErr >= QCBOR_START_OF_UNRECOVERABLE_DECODE_ERRORS &&
uErr <= QCBOR_END_OF_UNRECOVERABLE_DECODE_ERRORS) {
diff --git a/inc/qcbor/qcbor_encode.h b/inc/qcbor/qcbor_encode.h
index 38bfcc1..49d2394 100644
--- a/inc/qcbor/qcbor_encode.h
+++ b/inc/qcbor/qcbor_encode.h
@@ -1,6 +1,6 @@
/* ===========================================================================
* Copyright (c) 2016-2018, The Linux Foundation.
- * Copyright (c) 2018-2023, Laurence Lundblade.
+ * Copyright (c) 2018-2024, Laurence Lundblade.
* Copyright (c) 2021, Arm Limited.
* All rights reserved.
*
@@ -2255,7 +2255,7 @@
/**
* Encode the "head" of a CBOR data item.
*
- * @param buffer Buffer to output the encoded head to; must be
+ * @param Buffer Buffer to output the encoded head to; must be
* @ref QCBOR_HEAD_BUFFER_SIZE bytes in size.
* @param uMajorType One of CBOR_MAJOR_TYPE_XX.
* @param uMinLen The minimum number of bytes to encode uNumber. Almost
@@ -2289,7 +2289,7 @@
* See also QCBOREncode_AddBytesLenOnly();
*/
UsefulBufC
-QCBOREncode_EncodeHead(UsefulBuf buffer,
+QCBOREncode_EncodeHead(UsefulBuf Buffer,
uint8_t uMajorType,
uint8_t uMinLen,
uint64_t uNumber);
@@ -2298,141 +2298,50 @@
/* =========================================================================
- BEGINNING OF PRIVATE INLINE IMPLEMENTATION
+ BEGINNING OF PRIVATE IMPLEMENTATION
========================================================================= */
-/**
- * @brief Semi-private method to add a buffer full of bytes to encoded output
- *
- * @param[in] pCtx The encoding context to add the integer to.
- * @param[in] uMajorType The CBOR major type of the bytes.
- * @param[in] Bytes The bytes to add.
- *
- * Use QCBOREncode_AddText() or QCBOREncode_AddBytes() or
- * QCBOREncode_AddEncoded() instead. They are inline functions that
- * call this and supply the correct major type. This function is
- * public to make the inline functions work to keep the overall code
- * size down and because the C language has no way to make it private.
- *
- * If this is called the major type should be @c CBOR_MAJOR_TYPE_TEXT_STRING,
- * @c CBOR_MAJOR_TYPE_BYTE_STRING or @c CBOR_MAJOR_NONE_TYPE_RAW. The
- * last one is special for adding already-encoded CBOR.
- */
+/* Semi-private funcion used by public inline functions. See qcbor_encode.c */
void
-QCBOREncode_AddBuffer(QCBOREncodeContext *pCtx,
- uint8_t uMajorType,
- UsefulBufC Bytes);
+QCBOREncode_Private_AddBuffer(QCBOREncodeContext *pCtx,
+ uint8_t uMajorType,
+ UsefulBufC Bytes);
-/**
- * @brief Semi-private method to open a map, array or bstr-wrapped CBOR
- *
- * @param[in] pCtx The context to add to.
- * @param[in] uMajorType The major CBOR type to close
- *
- * Call QCBOREncode_OpenArray(), QCBOREncode_OpenMap() or
- * QCBOREncode_BstrWrap() instead of this.
- */
+/* Semi-private funcion used by public inline functions. See qcbor_encode.c */
void
-QCBOREncode_OpenMapOrArray(QCBOREncodeContext *pCtx, uint8_t uMajorType);
+QCBOREncode_Private_OpenMapOrArray(QCBOREncodeContext *pCtx,
+ uint8_t uMajorType);
-/**
- * @brief Semi-private method to open a map, array with indefinite length
- *
- * @param[in] pCtx The context to add to.
- * @param[in] uMajorType The major CBOR type to close
- *
- * Call QCBOREncode_OpenArrayIndefiniteLength() or
- * QCBOREncode_OpenMapIndefiniteLength() instead of this.
- */
+/* Semi-private funcion used by public inline functions. See qcbor_encode.c */
void
-QCBOREncode_OpenMapOrArrayIndefiniteLength(QCBOREncodeContext *pCtx,
- uint8_t uMajorType);
+QCBOREncode_Private_OpenMapOrArrayIndefiniteLength(QCBOREncodeContext *pCtx,
+ uint8_t uMajorType);
-/**
- * @brief Semi-private method to close a map, array or bstr wrapped CBOR
- *
- * @param[in] pCtx The context to add to.
- * @param[in] uMajorType The major CBOR type to close.
- *
- * Call QCBOREncode_CloseArray() or QCBOREncode_CloseMap() instead of this.
- */
+/* Semi-private funcion used by public inline functions. See qcbor_encode.c */
void
-QCBOREncode_CloseMapOrArray(QCBOREncodeContext *pCtx, uint8_t uMajorType);
+QCBOREncode_Private_CloseMapOrArray(QCBOREncodeContext *pCtx,
+ uint8_t uMajorType);
-/**
- * @brief Semi-private method to close a map, array with indefinite length
- *
- * @param[in] pCtx The context to add to.
- * @param[in] uMajorType The major CBOR type to close.
- *
- * Call QCBOREncode_CloseArrayIndefiniteLength() or
- * QCBOREncode_CloseMapIndefiniteLength() instead of this.
- */
+/* Semi-private funcion used by public inline functions. See qcbor_encode.c */
void
-QCBOREncode_CloseMapOrArrayIndefiniteLength(QCBOREncodeContext *pCtx,
- uint8_t uMajorType);
+QCBOREncode_Private_CloseMapOrArrayIndefiniteLength(QCBOREncodeContext *pCtx,
+ uint8_t uMajorType);
-/**
- * @brief Semi-private method to add simple types.
- *
- * @param[in] pCtx The encoding context to add the simple value to.
- * @param[in] uMinLen Minimum encoding size for uNum. Usually 0.
- * @param[in] uNum One of CBOR_SIMPLEV_FALSE through _UNDEF or other.
- *
- * This is used to add simple types like true and false.
- *
- * Call QCBOREncode_AddBool(), QCBOREncode_AddNULL(),
- * QCBOREncode_AddUndef() instead of this.
- *
- * This function can add simple values that are not defined by CBOR
- * yet. This expansion point in CBOR should not be used unless they are
- * standardized.
- *
- * Error handling is the same as QCBOREncode_AddInt64().
- */
+/* Semi-private funcion used by public inline functions. See qcbor_encode.c */
void
-QCBOREncode_AddType7(QCBOREncodeContext *pCtx,
- uint8_t uMinLen,
- uint64_t uNum);
+QCBOREncode_Private_AddType7(QCBOREncodeContext *pCtx,
+ uint8_t uMinLen,
+ uint64_t uNum);
-/**
- * @brief Semi-private method to add bigfloats and decimal fractions.
- *
- * @param[in] pCtx The encoding context to add the value to.
- * @param[in] uTag The type 6 tag indicating what this is to be.
- * @param[in] BigNumMantissa Is @ref NULLUsefulBufC if mantissa is an
- * @c int64_t or the actual big number mantissa
- * if not.
- * @param[in] bBigNumIsNegative This is @c true if the big number is negative.
- * @param[in] nMantissa The @c int64_t mantissa if it is not a big number.
- * @param[in] nExponent The exponent.
- *
- * This outputs either the @ref CBOR_TAG_DECIMAL_FRACTION or
- * @ref CBOR_TAG_BIGFLOAT tag. if @c uTag is @ref CBOR_TAG_INVALID64,
- * then this outputs the "borrowed" content format.
- *
- * The tag content output by this is an array with two members, the
- * exponent and then the mantissa. The mantissa can be either a big
- * number or an @c int64_t.
- *
- * This implementation cannot output an exponent further from 0 than
- * @c INT64_MAX.
- *
- * To output a mantissa that is between INT64_MAX and UINT64_MAX from 0,
- * it must be as a big number.
- *
- * Typically, QCBOREncode_AddDecimalFraction(), QCBOREncode_AddBigFloat(),
- * QCBOREncode_AddDecimalFractionBigNum() or QCBOREncode_AddBigFloatBigNum()
- * is called instead of this.
- */
+/* Semi-private funcion used by public inline functions. See qcbor_encode.c */
void
-QCBOREncode_AddExponentAndMantissa(QCBOREncodeContext *pCtx,
+QCBOREncode_Private_AddExpMantissa(QCBOREncodeContext *pCtx,
uint64_t uTag,
UsefulBufC BigNumMantissa,
bool bBigNumIsNegative,
@@ -2445,6 +2354,8 @@
* @param[in] pCtx The context to initialize.
* @param[in] Bytes Pointer and length of the input data.
*
+ * This will be removed in QCBOR 2.0. It was never a public function.
+ *
* This is the same as QCBOREncode_AddBytes() except it only adds the
* CBOR encoding for the type and the length. It doesn't actually add
* the bytes. You can't actually produce correct CBOR with this and
@@ -2460,17 +2371,19 @@
* tested function.
*
* See also QCBOREncode_EncodeHead().
-*/
-static inline void
+ *
+ * TODO: remove this in QCBOR 2.0
+ */
+static void
QCBOREncode_AddBytesLenOnly(QCBOREncodeContext *pCtx,
UsefulBufC Bytes);
-static inline void
+static void
QCBOREncode_AddBytesLenOnlyToMap(QCBOREncodeContext *pCtx,
const char *szLabel,
UsefulBufC Bytes);
-static inline void
+static void
QCBOREncode_AddBytesLenOnlyToMapN(QCBOREncodeContext *pCtx,
int64_t nLabel,
UsefulBufC Bytes);
@@ -2482,19 +2395,19 @@
static inline void
QCBOREncode_AddInt64ToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- int64_t uNum)
+ const int64_t uNum)
{
/* Use _AddBuffer() because _AddSZString() is defined below, not above */
- QCBOREncode_AddBuffer(pMe,
- CBOR_MAJOR_TYPE_TEXT_STRING,
- UsefulBuf_FromSZ(szLabel));
+ QCBOREncode_Private_AddBuffer(pMe,
+ CBOR_MAJOR_TYPE_TEXT_STRING,
+ UsefulBuf_FromSZ(szLabel));
QCBOREncode_AddInt64(pMe, uNum);
}
static inline void
QCBOREncode_AddInt64ToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- int64_t uNum)
+ const int64_t nLabel,
+ const int64_t uNum)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddInt64(pMe, uNum);
@@ -2504,19 +2417,19 @@
static inline void
QCBOREncode_AddUInt64ToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- uint64_t uNum)
+ const uint64_t uNum)
{
/* Use _AddBuffer() because _AddSZString() is defined below, not above */
- QCBOREncode_AddBuffer(pMe,
- CBOR_MAJOR_TYPE_TEXT_STRING,
- UsefulBuf_FromSZ(szLabel));
+ QCBOREncode_Private_AddBuffer(pMe,
+ CBOR_MAJOR_TYPE_TEXT_STRING,
+ UsefulBuf_FromSZ(szLabel));
QCBOREncode_AddUInt64(pMe, uNum);
}
static inline void
QCBOREncode_AddUInt64ToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint64_t uNum)
+ const int64_t nLabel,
+ const uint64_t uNum)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddUInt64(pMe, uNum);
@@ -2524,15 +2437,15 @@
static inline void
-QCBOREncode_AddText(QCBOREncodeContext *pMe, UsefulBufC Text)
+QCBOREncode_AddText(QCBOREncodeContext *pMe, const UsefulBufC Text)
{
- QCBOREncode_AddBuffer(pMe, CBOR_MAJOR_TYPE_TEXT_STRING, Text);
+ QCBOREncode_Private_AddBuffer(pMe, CBOR_MAJOR_TYPE_TEXT_STRING, Text);
}
static inline void
QCBOREncode_AddTextToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Text)
+ const UsefulBufC Text)
{
QCBOREncode_AddText(pMe, UsefulBuf_FromSZ(szLabel));
QCBOREncode_AddText(pMe, Text);
@@ -2540,8 +2453,8 @@
static inline void
QCBOREncode_AddTextToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Text)
+ const int64_t nLabel,
+ const UsefulBufC Text)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddText(pMe, Text);
@@ -2565,7 +2478,7 @@
static inline void
QCBOREncode_AddSZStringToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
+ const int64_t nLabel,
const char *szString)
{
QCBOREncode_AddInt64(pMe, nLabel);
@@ -2577,7 +2490,7 @@
static inline void
QCBOREncode_AddDoubleToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- double dNum)
+ const double dNum)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddDouble(pMe, dNum);
@@ -2585,8 +2498,8 @@
static inline void
QCBOREncode_AddDoubleToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- double dNum)
+ const int64_t nLabel,
+ const double dNum)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddDouble(pMe, dNum);
@@ -2595,14 +2508,16 @@
static inline void
QCBOREncode_AddFloatToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- float dNum)
+ const float dNum)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddFloat(pMe, dNum);
}
static inline void
-QCBOREncode_AddFloatToMapN(QCBOREncodeContext *pMe, int64_t nLabel, float fNum)
+QCBOREncode_AddFloatToMapN(QCBOREncodeContext *pMe,
+ const int64_t nLabel,
+ const float fNum)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddFloat(pMe, fNum);
@@ -2611,7 +2526,7 @@
static inline void
QCBOREncode_AddDoubleNoPreferredToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- double dNum)
+ const double dNum)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddDoubleNoPreferred(pMe, dNum);
@@ -2619,8 +2534,8 @@
static inline void
QCBOREncode_AddDoubleNoPreferredToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- double dNum)
+ const int64_t nLabel,
+ const double dNum)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddDoubleNoPreferred(pMe, dNum);
@@ -2629,7 +2544,7 @@
static inline void
QCBOREncode_AddFloatNoPreferredToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- float dNum)
+ const float dNum)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddFloatNoPreferred(pMe, dNum);
@@ -2637,8 +2552,8 @@
static inline void
QCBOREncode_AddFloatNoPreferredToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- float dNum)
+ const int64_t nLabel,
+ const float dNum)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddFloatNoPreferred(pMe, dNum);
@@ -2648,7 +2563,9 @@
static inline void
-QCBOREncode_AddTDateEpoch(QCBOREncodeContext *pMe, uint8_t uTag, int64_t nDate)
+QCBOREncode_AddTDateEpoch(QCBOREncodeContext *pMe,
+ const uint8_t uTag,
+ const int64_t nDate)
{
if(uTag == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_DATE_EPOCH);
@@ -2659,8 +2576,8 @@
static inline void
QCBOREncode_AddTDateEpochToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTag,
- int64_t nDate)
+ const uint8_t uTag,
+ const int64_t nDate)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTDateEpoch(pMe, uTag, nDate);
@@ -2668,16 +2585,17 @@
static inline void
QCBOREncode_AddTDateEpochToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTag,
- int64_t nDate)
+ const int64_t nLabel,
+ const uint8_t uTag,
+ const int64_t nDate)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTDateEpoch(pMe, uTag, nDate);
}
static inline void
-QCBOREncode_AddDateEpoch(QCBOREncodeContext *pMe, int64_t nDate)
+QCBOREncode_AddDateEpoch(QCBOREncodeContext *pMe,
+ const int64_t nDate)
{
QCBOREncode_AddTDateEpoch(pMe, QCBOR_ENCODE_AS_TAG, nDate);
}
@@ -2685,7 +2603,7 @@
static inline void
QCBOREncode_AddDateEpochToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- int64_t nDate)
+ const int64_t nDate)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddDateEpoch(pMe, nDate);
@@ -2693,8 +2611,8 @@
static inline void
QCBOREncode_AddDateEpochToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- int64_t nDate)
+ const int64_t nLabel,
+ const int64_t nDate)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddDateEpoch(pMe, nDate);
@@ -2702,7 +2620,9 @@
static inline void
-QCBOREncode_AddTDaysEpoch(QCBOREncodeContext *pMe, uint8_t uTag, int64_t nDays)
+QCBOREncode_AddTDaysEpoch(QCBOREncodeContext *pMe,
+ const uint8_t uTag,
+ const int64_t nDays)
{
if(uTag == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_DAYS_EPOCH);
@@ -2713,8 +2633,8 @@
static inline void
QCBOREncode_AddTDaysEpochToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTag,
- int64_t nDays)
+ const uint8_t uTag,
+ const int64_t nDays)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTDaysEpoch(pMe, uTag, nDays);
@@ -2722,9 +2642,9 @@
static inline void
QCBOREncode_AddTDaysEpochToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTag,
- int64_t nDays)
+ const int64_t nLabel,
+ const uint8_t uTag,
+ const int64_t nDays)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTDaysEpoch(pMe, uTag, nDays);
@@ -2732,15 +2652,16 @@
static inline void
-QCBOREncode_AddBytes(QCBOREncodeContext *pMe, UsefulBufC Bytes)
+QCBOREncode_AddBytes(QCBOREncodeContext *pMe,
+ const UsefulBufC Bytes)
{
- QCBOREncode_AddBuffer(pMe, CBOR_MAJOR_TYPE_BYTE_STRING, Bytes);
+ QCBOREncode_Private_AddBuffer(pMe, CBOR_MAJOR_TYPE_BYTE_STRING, Bytes);
}
static inline void
QCBOREncode_AddBytesToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Bytes)
+ const UsefulBufC Bytes)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddBytes(pMe, Bytes);
@@ -2748,8 +2669,8 @@
static inline void
QCBOREncode_AddBytesToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddBytes(pMe, Bytes);
@@ -2766,7 +2687,7 @@
static inline void
QCBOREncode_OpenBytesInMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
+ const int64_t nLabel,
UsefulBuf *pPlace)
{
QCBOREncode_AddInt64(pMe, nLabel);
@@ -2774,15 +2695,15 @@
}
static inline void
-QCBOREncode_AddBytesLenOnly(QCBOREncodeContext *pMe, UsefulBufC Bytes)
+QCBOREncode_AddBytesLenOnly(QCBOREncodeContext *pMe, const UsefulBufC Bytes)
{
- QCBOREncode_AddBuffer(pMe, CBOR_MAJOR_NONE_TYPE_BSTR_LEN_ONLY, Bytes);
+ QCBOREncode_Private_AddBuffer(pMe, CBOR_MAJOR_NONE_TYPE_BSTR_LEN_ONLY, Bytes);
}
static inline void
QCBOREncode_AddBytesLenOnlyToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Bytes)
+ const UsefulBufC Bytes)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddBytesLenOnly(pMe, Bytes);
@@ -2790,8 +2711,8 @@
static inline void
QCBOREncode_AddBytesLenOnlyToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddBytesLenOnly(pMe, Bytes);
@@ -2800,8 +2721,8 @@
static inline void
QCBOREncode_AddTBinaryUUID(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_BIN_UUID);
@@ -2812,8 +2733,8 @@
static inline void
QCBOREncode_AddTBinaryUUIDToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTBinaryUUID(pMe, uTagRequirement, Bytes);
@@ -2821,16 +2742,16 @@
static inline void
QCBOREncode_AddTBinaryUUIDToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTBinaryUUID(pMe, uTagRequirement, Bytes);
}
static inline void
-QCBOREncode_AddBinaryUUID(QCBOREncodeContext *pMe, UsefulBufC Bytes)
+QCBOREncode_AddBinaryUUID(QCBOREncodeContext *pMe, const UsefulBufC Bytes)
{
QCBOREncode_AddTBinaryUUID(pMe, QCBOR_ENCODE_AS_TAG, Bytes);
}
@@ -2838,15 +2759,15 @@
static inline void
QCBOREncode_AddBinaryUUIDToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Bytes)
+ const UsefulBufC Bytes)
{
QCBOREncode_AddTBinaryUUIDToMapSZ(pMe, szLabel, QCBOR_ENCODE_AS_TAG, Bytes);
}
static inline void
QCBOREncode_AddBinaryUUIDToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddTBinaryUUIDToMapN(pMe,
nLabel,
@@ -2857,8 +2778,8 @@
static inline void
QCBOREncode_AddTPositiveBignum(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_POS_BIGNUM);
@@ -2869,8 +2790,8 @@
static inline void
QCBOREncode_AddTPositiveBignumToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTPositiveBignum(pMe, uTagRequirement, Bytes);
@@ -2878,16 +2799,16 @@
static inline void
QCBOREncode_AddTPositiveBignumToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTPositiveBignum(pMe, uTagRequirement, Bytes);
}
static inline void
-QCBOREncode_AddPositiveBignum(QCBOREncodeContext *pMe, UsefulBufC Bytes)
+QCBOREncode_AddPositiveBignum(QCBOREncodeContext *pMe, const UsefulBufC Bytes)
{
QCBOREncode_AddTPositiveBignum(pMe, QCBOR_ENCODE_AS_TAG, Bytes);
}
@@ -2895,7 +2816,7 @@
static inline void
QCBOREncode_AddPositiveBignumToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Bytes)
+ const UsefulBufC Bytes)
{
QCBOREncode_AddTPositiveBignumToMapSZ(pMe,
szLabel,
@@ -2905,8 +2826,8 @@
static inline void
QCBOREncode_AddPositiveBignumToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddTPositiveBignumToMapN(pMe,
nLabel,
@@ -2917,8 +2838,8 @@
static inline void
QCBOREncode_AddTNegativeBignum(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_NEG_BIGNUM);
@@ -2929,8 +2850,8 @@
static inline void
QCBOREncode_AddTNegativeBignumToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTNegativeBignum(pMe, uTagRequirement, Bytes);
@@ -2938,16 +2859,16 @@
static inline void
QCBOREncode_AddTNegativeBignumToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTNegativeBignum(pMe, uTagRequirement, Bytes);
}
static inline void
-QCBOREncode_AddNegativeBignum(QCBOREncodeContext *pMe, UsefulBufC Bytes)
+QCBOREncode_AddNegativeBignum(QCBOREncodeContext *pMe, const UsefulBufC Bytes)
{
QCBOREncode_AddTNegativeBignum(pMe, QCBOR_ENCODE_AS_TAG, Bytes);
}
@@ -2955,7 +2876,7 @@
static inline void
QCBOREncode_AddNegativeBignumToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Bytes)
+ const UsefulBufC Bytes)
{
QCBOREncode_AddTNegativeBignumToMapSZ(pMe,
szLabel,
@@ -2965,8 +2886,8 @@
static inline void
QCBOREncode_AddNegativeBignumToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddTNegativeBignumToMapN(pMe,
nLabel,
@@ -2980,9 +2901,9 @@
static inline void
QCBOREncode_AddTDecimalFraction(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- int64_t nMantissa,
- int64_t nBase10Exponent)
+ const uint8_t uTagRequirement,
+ const int64_t nMantissa,
+ const int64_t nBase10Exponent)
{
uint64_t uTag;
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
@@ -2990,7 +2911,7 @@
} else {
uTag = CBOR_TAG_INVALID64;
}
- QCBOREncode_AddExponentAndMantissa(pMe,
+ QCBOREncode_Private_AddExpMantissa(pMe,
uTag,
NULLUsefulBufC,
false,
@@ -3001,9 +2922,9 @@
static inline void
QCBOREncode_AddTDecimalFractionToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- int64_t nMantissa,
- int64_t nBase10Exponent)
+ const uint8_t uTagRequirement,
+ const int64_t nMantissa,
+ const int64_t nBase10Exponent)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTDecimalFraction(pMe,
@@ -3014,10 +2935,10 @@
static inline void
QCBOREncode_AddTDecimalFractionToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- int64_t nMantissa,
- int64_t nBase10Exponent)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const int64_t nMantissa,
+ const int64_t nBase10Exponent)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTDecimalFraction(pMe,
@@ -3028,8 +2949,8 @@
static inline void
QCBOREncode_AddDecimalFraction(QCBOREncodeContext *pMe,
- int64_t nMantissa,
- int64_t nBase10Exponent)
+ const int64_t nMantissa,
+ const int64_t nBase10Exponent)
{
QCBOREncode_AddTDecimalFraction(pMe,
QCBOR_ENCODE_AS_TAG,
@@ -3040,8 +2961,8 @@
static inline void
QCBOREncode_AddDecimalFractionToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- int64_t nMantissa,
- int64_t nBase10Exponent)
+ const int64_t nMantissa,
+ const int64_t nBase10Exponent)
{
QCBOREncode_AddTDecimalFractionToMapSZ(pMe,
szLabel,
@@ -3052,9 +2973,9 @@
static inline void
QCBOREncode_AddDecimalFractionToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- int64_t nMantissa,
- int64_t nBase10Exponent)
+ const int64_t nLabel,
+ const int64_t nMantissa,
+ const int64_t nBase10Exponent)
{
QCBOREncode_AddTDecimalFractionToMapN(pMe,
nLabel,
@@ -3067,10 +2988,10 @@
static inline void
QCBOREncode_AddTDecimalFractionBigNum(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase10Exponent)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase10Exponent)
{
uint64_t uTag;
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
@@ -3078,9 +2999,10 @@
} else {
uTag = CBOR_TAG_INVALID64;
}
- QCBOREncode_AddExponentAndMantissa(pMe,
+ QCBOREncode_Private_AddExpMantissa(pMe,
uTag,
- Mantissa, bIsNegative,
+ Mantissa,
+ bIsNegative,
0,
nBase10Exponent);
}
@@ -3088,10 +3010,10 @@
static inline void
QCBOREncode_AddTDecimalFractionBigNumToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase10Exponent)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase10Exponent)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTDecimalFractionBigNum(pMe,
@@ -3103,11 +3025,11 @@
static inline void
QCBOREncode_AddTDecimalFractionBigNumToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase10Exponent)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase10Exponent)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTDecimalFractionBigNum(pMe,
@@ -3119,9 +3041,9 @@
static inline void
QCBOREncode_AddDecimalFractionBigNum(QCBOREncodeContext *pMe,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase10Exponent)
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase10Exponent)
{
QCBOREncode_AddTDecimalFractionBigNum(pMe,
QCBOR_ENCODE_AS_TAG,
@@ -3133,9 +3055,9 @@
static inline void
QCBOREncode_AddDecimalFractionBigNumToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase10Exponent)
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase10Exponent)
{
QCBOREncode_AddTDecimalFractionBigNumToMapSZ(pMe,
szLabel,
@@ -3147,10 +3069,10 @@
static inline void
QCBOREncode_AddDecimalFractionBigNumToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase2Exponent)
+ const int64_t nLabel,
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddTDecimalFractionBigNumToMapN(pMe,
nLabel,
@@ -3166,9 +3088,9 @@
static inline void
QCBOREncode_AddTBigFloat(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- int64_t nMantissa,
- int64_t nBase2Exponent)
+ const uint8_t uTagRequirement,
+ const int64_t nMantissa,
+ const int64_t nBase2Exponent)
{
uint64_t uTag;
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
@@ -3176,7 +3098,7 @@
} else {
uTag = CBOR_TAG_INVALID64;
}
- QCBOREncode_AddExponentAndMantissa(pMe,
+ QCBOREncode_Private_AddExpMantissa(pMe,
uTag,
NULLUsefulBufC,
false,
@@ -3187,9 +3109,9 @@
static inline void
QCBOREncode_AddTBigFloatToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- int64_t nMantissa,
- int64_t nBase2Exponent)
+ const uint8_t uTagRequirement,
+ const int64_t nMantissa,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTBigFloat(pMe, uTagRequirement, nMantissa, nBase2Exponent);
@@ -3197,10 +3119,10 @@
static inline void
QCBOREncode_AddTBigFloatToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- int64_t nMantissa,
- int64_t nBase2Exponent)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const int64_t nMantissa,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTBigFloat(pMe, uTagRequirement, nMantissa, nBase2Exponent);
@@ -3208,8 +3130,8 @@
static inline void
QCBOREncode_AddBigFloat(QCBOREncodeContext *pMe,
- int64_t nMantissa,
- int64_t nBase2Exponent)
+ const int64_t nMantissa,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddTBigFloat(pMe,
QCBOR_ENCODE_AS_TAG,
@@ -3220,8 +3142,8 @@
static inline void
QCBOREncode_AddBigFloatToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- int64_t nMantissa,
- int64_t nBase2Exponent)
+ const int64_t nMantissa,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddTBigFloatToMapSZ(pMe,
szLabel,
@@ -3232,9 +3154,9 @@
static inline void
QCBOREncode_AddBigFloatToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- int64_t nMantissa,
- int64_t nBase2Exponent)
+ const int64_t nLabel,
+ const int64_t nMantissa,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddTBigFloatToMapN(pMe,
nLabel,
@@ -3247,10 +3169,10 @@
static inline void
QCBOREncode_AddTBigFloatBigNum(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase2Exponent)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase2Exponent)
{
uint64_t uTag;
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
@@ -3258,7 +3180,7 @@
} else {
uTag = CBOR_TAG_INVALID64;
}
- QCBOREncode_AddExponentAndMantissa(pMe,
+ QCBOREncode_Private_AddExpMantissa(pMe,
uTag,
Mantissa,
bIsNegative,
@@ -3269,10 +3191,10 @@
static inline void
QCBOREncode_AddTBigFloatBigNumToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase2Exponent)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTBigFloatBigNum(pMe,
@@ -3284,11 +3206,11 @@
static inline void
QCBOREncode_AddTBigFloatBigNumToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase2Exponent)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTBigFloatBigNum(pMe,
@@ -3301,9 +3223,9 @@
static inline void
QCBOREncode_AddBigFloatBigNum(QCBOREncodeContext *pMe,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase2Exponent)
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddTBigFloatBigNum(pMe,
QCBOR_ENCODE_AS_TAG,
@@ -3314,9 +3236,9 @@
static inline void
QCBOREncode_AddBigFloatBigNumToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase2Exponent)
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddTBigFloatBigNumToMapSZ(pMe,
szLabel,
@@ -3328,10 +3250,10 @@
static inline void
QCBOREncode_AddBigFloatBigNumToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Mantissa,
- bool bIsNegative,
- int64_t nBase2Exponent)
+ const int64_t nLabel,
+ const UsefulBufC Mantissa,
+ const bool bIsNegative,
+ const int64_t nBase2Exponent)
{
QCBOREncode_AddTBigFloatBigNumToMapN(pMe,
nLabel,
@@ -3345,8 +3267,8 @@
static inline void
QCBOREncode_AddTURI(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC URI)
+ const uint8_t uTagRequirement,
+ const UsefulBufC URI)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_URI);
@@ -3357,8 +3279,8 @@
static inline void
QCBOREncode_AddTURIToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC URI)
+ const uint8_t uTagRequirement,
+ const UsefulBufC URI)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTURI(pMe, uTagRequirement, URI);
@@ -3366,16 +3288,16 @@
static inline void
QCBOREncode_AddTURIToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC URI)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC URI)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTURI(pMe, uTagRequirement, URI);
}
static inline void
-QCBOREncode_AddURI(QCBOREncodeContext *pMe, UsefulBufC URI)
+QCBOREncode_AddURI(QCBOREncodeContext *pMe, const UsefulBufC URI)
{
QCBOREncode_AddTURI(pMe, QCBOR_ENCODE_AS_TAG, URI);
}
@@ -3383,15 +3305,15 @@
static inline void
QCBOREncode_AddURIToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC URI)
+ const UsefulBufC URI)
{
QCBOREncode_AddTURIToMapSZ(pMe, szLabel, QCBOR_ENCODE_AS_TAG, URI);
}
static inline void
QCBOREncode_AddURIToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC URI)
+ const int64_t nLabel,
+ const UsefulBufC URI)
{
QCBOREncode_AddTURIToMapN(pMe, nLabel, QCBOR_ENCODE_AS_TAG, URI);
}
@@ -3400,8 +3322,8 @@
static inline void
QCBOREncode_AddTB64Text(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC B64Text)
+ const uint8_t uTagRequirement,
+ const UsefulBufC B64Text)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_B64);
@@ -3412,8 +3334,8 @@
static inline void
QCBOREncode_AddTB64TextToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC B64Text)
+ const uint8_t uTagRequirement,
+ const UsefulBufC B64Text)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTB64Text(pMe, uTagRequirement, B64Text);
@@ -3421,16 +3343,16 @@
static inline void
QCBOREncode_AddTB64TextToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC B64Text)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC B64Text)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTB64Text(pMe, uTagRequirement, B64Text);
}
static inline void
-QCBOREncode_AddB64Text(QCBOREncodeContext *pMe, UsefulBufC B64Text)
+QCBOREncode_AddB64Text(QCBOREncodeContext *pMe, const UsefulBufC B64Text)
{
QCBOREncode_AddTB64Text(pMe, QCBOR_ENCODE_AS_TAG, B64Text);
}
@@ -3438,15 +3360,15 @@
static inline void
QCBOREncode_AddB64TextToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC B64Text)
+ const UsefulBufC B64Text)
{
QCBOREncode_AddTB64TextToMapSZ(pMe, szLabel, QCBOR_ENCODE_AS_TAG, B64Text);
}
static inline void
QCBOREncode_AddB64TextToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC B64Text)
+ const int64_t nLabel,
+ const UsefulBufC B64Text)
{
QCBOREncode_AddTB64TextToMapN(pMe, nLabel, QCBOR_ENCODE_AS_TAG, B64Text);
}
@@ -3455,8 +3377,8 @@
static inline void
QCBOREncode_AddTB64URLText(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC B64Text)
+ const uint8_t uTagRequirement,
+ const UsefulBufC B64Text)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_B64URL);
@@ -3467,8 +3389,8 @@
static inline void
QCBOREncode_AddTB64URLTextToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC B64Text)
+ const uint8_t uTagRequirement,
+ const UsefulBufC B64Text)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTB64URLText(pMe, uTagRequirement, B64Text);
@@ -3476,16 +3398,16 @@
static inline void
QCBOREncode_AddTB64URLTextToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC B64Text)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC B64Text)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTB64URLText(pMe, uTagRequirement, B64Text);
}
static inline void
-QCBOREncode_AddB64URLText(QCBOREncodeContext *pMe, UsefulBufC B64Text)
+QCBOREncode_AddB64URLText(QCBOREncodeContext *pMe, const UsefulBufC B64Text)
{
QCBOREncode_AddTB64URLText(pMe, QCBOR_ENCODE_AS_TAG, B64Text);
}
@@ -3493,7 +3415,7 @@
static inline void
QCBOREncode_AddB64URLTextToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC B64Text)
+ const UsefulBufC B64Text)
{
QCBOREncode_AddTB64URLTextToMapSZ(pMe,
szLabel,
@@ -3503,8 +3425,8 @@
static inline void
QCBOREncode_AddB64URLTextToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC B64Text)
+ const int64_t nLabel,
+ const UsefulBufC B64Text)
{
QCBOREncode_AddTB64URLTextToMapN(pMe, nLabel, QCBOR_ENCODE_AS_TAG, B64Text);
}
@@ -3513,8 +3435,8 @@
static inline void
QCBOREncode_AddTRegex(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_REGEX);
@@ -3525,8 +3447,8 @@
static inline void
QCBOREncode_AddTRegexToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTRegex(pMe, uTagRequirement, Bytes);
@@ -3534,16 +3456,16 @@
static inline void
QCBOREncode_AddTRegexToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTRegex(pMe, uTagRequirement, Bytes);
}
static inline void
-QCBOREncode_AddRegex(QCBOREncodeContext *pMe, UsefulBufC Bytes)
+QCBOREncode_AddRegex(QCBOREncodeContext *pMe, const UsefulBufC Bytes)
{
QCBOREncode_AddTRegex(pMe, QCBOR_ENCODE_AS_TAG, Bytes);
}
@@ -3551,15 +3473,15 @@
static inline void
QCBOREncode_AddRegexToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Bytes)
+ const UsefulBufC Bytes)
{
QCBOREncode_AddTRegexToMapSZ(pMe, szLabel, QCBOR_ENCODE_AS_TAG, Bytes);
}
static inline void
QCBOREncode_AddRegexToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Bytes)
+ const int64_t nLabel,
+ const UsefulBufC Bytes)
{
QCBOREncode_AddTRegexToMapN(pMe, nLabel, QCBOR_ENCODE_AS_TAG, Bytes);
@@ -3568,8 +3490,8 @@
static inline void
QCBOREncode_AddTMIMEData(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
- UsefulBufC MIMEData)
+ const uint8_t uTagRequirement,
+ const UsefulBufC MIMEData)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
QCBOREncode_AddTag(pMe, CBOR_TAG_BINARY_MIME);
@@ -3580,8 +3502,8 @@
static inline void
QCBOREncode_AddTMIMEDataToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
- UsefulBufC MIMEData)
+ const uint8_t uTagRequirement,
+ const UsefulBufC MIMEData)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddTMIMEData(pMe, uTagRequirement, MIMEData);
@@ -3589,9 +3511,9 @@
static inline void
QCBOREncode_AddTMIMEDataToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
- UsefulBufC MIMEData)
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
+ const UsefulBufC MIMEData)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddTMIMEData(pMe, uTagRequirement, MIMEData);
@@ -3606,15 +3528,15 @@
static inline void
QCBOREncode_AddMIMEDataToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC MIMEData)
+ const UsefulBufC MIMEData)
{
QCBOREncode_AddTMIMEDataToMapSZ(pMe, szLabel, QCBOR_ENCODE_AS_TAG, MIMEData);
}
static inline void
QCBOREncode_AddMIMEDataToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC MIMEData)
+ const int64_t nLabel,
+ const UsefulBufC MIMEData)
{
QCBOREncode_AddTMIMEDataToMapN(pMe, nLabel, QCBOR_ENCODE_AS_TAG, MIMEData);
}
@@ -3622,7 +3544,7 @@
static inline void
QCBOREncode_AddTDateString(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
const char *szDate)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
@@ -3634,7 +3556,7 @@
static inline void
QCBOREncode_AddTDateStringToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
const char *szDate)
{
QCBOREncode_AddSZString(pMe, szLabel);
@@ -3643,8 +3565,8 @@
static inline void
QCBOREncode_AddTDateStringToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
const char *szDate)
{
QCBOREncode_AddInt64(pMe, nLabel);
@@ -3667,7 +3589,7 @@
static inline void
QCBOREncode_AddDateStringToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
+ const int64_t nLabel,
const char *szDate)
{
QCBOREncode_AddTDateStringToMapN(pMe, nLabel, QCBOR_ENCODE_AS_TAG, szDate);
@@ -3676,7 +3598,7 @@
static inline void
QCBOREncode_AddTDaysString(QCBOREncodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
const char *szDate)
{
if(uTagRequirement == QCBOR_ENCODE_AS_TAG) {
@@ -3688,7 +3610,7 @@
static inline void
QCBOREncode_AddTDaysStringToMapSZ(QCBOREncodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
const char *szDate)
{
QCBOREncode_AddSZString(pMe, szLabel);
@@ -3697,8 +3619,8 @@
static inline void
QCBOREncode_AddTDaysStringToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
const char *szDate)
{
QCBOREncode_AddInt64(pMe, nLabel);
@@ -3708,49 +3630,49 @@
static inline void
-QCBOREncode_AddSimple(QCBOREncodeContext *pMe, uint64_t uNum)
+QCBOREncode_Private_AddSimple(QCBOREncodeContext *pMe, const uint64_t uNum)
{
- QCBOREncode_AddType7(pMe, 0, uNum);
+ QCBOREncode_Private_AddType7(pMe, 0, uNum);
}
static inline void
-QCBOREncode_AddSimpleToMap(QCBOREncodeContext *pMe,
- const char *szLabel,
- uint8_t uSimple)
+QCBOREncode_Private_AddSimpleToMap(QCBOREncodeContext *pMe,
+ const char *szLabel,
+ const uint8_t uSimple)
{
QCBOREncode_AddSZString(pMe, szLabel);
- QCBOREncode_AddSimple(pMe, uSimple);
+ QCBOREncode_Private_AddSimple(pMe, uSimple);
}
static inline void
-QCBOREncode_AddSimpleToMapN(QCBOREncodeContext *pMe,
- int nLabel,
- uint8_t uSimple)
+QCBOREncode_Private_AddSimpleToMapN(QCBOREncodeContext *pMe,
+ const int64_t nLabel,
+ const uint8_t uSimple)
{
QCBOREncode_AddInt64(pMe, nLabel);
- QCBOREncode_AddSimple(pMe, uSimple);
+ QCBOREncode_Private_AddSimple(pMe, uSimple);
}
static inline void
-QCBOREncode_AddBool(QCBOREncodeContext *pMe, bool b)
+QCBOREncode_AddBool(QCBOREncodeContext *pMe, const bool b)
{
uint8_t uSimple = CBOR_SIMPLEV_FALSE;
if(b) {
uSimple = CBOR_SIMPLEV_TRUE;
}
- QCBOREncode_AddSimple(pMe, uSimple);
+ QCBOREncode_Private_AddSimple(pMe, uSimple);
}
static inline void
-QCBOREncode_AddBoolToMap(QCBOREncodeContext *pMe, const char *szLabel, bool b)
+QCBOREncode_AddBoolToMap(QCBOREncodeContext *pMe, const char *szLabel, const bool b)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddBool(pMe, b);
}
static inline void
-QCBOREncode_AddBoolToMapN(QCBOREncodeContext *pMe, int64_t nLabel, bool b)
+QCBOREncode_AddBoolToMapN(QCBOREncodeContext *pMe, const int64_t nLabel, const bool b)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddBool(pMe, b);
@@ -3760,7 +3682,7 @@
static inline void
QCBOREncode_AddNULL(QCBOREncodeContext *pMe)
{
- QCBOREncode_AddSimple(pMe, CBOR_SIMPLEV_NULL);
+ QCBOREncode_Private_AddSimple(pMe, CBOR_SIMPLEV_NULL);
}
static inline void
@@ -3771,7 +3693,7 @@
}
static inline void
-QCBOREncode_AddNULLToMapN(QCBOREncodeContext *pMe, int64_t nLabel)
+QCBOREncode_AddNULLToMapN(QCBOREncodeContext *pMe, const int64_t nLabel)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddNULL(pMe);
@@ -3781,7 +3703,7 @@
static inline void
QCBOREncode_AddUndef(QCBOREncodeContext *pMe)
{
- QCBOREncode_AddSimple(pMe, CBOR_SIMPLEV_UNDEF);
+ QCBOREncode_Private_AddSimple(pMe, CBOR_SIMPLEV_UNDEF);
}
static inline void
@@ -3792,7 +3714,7 @@
}
static inline void
-QCBOREncode_AddUndefToMapN(QCBOREncodeContext *pMe, int64_t nLabel)
+QCBOREncode_AddUndefToMapN(QCBOREncodeContext *pMe, const int64_t nLabel)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddUndef(pMe);
@@ -3802,7 +3724,7 @@
static inline void
QCBOREncode_OpenArray(QCBOREncodeContext *pMe)
{
- QCBOREncode_OpenMapOrArray(pMe, CBOR_MAJOR_TYPE_ARRAY);
+ QCBOREncode_Private_OpenMapOrArray(pMe, CBOR_MAJOR_TYPE_ARRAY);
}
static inline void
@@ -3813,7 +3735,7 @@
}
static inline void
-QCBOREncode_OpenArrayInMapN(QCBOREncodeContext *pMe, int64_t nLabel)
+QCBOREncode_OpenArrayInMapN(QCBOREncodeContext *pMe, const int64_t nLabel)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_OpenArray(pMe);
@@ -3822,14 +3744,14 @@
static inline void
QCBOREncode_CloseArray(QCBOREncodeContext *pMe)
{
- QCBOREncode_CloseMapOrArray(pMe, CBOR_MAJOR_TYPE_ARRAY);
+ QCBOREncode_Private_CloseMapOrArray(pMe, CBOR_MAJOR_TYPE_ARRAY);
}
static inline void
QCBOREncode_OpenMap(QCBOREncodeContext *pMe)
{
- QCBOREncode_OpenMapOrArray(pMe, CBOR_MAJOR_TYPE_MAP);
+ QCBOREncode_Private_OpenMapOrArray(pMe, CBOR_MAJOR_TYPE_MAP);
}
static inline void
@@ -3840,7 +3762,7 @@
}
static inline void
-QCBOREncode_OpenMapInMapN(QCBOREncodeContext *pMe, int64_t nLabel)
+QCBOREncode_OpenMapInMapN(QCBOREncodeContext *pMe, const int64_t nLabel)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_OpenMap(pMe);
@@ -3849,13 +3771,13 @@
static inline void
QCBOREncode_CloseMap(QCBOREncodeContext *pMe)
{
- QCBOREncode_CloseMapOrArray(pMe, CBOR_MAJOR_TYPE_MAP);
+ QCBOREncode_Private_CloseMapOrArray(pMe, CBOR_MAJOR_TYPE_MAP);
}
static inline void
QCBOREncode_OpenArrayIndefiniteLength(QCBOREncodeContext *pMe)
{
- QCBOREncode_OpenMapOrArrayIndefiniteLength(pMe, CBOR_MAJOR_NONE_TYPE_ARRAY_INDEFINITE_LEN);
+ QCBOREncode_Private_OpenMapOrArrayIndefiniteLength(pMe, CBOR_MAJOR_NONE_TYPE_ARRAY_INDEFINITE_LEN);
}
static inline void
@@ -3868,7 +3790,7 @@
static inline void
QCBOREncode_OpenArrayIndefiniteLengthInMapN(QCBOREncodeContext *pMe,
- int64_t nLabel)
+ const int64_t nLabel)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_OpenArrayIndefiniteLength(pMe);
@@ -3877,14 +3799,14 @@
static inline void
QCBOREncode_CloseArrayIndefiniteLength(QCBOREncodeContext *pMe)
{
- QCBOREncode_CloseMapOrArrayIndefiniteLength(pMe, CBOR_MAJOR_NONE_TYPE_ARRAY_INDEFINITE_LEN);
+ QCBOREncode_Private_CloseMapOrArrayIndefiniteLength(pMe, CBOR_MAJOR_NONE_TYPE_ARRAY_INDEFINITE_LEN);
}
static inline void
QCBOREncode_OpenMapIndefiniteLength(QCBOREncodeContext *pMe)
{
- QCBOREncode_OpenMapOrArrayIndefiniteLength(pMe, CBOR_MAJOR_NONE_TYPE_MAP_INDEFINITE_LEN);
+ QCBOREncode_Private_OpenMapOrArrayIndefiniteLength(pMe, CBOR_MAJOR_NONE_TYPE_MAP_INDEFINITE_LEN);
}
static inline void
@@ -3897,7 +3819,7 @@
static inline void
QCBOREncode_OpenMapIndefiniteLengthInMapN(QCBOREncodeContext *pMe,
- int64_t nLabel)
+ const int64_t nLabel)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_OpenMapIndefiniteLength(pMe);
@@ -3906,14 +3828,14 @@
static inline void
QCBOREncode_CloseMapIndefiniteLength(QCBOREncodeContext *pMe)
{
- QCBOREncode_CloseMapOrArrayIndefiniteLength(pMe, CBOR_MAJOR_NONE_TYPE_MAP_INDEFINITE_LEN);
+ QCBOREncode_Private_CloseMapOrArrayIndefiniteLength(pMe, CBOR_MAJOR_NONE_TYPE_MAP_INDEFINITE_LEN);
}
static inline void
QCBOREncode_BstrWrap(QCBOREncodeContext *pMe)
{
- QCBOREncode_OpenMapOrArray(pMe, CBOR_MAJOR_TYPE_BYTE_STRING);
+ QCBOREncode_Private_OpenMapOrArray(pMe, CBOR_MAJOR_TYPE_BYTE_STRING);
}
static inline void
@@ -3924,7 +3846,7 @@
}
static inline void
-QCBOREncode_BstrWrapInMapN(QCBOREncodeContext *pMe, int64_t nLabel)
+QCBOREncode_BstrWrapInMapN(QCBOREncodeContext *pMe, const int64_t nLabel)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_BstrWrap(pMe);
@@ -3938,15 +3860,15 @@
static inline void
-QCBOREncode_AddEncoded(QCBOREncodeContext *pMe, UsefulBufC Encoded)
+QCBOREncode_AddEncoded(QCBOREncodeContext *pMe, const UsefulBufC Encoded)
{
- QCBOREncode_AddBuffer(pMe, CBOR_MAJOR_NONE_TYPE_RAW, Encoded);
+ QCBOREncode_Private_AddBuffer(pMe, CBOR_MAJOR_NONE_TYPE_RAW, Encoded);
}
static inline void
QCBOREncode_AddEncodedToMap(QCBOREncodeContext *pMe,
const char *szLabel,
- UsefulBufC Encoded)
+ const UsefulBufC Encoded)
{
QCBOREncode_AddSZString(pMe, szLabel);
QCBOREncode_AddEncoded(pMe, Encoded);
@@ -3954,8 +3876,8 @@
static inline void
QCBOREncode_AddEncodedToMapN(QCBOREncodeContext *pMe,
- int64_t nLabel,
- UsefulBufC Encoded)
+ const int64_t nLabel,
+ const UsefulBufC Encoded)
{
QCBOREncode_AddInt64(pMe, nLabel);
QCBOREncode_AddEncoded(pMe, Encoded);
diff --git a/inc/qcbor/qcbor_spiffy_decode.h b/inc/qcbor/qcbor_spiffy_decode.h
index 7423140..d8fc5e3 100644
--- a/inc/qcbor/qcbor_spiffy_decode.h
+++ b/inc/qcbor/qcbor_spiffy_decode.h
@@ -1,7 +1,7 @@
/* ==========================================================================
* qcbor_spiffy_decode.h -- higher-level easier-to-use CBOR decoding.
*
- * Copyright (c) 2020-2023, Laurence Lundblade. All rights reserved.
+ * Copyright (c) 2020-2024, Laurence Lundblade. All rights reserved.
* Copyright (c) 2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
@@ -1839,47 +1839,164 @@
========================================================================== */
-// Semi-private
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
void
-QCBORDecode_GetUInt64ConvertInternal(QCBORDecodeContext *pMe,
+QCBORDecode_Private_GetUInt64Convert(QCBORDecodeContext *pCtx,
uint32_t uConvertTypes,
uint64_t *puValue,
QCBORItem *pItem);
-// Semi-private
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
void
-QCBORDecode_GetUInt64ConvertInternalInMapN(QCBORDecodeContext *pMe,
+QCBORDecode_Private_GetUInt64ConvertInMapN(QCBORDecodeContext *pCtx,
int64_t nLabel,
uint32_t uConvertTypes,
uint64_t *puValue,
QCBORItem *pItem);
-// Semi-private
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
void
-QCBORDecode_GetUInt64ConvertInternalInMapSZ(QCBORDecodeContext *pMe,
+QCBORDecode_Private_GetUInt64ConvertInMapSZ(QCBORDecodeContext *pCtx,
const char *szLabel,
uint32_t uConvertTypes,
uint64_t *puValue,
QCBORItem *pItem);
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_EnterBoundedMapOrArray(QCBORDecodeContext *pCtx,
+ uint8_t uType,
+ QCBORItem *pItem);
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_ExitBoundedMapOrArray(QCBORDecodeContext *pCtx,
+ uint8_t uType);
+
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_GetInt64Convert(QCBORDecodeContext *pCtx,
+ uint32_t uConvertTypes,
+ int64_t *pnValue,
+ QCBORItem *pItem);
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_GetInt64ConvertInMapN(QCBORDecodeContext *pCtx,
+ int64_t nLabel,
+ uint32_t uConvertTypes,
+ int64_t *pnValue,
+ QCBORItem *pItem);
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_GetInt64ConvertInMapSZ(QCBORDecodeContext *pCtx,
+ const char *szLabel,
+ uint32_t uConvertTypes,
+ int64_t *pnValue,
+ QCBORItem *pItem);
+
+
+#ifndef USEFULBUF_DISABLE_ALL_FLOAT
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_GetDoubleConvert(QCBORDecodeContext *pCtx,
+ uint32_t uConvertTypes,
+ double *pValue,
+ QCBORItem *pItem);
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_GetDoubleConvertInMapN(QCBORDecodeContext *pCtx,
+ int64_t nLabel,
+ uint32_t uConvertTypes,
+ double *pdValue,
+ QCBORItem *pItem);
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_GetDoubleConvertInMapSZ(QCBORDecodeContext *pCtx,
+ const char *szLabel,
+ uint32_t uConvertTypes,
+ double *pdValue,
+ QCBORItem *pItem);
+#endif /* !USEFULBUF_DISABLE_ALL_FLOAT */
+
+#define QCBOR_TAGSPEC_NUM_TYPES 4
+/* Semi-private data structure (which might change).
+ *
+ * See QCBOR_Private_CheckTagRequirement() which uses this to check the
+ * type of a item to be decoded as a tag or tag content.
+ *
+ * Improvement: Carefully understand what compilers do with this,
+ * particularly initialization and see if it can be optimized so there
+ * is less code and maybe so it can be smaller.
+ */
+typedef struct {
+ /* One of QCBOR_TAGSPEC_MATCH_xxx */
+ uint8_t uTagRequirement;
+ /* The tagged type translated into QCBOR_TYPE_XXX. Used to match
+ * explicit tagging */
+ uint8_t uTaggedTypes[QCBOR_TAGSPEC_NUM_TYPES];
+ /* The types of the content, which are used to match implicit
+ * tagging */
+ uint8_t uAllowedContentTypes[QCBOR_TAGSPEC_NUM_TYPES];
+} QCBOR_Private_TagSpec;
+
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_GetTaggedString(QCBORDecodeContext *pCtx,
+ QCBOR_Private_TagSpec TagSpec,
+ UsefulBufC *pBstr);
+
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_GetTaggedStringInMapN(QCBORDecodeContext *pCtx,
+ int64_t nLabel,
+ QCBOR_Private_TagSpec TagSpec,
+ UsefulBufC *pString);
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+void
+QCBORDecode_Private_GetTaggedStringInMapSZ(QCBORDecodeContext *pCtx,
+ const char *szLabel,
+ QCBOR_Private_TagSpec TagSpec,
+ UsefulBufC *pString);
+
+
+/* Semi-private funcion used by public inline functions. See qcbor_decode.c */
+QCBORError
+QCBORDecode_Private_GetMIME(uint8_t uTagRequirement,
+ const QCBORItem *pItem,
+ UsefulBufC *pMessage,
+ bool *pbIsTag257);
+
+
+
+
static inline void
QCBORDecode_GetUInt64Convert(QCBORDecodeContext *pMe,
- uint32_t uConvertTypes,
+ const uint32_t uConvertTypes,
uint64_t *puValue)
{
QCBORItem Item;
- QCBORDecode_GetUInt64ConvertInternal(pMe, uConvertTypes, puValue, &Item);
+ QCBORDecode_Private_GetUInt64Convert(pMe, uConvertTypes, puValue, &Item);
}
static inline void
QCBORDecode_GetUInt64ConvertInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint32_t uConvertTypes,
+ const int64_t nLabel,
+ const uint32_t uConvertTypes,
uint64_t *puValue)
{
QCBORItem Item;
- QCBORDecode_GetUInt64ConvertInternalInMapN(pMe,
+ QCBORDecode_Private_GetUInt64ConvertInMapN(pMe,
nLabel,
uConvertTypes,
puValue,
@@ -1889,11 +2006,11 @@
static inline void
QCBORDecode_GetUInt64ConvertInMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint32_t uConvertTypes,
+ const uint32_t uConvertTypes,
uint64_t *puValue)
{
QCBORItem Item;
- QCBORDecode_GetUInt64ConvertInternalInMapSZ(pMe,
+ QCBORDecode_Private_GetUInt64ConvertInMapSZ(pMe,
szLabel,
uConvertTypes,
puValue,
@@ -1908,7 +2025,7 @@
static inline void
QCBORDecode_GetUInt64InMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
+ const int64_t nLabel,
uint64_t *puValue)
{
QCBORDecode_GetUInt64ConvertInMapN(pMe,
@@ -1929,81 +2046,48 @@
}
-// Semi-private
-void QCBORDecode_EnterBoundedMapOrArray(QCBORDecodeContext *pMe,
- uint8_t uType,
- QCBORItem *pItem);
-
-// Semi-private
static inline void
QCBORDecode_EnterMap(QCBORDecodeContext *pMe, QCBORItem *pItem) {
- QCBORDecode_EnterBoundedMapOrArray(pMe, QCBOR_TYPE_MAP, pItem);
+ QCBORDecode_Private_EnterBoundedMapOrArray(pMe, QCBOR_TYPE_MAP, pItem);
}
-// Semi-private
static inline void
QCBORDecode_EnterArray(QCBORDecodeContext *pMe, QCBORItem *pItem) {
- QCBORDecode_EnterBoundedMapOrArray(pMe, QCBOR_TYPE_ARRAY, pItem);
+ QCBORDecode_Private_EnterBoundedMapOrArray(pMe, QCBOR_TYPE_ARRAY, pItem);
}
-// Semi-private
-void
-QCBORDecode_ExitBoundedMapOrArray(QCBORDecodeContext *pMe, uint8_t uType);
-
static inline void
QCBORDecode_ExitArray(QCBORDecodeContext *pMe)
{
- QCBORDecode_ExitBoundedMapOrArray(pMe, QCBOR_TYPE_ARRAY);
+ QCBORDecode_Private_ExitBoundedMapOrArray(pMe, QCBOR_TYPE_ARRAY);
}
static inline void
QCBORDecode_ExitMap(QCBORDecodeContext *pMe)
{
- QCBORDecode_ExitBoundedMapOrArray(pMe, QCBOR_TYPE_MAP);
+ QCBORDecode_Private_ExitBoundedMapOrArray(pMe, QCBOR_TYPE_MAP);
}
-// Semi-private
-void
-QCBORDecode_GetInt64ConvertInternal(QCBORDecodeContext *pMe,
- uint32_t uConvertTypes,
- int64_t *pnValue,
- QCBORItem *pItem);
-
-// Semi-private
-void
-QCBORDecode_GetInt64ConvertInternalInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint32_t uConvertTypes,
- int64_t *pnValue,
- QCBORItem *pItem);
-
-// Semi-private
-void
-QCBORDecode_GetInt64ConvertInternalInMapSZ(QCBORDecodeContext *pMe,
- const char *szLabel,
- uint32_t uConvertTypes,
- int64_t *pnValue,
- QCBORItem *pItem);
static inline void
QCBORDecode_GetInt64Convert(QCBORDecodeContext *pMe,
- uint32_t uConvertTypes,
+ const uint32_t uConvertTypes,
int64_t *pnValue)
{
QCBORItem Item;
- QCBORDecode_GetInt64ConvertInternal(pMe, uConvertTypes, pnValue, &Item);
+ QCBORDecode_Private_GetInt64Convert(pMe, uConvertTypes, pnValue, &Item);
}
static inline void
QCBORDecode_GetInt64ConvertInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint32_t uConvertTypes,
+ const int64_t nLabel,
+ const uint32_t uConvertTypes,
int64_t *pnValue)
{
QCBORItem Item;
- QCBORDecode_GetInt64ConvertInternalInMapN(pMe,
+ QCBORDecode_Private_GetInt64ConvertInMapN(pMe,
nLabel,
uConvertTypes,
pnValue,
@@ -2013,11 +2097,11 @@
static inline void
QCBORDecode_GetInt64ConvertInMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint32_t uConvertTypes,
+ const uint32_t uConvertTypes,
int64_t *pnValue)
{
QCBORItem Item;
- QCBORDecode_GetInt64ConvertInternalInMapSZ(pMe,
+ QCBORDecode_Private_GetInt64ConvertInMapSZ(pMe,
szLabel,
uConvertTypes,
pnValue,
@@ -2032,7 +2116,7 @@
static inline void
QCBORDecode_GetInt64InMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
+ const int64_t nLabel,
int64_t *pnValue)
{
QCBORDecode_GetInt64ConvertInMapN(pMe,
@@ -2057,47 +2141,23 @@
#ifndef USEFULBUF_DISABLE_ALL_FLOAT
-// Semi-private
-void
-QCBORDecode_GetDoubleConvertInternal(QCBORDecodeContext *pMe,
- uint32_t uConvertTypes,
- double *pValue,
- QCBORItem *pItem);
-
-// Semi-private
-void
-QCBORDecode_GetDoubleConvertInternalInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint32_t uConvertTypes,
- double *pdValue,
- QCBORItem *pItem);
-
-// Semi-private
-void
-QCBORDecode_GetDoubleConvertInternalInMapSZ(QCBORDecodeContext *pMe,
- const char *szLabel,
- uint32_t uConvertTypes,
- double *pdValue,
- QCBORItem *pItem);
-
-
static inline void
QCBORDecode_GetDoubleConvert(QCBORDecodeContext *pMe,
- uint32_t uConvertTypes,
+ const uint32_t uConvertTypes,
double *pdValue)
{
QCBORItem Item;
- QCBORDecode_GetDoubleConvertInternal(pMe, uConvertTypes, pdValue, &Item);
+ QCBORDecode_Private_GetDoubleConvert(pMe, uConvertTypes, pdValue, &Item);
}
static inline void
QCBORDecode_GetDoubleConvertInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
+ const int64_t nLabel,
uint32_t uConvertTypes,
double *pdValue)
{
QCBORItem Item;
- QCBORDecode_GetDoubleConvertInternalInMapN(pMe,
+ QCBORDecode_Private_GetDoubleConvertInMapN(pMe,
nLabel,
uConvertTypes,
pdValue,
@@ -2107,11 +2167,11 @@
static inline void
QCBORDecode_GetDoubleConvertInMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint32_t uConvertTypes,
+ const uint32_t uConvertTypes,
double *pdValue)
{
QCBORItem Item;
- QCBORDecode_GetDoubleConvertInternalInMapSZ(pMe,
+ QCBORDecode_Private_GetDoubleConvertInMapSZ(pMe,
szLabel,
uConvertTypes,
pdValue,
@@ -2126,7 +2186,7 @@
static inline void
QCBORDecode_GetDoubleInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
+ const int64_t nLabel,
double *pdValue)
{
QCBORDecode_GetDoubleConvertInMapN(pMe,
@@ -2149,85 +2209,34 @@
-#define QCBOR_TAGSPEC_NUM_TYPES 4
-/* Semi-private data structure (which might change).
- *
- * See CheckTagRequirement() which uses this to check the type of a
- * item to be decoded as a tag or tag content.
- *
- * Improvement: Carefully understand what compilers do with this,
- * particularly initialization and see if it can be optimized so there
- * is less code and maybe so it can be smaller.
- */
-typedef struct {
- /* One of QCBOR_TAGSPEC_MATCH_xxx */
- uint8_t uTagRequirement;
- /* The tagged type translated into QCBOR_TYPE_XXX. Used to match
- * explicit tagging */
- uint8_t uTaggedTypes[QCBOR_TAGSPEC_NUM_TYPES];
- /* The types of the content, which are used to match implicit
- * tagging */
- uint8_t uAllowedContentTypes[QCBOR_TAGSPEC_NUM_TYPES];
-} TagSpecification;
-
-
-// Semi private
-void
-QCBORDecode_GetTaggedStringInternal(QCBORDecodeContext *pMe,
- TagSpecification TagSpec,
- UsefulBufC *pBstr);
-
-
-// Semi private
-void
-QCBORDecode_GetTaggedStringInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- TagSpecification TagSpec,
- UsefulBufC *pString);
-
-// Semi private
-void
-QCBORDecode_GetTaggedStringInMapSZ(QCBORDecodeContext *pMe,
- const char * szLabel,
- TagSpecification TagSpec,
- UsefulBufC *pString);
-
-
-// Semi private
-QCBORError
-QCBORDecode_GetMIMEInternal(uint8_t uTagRequirement,
- const QCBORItem *pItem,
- UsefulBufC *pMessage,
- bool *pbIsTag257);
-
static inline void
QCBORDecode_GetByteString(QCBORDecodeContext *pMe, UsefulBufC *pValue)
{
// Complier should make this just a 64-bit integer parameter
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
QCBOR_TAG_REQUIREMENT_NOT_A_TAG,
{QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInternal(pMe, TagSpec, pValue);
+ QCBORDecode_Private_GetTaggedString(pMe, TagSpec, pValue);
}
static inline void
QCBORDecode_GetByteStringInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
+ const int64_t nLabel,
UsefulBufC *pBstr)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
QCBOR_TAG_REQUIREMENT_NOT_A_TAG,
{QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pBstr);
+ QCBORDecode_Private_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pBstr);
}
static inline void
@@ -2235,14 +2244,14 @@
const char *szLabel,
UsefulBufC *pBstr)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
QCBOR_TAG_REQUIREMENT_NOT_A_TAG,
{QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pBstr);
+ QCBORDecode_Private_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pBstr);
}
@@ -2250,31 +2259,31 @@
QCBORDecode_GetTextString(QCBORDecodeContext *pMe, UsefulBufC *pValue)
{
// Complier should make this just 64-bit integer parameter
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
QCBOR_TAG_REQUIREMENT_NOT_A_TAG,
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInternal(pMe, TagSpec, pValue);
+ QCBORDecode_Private_GetTaggedString(pMe, TagSpec, pValue);
}
static inline void
QCBORDecode_GetTextStringInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
+ const int64_t nLabel,
UsefulBufC *pText)
{
// This TagSpec only matches text strings; it also should optimize down
// to passing a 64-bit integer
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
QCBOR_TAG_REQUIREMENT_NOT_A_TAG,
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pText);
+ QCBORDecode_Private_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pText);
}
static inline void
@@ -2282,14 +2291,14 @@
const char *szLabel,
UsefulBufC *pText)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
QCBOR_TAG_REQUIREMENT_NOT_A_TAG,
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pText);
+ QCBORDecode_Private_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pText);
}
static inline void
@@ -2305,7 +2314,7 @@
static inline void
QCBORDecode_GetNullInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel)
+ const int64_t nLabel)
{
QCBORItem Item;
QCBORDecode_GetItemInMapN(pMe, nLabel, QCBOR_TYPE_NULL, &Item);
@@ -2313,7 +2322,7 @@
static inline void
QCBORDecode_GetNullInMapSZ(QCBORDecodeContext *pMe,
- const char * szLabel)
+ const char *szLabel)
{
QCBORItem Item;
QCBORDecode_GetItemInMapSZ(pMe, szLabel, QCBOR_TYPE_NULL, &Item);
@@ -2332,7 +2341,7 @@
static inline void
QCBORDecode_GetUndefinedInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel)
+ const int64_t nLabel)
{
QCBORItem Item;
QCBORDecode_GetItemInMapN(pMe, nLabel, QCBOR_TYPE_UNDEF, &Item);
@@ -2340,7 +2349,7 @@
static inline void
QCBORDecode_GetUndefinedInMapSZ(QCBORDecodeContext *pMe,
- const char * szLabel)
+ const char *szLabel)
{
QCBORItem Item;
QCBORDecode_GetItemInMapSZ(pMe, szLabel, QCBOR_TYPE_UNDEF, &Item);
@@ -2349,294 +2358,294 @@
static inline void
QCBORDecode_GetDateString(QCBORDecodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pValue)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_DATE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInternal(pMe, TagSpec, pValue);
+ QCBORDecode_Private_GetTaggedString(pMe, TagSpec, pValue);
}
static inline void
QCBORDecode_GetDateStringInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
UsefulBufC *pText)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_DATE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pText);
+ QCBORDecode_Private_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pText);
}
static inline void
QCBORDecode_GetDateStringInMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pText)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_DATE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pText);
+ QCBORDecode_Private_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pText);
}
static inline void
QCBORDecode_GetDaysString(QCBORDecodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pValue)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_DAYS_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInternal(pMe, TagSpec, pValue);
+ QCBORDecode_Private_GetTaggedString(pMe, TagSpec, pValue);
}
static inline void
QCBORDecode_GetDaysStringInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
UsefulBufC *pText)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_DAYS_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pText);
+ QCBORDecode_Private_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pText);
}
static inline void
QCBORDecode_GetDaysStringInMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pText)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_DAYS_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pText);
+ QCBORDecode_Private_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pText);
}
static inline void
QCBORDecode_GetURI(QCBORDecodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pUUID)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_URI, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInternal(pMe, TagSpec, pUUID);
+ QCBORDecode_Private_GetTaggedString(pMe, TagSpec, pUUID);
}
static inline void
QCBORDecode_GetURIInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
UsefulBufC *pUUID)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_URI, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pUUID);
+ QCBORDecode_Private_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pUUID);
}
static inline void
QCBORDecode_GetURIInMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pUUID)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_URI, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pUUID);
+ QCBORDecode_Private_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pUUID);
}
static inline void
QCBORDecode_GetB64(QCBORDecodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pB64Text)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_BASE64, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInternal(pMe, TagSpec, pB64Text);
+ QCBORDecode_Private_GetTaggedString(pMe, TagSpec, pB64Text);
}
static inline void
QCBORDecode_GetB64InMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
UsefulBufC *pB64Text)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_BASE64, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pB64Text);
+ QCBORDecode_Private_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pB64Text);
}
static inline void
QCBORDecode_GetB64InMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pB64Text)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_BASE64, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pB64Text);
+ QCBORDecode_Private_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pB64Text);
}
static inline void
QCBORDecode_GetB64URL(QCBORDecodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pB64Text)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_BASE64URL, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInternal(pMe, TagSpec, pB64Text);
+ QCBORDecode_Private_GetTaggedString(pMe, TagSpec, pB64Text);
}
static inline void
QCBORDecode_GetB64URLInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
UsefulBufC *pB64Text)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_BASE64URL, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pB64Text);
+ QCBORDecode_Private_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pB64Text);
}
static inline void
QCBORDecode_GetB64URLInMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pB64Text)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_BASE64URL, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pB64Text);
+ QCBORDecode_Private_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pB64Text);
}
static inline void
QCBORDecode_GetRegex(QCBORDecodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pRegex)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_REGEX, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInternal(pMe, TagSpec, pRegex);
+ QCBORDecode_Private_GetTaggedString(pMe, TagSpec, pRegex);
}
static inline void
QCBORDecode_GetRegexInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
UsefulBufC *pRegex)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_REGEX, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pRegex);
+ QCBORDecode_Private_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pRegex);
}
static inline void
QCBORDecode_GetRegexInMapSZ(QCBORDecodeContext *pMe,
const char * szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pRegex)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_REGEX, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pRegex);
+ QCBORDecode_Private_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pRegex);
}
static inline void
QCBORDecode_GetMIMEMessage(QCBORDecodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pMessage,
bool *pbIsTag257)
{
@@ -2652,7 +2661,7 @@
return;
}
- pMe->uLastError = (uint8_t)QCBORDecode_GetMIMEInternal(uTagRequirement,
+ pMe->uLastError = (uint8_t)QCBORDecode_Private_GetMIME(uTagRequirement,
&Item,
pMessage,
pbIsTag257);
@@ -2660,8 +2669,8 @@
static inline void
QCBORDecode_GetMIMEMessageInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
UsefulBufC *pMessage,
bool *pbIsTag257)
{
@@ -2669,7 +2678,7 @@
QCBORDecode_GetItemInMapN(pMe, nLabel, QCBOR_TYPE_ANY, &Item);
if(pMe->uLastError == QCBOR_SUCCESS) {
- pMe->uLastError = (uint8_t)QCBORDecode_GetMIMEInternal(uTagRequirement,
+ pMe->uLastError = (uint8_t)QCBORDecode_Private_GetMIME(uTagRequirement,
&Item,
pMessage,
pbIsTag257);
@@ -2679,7 +2688,7 @@
static inline void
QCBORDecode_GetMIMEMessageInMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pMessage,
bool *pbIsTag257)
{
@@ -2687,7 +2696,7 @@
QCBORDecode_GetItemInMapSZ(pMe, szLabel, QCBOR_TYPE_ANY, &Item);
if(pMe->uLastError == QCBOR_SUCCESS) {
- pMe->uLastError = (uint8_t)QCBORDecode_GetMIMEInternal(uTagRequirement,
+ pMe->uLastError = (uint8_t)QCBORDecode_Private_GetMIME(uTagRequirement,
&Item,
pMessage,
pbIsTag257);
@@ -2697,49 +2706,49 @@
static inline void
QCBORDecode_GetBinaryUUID(QCBORDecodeContext *pMe,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pUUID)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_UUID, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInternal(pMe, TagSpec, pUUID);
+ QCBORDecode_Private_GetTaggedString(pMe, TagSpec, pUUID);
}
static inline void
QCBORDecode_GetBinaryUUIDInMapN(QCBORDecodeContext *pMe,
- int64_t nLabel,
- uint8_t uTagRequirement,
+ const int64_t nLabel,
+ const uint8_t uTagRequirement,
UsefulBufC *pUUID)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_UUID, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pUUID);
+ QCBORDecode_Private_GetTaggedStringInMapN(pMe, nLabel, TagSpec, pUUID);
}
static inline void
QCBORDecode_GetBinaryUUIDInMapSZ(QCBORDecodeContext *pMe,
const char *szLabel,
- uint8_t uTagRequirement,
+ const uint8_t uTagRequirement,
UsefulBufC *pUUID)
{
- const TagSpecification TagSpec =
+ const QCBOR_Private_TagSpec TagSpec =
{
uTagRequirement,
{QCBOR_TYPE_UUID, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
{QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
};
- QCBORDecode_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pUUID);
+ QCBORDecode_Private_GetTaggedStringInMapSZ(pMe, szLabel, TagSpec, pUUID);
}