Revert "first calcsize functions (mostly resurrected from the history)"

This reverts commit f4562bf74b4b4a38d31b17ab2e8b7cc8361ff2ef.

src/ua_types_encoding_binary.c

@@ -14,8 +14,6 @@ typedef UA_StatusCode (*UA_decodeBinarySignature) (const UA_ByteString *src, siz
                                                    void *dst, const UA_DataType*);
 static const UA_decodeBinarySignature decodeBinaryJumpTable[UA_BUILTIN_TYPES_COUNT + 1];
 
-typedef size_t (*UA_calcSizeBinarySignature) (const void *src, const UA_DataType*);
-
 /*****************/
 /* Integer Types */
 /*****************/
@@ -418,10 +416,6 @@ ByteString_decodeBinary(UA_ByteString const *src, size_t *UA_RESTRICT offset,
     return String_decodeBinary(src, offset, (UA_ByteString*)dst, _);
 }
 
-static size_t String_calcSizeBinary(const UA_String *p) {
-    return 4 + p->length;
-}
-
 /* Guid */
 static UA_StatusCode
 Guid_encodeBinary(UA_Guid const *src, const UA_DataType *_,
@@ -447,10 +441,6 @@ Guid_decodeBinary(UA_ByteString const *src, size_t *UA_RESTRICT offset,
     return retval;
 }
 
-static size_t Guid_calcSizeBinary(const UA_Guid *p, const UA_DataType* _) {
-    return 16;
-}
-
 /* NodeId */
 #define UA_NODEIDTYPE_NUMERIC_TWOBYTE 0
 #define UA_NODEIDTYPE_NUMERIC_FOURBYTE 1
@@ -561,34 +551,6 @@ NodeId_decodeBinary(UA_ByteString const *src, size_t *UA_RESTRICT offset,
     return retval;
 }
 
-static size_t NodeId_calcSizeBinary(const UA_NodeId *p, const UA_DataType* _) {
-    size_t length = 0;
-    switch (p->identifierType) {
-    case UA_NODEIDTYPE_NUMERIC:
-        if(p->identifier.numeric > UA_UINT16_MAX || p->namespaceIndex > UA_BYTE_MAX)
-            length = sizeof(UA_Byte) + sizeof(UA_UInt16) + sizeof(UA_UInt32);
-        else if(p->identifier.numeric > UA_BYTE_MAX || p->namespaceIndex > 0)
-            length = 4; /* UA_NODEIDTYPE_FOURBYTE */
-        else
-            length = 2; /* UA_NODEIDTYPE_TWOBYTE*/
-        break;
-    case UA_NODEIDTYPE_STRING:
-        length = sizeof(UA_Byte) + sizeof(UA_UInt16) + String_calcSizeBinary(&p->identifier.string);
-        break;
-    case UA_NODEIDTYPE_GUID:
-        length = sizeof(UA_Byte) + sizeof(UA_UInt16) + 128;
-        break;
-    case UA_NODEIDTYPE_BYTESTRING:
-        length = sizeof(UA_Byte) + sizeof(UA_UInt16) +
-            String_calcSizeBinary((const UA_String*)&p->identifier.byteString);
-        break;
-    default:
-        UA_assert(UA_FALSE); // this must never happen
-        break;
-    }
-    return length;
-}
-
 /* ExpandedNodeId */
 #define UA_EXPANDEDNODEID_NAMESPACEURI_FLAG 0x80
 #define UA_EXPANDEDNODEID_SERVERINDEX_FLAG 0x40
@@ -629,16 +591,6 @@ ExpandedNodeId_decodeBinary(UA_ByteString const *src, size_t *UA_RESTRICT offset
     return retval;
 }
 
-static size_t
-ExpandedNodeId_calcSizeBinary(UA_ExpandedNodeId const *p, const UA_DataType *_) {
-    size_t length = NodeId_calcSizeBinary(&p->nodeId, _);
-    if(p->namespaceUri.length > 0)
-        length += String_calcSizeBinary(&p->namespaceUri);
-    if(p->serverIndex > 0)
-        length += sizeof(UA_UInt32);
-    return length;
-}
-
 /* LocalizedText */
 #define UA_LOCALIZEDTEXT_ENCODINGMASKTYPE_LOCALE 0x01
 #define UA_LOCALIZEDTEXT_ENCODINGMASKTYPE_TEXT 0x02
@@ -673,15 +625,6 @@ LocalizedText_decodeBinary(UA_ByteString const *src, size_t *UA_RESTRICT offset,
     return retval;
 }
 
-static size_t LocalizedText_calcSizeBinary(const UA_LocalizedText *p, const UA_DataType *_) {
-    size_t length = 1; // for encodingMask
-    if(p->locale.data)
-        length += String_calcSizeBinary(&p->locale);
-    if(p->text.data)
-        length += String_calcSizeBinary(&p->text);
-    return length;
-}
-
 /* ExtensionObject */
 static UA_StatusCode
 ExtensionObject_encodeBinary(UA_ExtensionObject const *src, const UA_DataType *_,
@@ -1171,36 +1114,3 @@ UA_decodeBinary(const UA_ByteString *src, size_t *UA_RESTRICT offset, void *dst,
     memset(dst, 0, type->memSize); // init
     return UA_decodeBinaryNoInit(src, offset, dst, type);
 }
-
-static const UA_calcSizeBinarySignature calcSizeBinaryJumpTable[UA_BUILTIN_TYPES_COUNT + 1] = {
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)Guid_calcSizeBinary, 
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)NodeId_calcSizeBinary,
-    (UA_calcSizeBinarySignature)ExpandedNodeId_calcSizeBinary,
-    (UA_calcSizeBinarySignature)NULL,
-    (UA_calcSizeBinarySignature)UA_calcSizeBinary, // QualifiedName
-    (UA_calcSizeBinarySignature)LocalizedText_calcSizeBinary,
-    (UA_calcSizeBinarySignature)ExtensionObject_calcSizeBinary,
-    (UA_calcSizeBinarySignature)DataValue_calcSizeBinary,
-    (UA_calcSizeBinarySignature)Variant_calcSizeBinary,
-    (UA_calcSizeBinarySignature)DiagnosticInfo_calcSizeBinary,
-    (UA_calcSizeBinarySignature)UA_calcSizeBinary,
-};
-
-size_t UA_calcSizeBinary(const UA_ByteString *src, const UA_DataType *type) {
-
-}

src/ua_types_encoding_binary.h

@@ -9,6 +9,4 @@ UA_StatusCode UA_encodeBinary(const void *src, const UA_DataType *type, UA_ByteS
 UA_StatusCode UA_decodeBinary(const UA_ByteString *src, size_t * UA_RESTRICT offset, void *dst,
                               const UA_DataType *type) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
 
-size_t UA_calcSizeBinary(const UA_ByteString *src, const UA_DataType *type);
-
 #endif /* UA_TYPES_ENCODING_BINARY_H_ */