* Macro to verify the validity of cbor operation.
*/
#define VERIFY_CBOR_SUCCESS(log_tag, err, log_message) \
- if ((CborNoError != (err)) && (CborErrorOutOfMemory != (err))) \
+ if ((CborNoError != (CborError)(err)) && (CborErrorOutOfMemory != (CborError)(err))) \
{ \
if ((log_tag) && (log_message)) \
{ \
OIC_LOG_V(ERROR, (log_tag), "%s with cbor error: \'%s\'.", \
- (log_message), (cbor_error_string(err))); \
+ (log_message), (cbor_error_string((CborError)err))); \
} \
goto exit; \
} \
OCRepPayload* OCRepPayloadClone(const OCRepPayload* payload);
+OCRepPayload* OCRepPayloadBatchClone(const OCRepPayload* repPayload);
+
void OCRepPayloadAppend(OCRepPayload* parent, OCRepPayload* child);
bool OCRepPayloadSetUri(OCRepPayload* payload, const char* uri);
void OCDiscoveryResourceDestroy(OCResourcePayload* payload);
void OCDiscoveryPayloadDestroy(OCDiscoveryPayload* payload);
-// Device Payload
-OCDevicePayload* OCDevicePayloadCreate(const char* sid, const char* dname,
- const OCStringLL *types, const char* specVer, const char* dmVer);
-void OCDevicePayloadDestroy(OCDevicePayload* payload);
-
-// Platform Payload
-OCPlatformPayload* OCPlatformPayloadCreate(const OCPlatformInfo* platformInfo);
-OCPlatformPayload* OCPlatformPayloadCreateAsOwner(OCPlatformInfo* platformInfo);
-void OCPlatformInfoDestroy(OCPlatformInfo *info);
-void OCPlatformPayloadDestroy(OCPlatformPayload* payload);
-
+#ifdef WITH_PRESENCE
// Presence Payload
OCPresencePayload* OCPresencePayloadCreate(uint32_t seqNum, uint32_t maxAge,
OCPresenceTrigger trigger, const char* resourceType);
void OCPresencePayloadDestroy(OCPresencePayload* payload);
+#endif
// Helper API
OCStringLL* CloneOCStringLL (OCStringLL* ll);
/**
* This function creates a string from a list (with separated contents if several)
* @param ll Pointer to list
- * @return newly allocated string
+ * @return newly allocated string. Caller takes ownership and must later free this memory with OICFree.
* @note separator is ',' (according to rfc4180)
**/
char* OCCreateString(const OCStringLL* ll);