commit f9175a9c522632623d651bb46da4c0a2cd79af59
author Laurence Lundblade <lgl@securitytheory.com> Thu Jul 30 21:35:45 2020 -0700
committer Laurence Lundblade <lgl@securitytheory.com> Thu Jul 30 21:35:45 2020 -0700
tree 30a235b3ac3ab8207be4557217213bade7e39615
parent 78f7b93092359c3c31947c14bf2530485e2f2e47

spiffy decode documentation and naming improvements

src/qcbor_decode.c

diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index d54627a..02372d6 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -2609,7 +2609,7 @@
  */
 static QCBORError CheckTagRequirement(const TagSpecification TagSpec, uint8_t uDataType)
 {
-   if(TagSpec.uTagRequirement == QCBOR_TAGSPEC_MATCH_TAG) {
+   if(TagSpec.uTagRequirement == QCBOR_TAG_REQUIREMENT_MATCH_TAG) {
       // Must match the tag and only the tag
       return CheckTypeList(uDataType, TagSpec.uTaggedTypes);
    }
@@ -2619,7 +2619,7 @@
       return QCBOR_SUCCESS;
    }
 
-   if(TagSpec.uTagRequirement == QCBOR_TAGSPEC_MATCH_TAG_CONTENT_TYPE) {
+   if(TagSpec.uTagRequirement == QCBOR_TAG_REQUIREMENT_NO_TAG) {
       /* Must match the content type and only the content type.
        There was no match just above so it is a fail. */
       return QCBOR_ERR_UNEXPECTED_TYPE;
@@ -3273,10 +3273,8 @@
 
 
 // Semi private
-QCBORError FarfMIME(uint8_t uTagRequirement, const QCBORItem *pItem, UsefulBufC *pMessage, bool *pbIsNot7Bit)
+QCBORError QCBORDecode_GetMIMEInternal(uint8_t uTagRequirement, const QCBORItem *pItem, UsefulBufC *pMessage, bool *pbIsNot7Bit)
 {
-
-
    const TagSpecification TagSpecText = {uTagRequirement,
                                      {QCBOR_TYPE_MIME, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE},
                                      {QCBOR_TYPE_TEXT_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
@@ -3286,7 +3284,6 @@
                                      {QCBOR_TYPE_BYTE_STRING, QCBOR_TYPE_NONE, QCBOR_TYPE_NONE}
                                     };
 
-
    QCBORError uReturn;
    
    if(CheckTagRequirement(TagSpecText, pItem->uDataType)) {
@@ -4434,7 +4431,7 @@
    
    if(pItem->uDataType == QCBOR_TYPE_ARRAY) {
 
-      if(uTagRequirement == QCBOR_TAGSPEC_MATCH_TAG_CONTENT_TYPE) {
+      if(uTagRequirement == QCBOR_TAG_REQUIREMENT_NO_TAG) {
          pMe->uLastError = QCBOR_ERR_UNEXPECTED_TYPE;
          return;
       }
@@ -4450,7 +4447,7 @@
        }
     }
    
-   if(uTagRequirement == QCBOR_TAGSPEC_MATCH_TAG_CONTENT_TYPE) {
+   if(uTagRequirement == QCBOR_TAG_REQUIREMENT_NO_TAG) {
       pMe->uLastError = QCBOR_ERR_UNEXPECTED_TYPE;
       return;
    }