commit f71e162614709873117805a7a2ea151874ffa784
author Laurence Lundblade <lgl@securitytheory.com> Thu Aug 06 18:52:13 2020 -0700
committer Laurence Lundblade <lgl@securitytheory.com> Thu Aug 06 18:52:13 2020 -0700
tree e176706fd6974f68e98a183d8bca2f6817a91340
parent c7e4e0aa530f3d099ed8698c2d5074b126d34bc0

test for IsNotWellFormed; remove a few done TODO:'s other clean up

src/qcbor_decode.c

diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index fe91227..0041be8 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -1977,7 +1977,7 @@
 /*
  Public function, see header qcbor/qcbor_decode.h file
  */
-int QCBORDecode_IsTagged(QCBORDecodeContext *me,
+bool QCBORDecode_IsTagged(QCBORDecodeContext *me,
                          const QCBORItem   *pItem,
                          uint64_t           uTag)
 {
@@ -1986,11 +1986,11 @@
          break;
       }
       if(ConvertTag(me, pItem->uTags[i]) == uTag) {
-         return 1;
+         return true;
       }
    }
 
-   return 0;
+   return false;
 }
 
 
@@ -3655,10 +3655,6 @@
                                                int64_t             *pnValue,
                                                QCBORItem           *pItem)
 {
-   if(pMe->uLastError != QCBOR_SUCCESS) {
-      return;
-   }
-
    QCBORDecode_GetItemInMapSZ(pMe, szLabel, QCBOR_TYPE_ANY, pItem);
    if(pMe->uLastError != QCBOR_SUCCESS) {
       return;
@@ -3942,46 +3938,6 @@
 }
 
 
-void QCBORDecode_GetInt8ConvertInternal(QCBORDecodeContext *pMe, uint32_t uConvertTypes, int8_t *pnValue, QCBORItem *pItem)
-{
-   int64_t uValue;
-   QCBORDecode_GetInt64ConvertInternal(pMe, uConvertTypes, &uValue, pItem);
-   if(pMe->uLastError != QCBOR_SUCCESS) {
-      return;
-   }
-
-   if(QCBOR_Int64ToInt8(uValue, pnValue)) {
-      pMe->uLastError = QCBOR_ERR_CONVERSION_UNDER_OVER_FLOW;
-   }
-}
-
-void QCBORDecode_GetInt8ConvertInternalInMapN(QCBORDecodeContext *pMe, int64_t nLabel, uint32_t uConvertTypes, int8_t *pnValue, QCBORItem *pItem)
-{
-   int64_t uValue;
-   QCBORDecode_GetInt64ConvertInternalInMapN(pMe, nLabel, uConvertTypes, &uValue, pItem);
-   if(pMe->uLastError != QCBOR_SUCCESS) {
-      return;
-   }
-
-   if(QCBOR_Int64ToInt8(uValue, pnValue)) {
-      pMe->uLastError = QCBOR_ERR_CONVERSION_UNDER_OVER_FLOW;
-   }
-}
-
-void QCBORDecode_GetInt8ConvertInternalInMapSZ(QCBORDecodeContext *pMe, const char *szLabel, uint32_t uConvertTypes, int8_t *pnValue, QCBORItem *pItem)
-{
-   int64_t uValue;
-   QCBORDecode_GetInt64ConvertInternalInMapSZ(pMe, szLabel, uConvertTypes, &uValue, pItem);
-   if(pMe->uLastError != QCBOR_SUCCESS) {
-      return;
-   }
-
-   if(QCBOR_Int64ToInt8(uValue, pnValue)) {
-      pMe->uLastError = QCBOR_ERR_CONVERSION_UNDER_OVER_FLOW;
-   }
-}
-
-
 
 
 void QCBORDecode_GetUint64ConvertInternalInMapN(QCBORDecodeContext *pMe,