X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Fsrc%2Focclientcb.c;h=a24efed93f7114e0f949117e0cb244f3386836a7;hb=1cee1631595cac6a6394ac2e0b365c6dd5a42c68;hp=9ea19eef3de5d2912e995dbcd427ad7029cd7336;hpb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/stack/src/occlientcb.c b/resource/csdk/stack/src/occlientcb.c
index 9ea19ee..a24efed 100644
--- a/resource/csdk/stack/src/occlientcb.c
+++ b/resource/csdk/stack/src/occlientcb.c
@@ -36,7 +36,7 @@
 #include "cainterface.h"
 
 /// Module Name
-#define TAG PCF("occlientcb")
+#define TAG "OIC_RI_CLIENTCB"
 
 struct ClientCB *cbList = NULL;
 static OCMulticastNode * mcPresenceNodes = NULL;
@@ -48,32 +48,32 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData,
              OCDevAddr *devAddr, char * requestUri,
              char * resourceTypeName, uint32_t ttl)
 {
-    if(!clientCB || !cbData || !handle || !requestUri || tokenLength > CA_MAX_TOKEN_LEN)
+    if (!clientCB || !cbData || !handle || !requestUri || tokenLength > CA_MAX_TOKEN_LEN)
     {
         return OC_STACK_INVALID_PARAM;
     }
 
     ClientCB *cbNode = NULL;
 
-    #ifdef WITH_PRESENCE
-    if(method == OC_REST_PRESENCE)
+#ifdef WITH_PRESENCE
+    if (method == OC_REST_PRESENCE)
     {   // Retrieve the presence callback structure for this specific requestUri.
         cbNode = GetClientCB(NULL, 0, NULL, requestUri);
     }
-    #endif // WITH_PRESENCE
 
-    if(!cbNode)// If it does not already exist, create new node.
+    if (!cbNode)// If it does not already exist, create new node.
+#endif // WITH_PRESENCE
     {
         cbNode = (ClientCB*) OICMalloc(sizeof(ClientCB));
-        if(!cbNode)
+        if (!cbNode)
         {
             *clientCB = NULL;
             goto exit;
         }
         else
         {
-            OC_LOG(INFO, TAG, PCF("Adding client callback with token"));
-            OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)token, tokenLength);
+            OIC_LOG(INFO, TAG, "Adding client callback with token");
+            OIC_LOG_BUFFER(INFO, TAG, (const uint8_t *)token, tokenLength);
             cbNode->callBack = cbData->cb;
             cbNode->context = cbData->context;
             cbNode->deleteCallback = cbData->cd;
@@ -84,10 +84,10 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData,
             cbNode->handle = *handle;
             cbNode->method = method;
             cbNode->sequenceNumber = 0;
-            #ifdef WITH_PRESENCE
+#ifdef WITH_PRESENCE
             cbNode->presence = NULL;
             cbNode->filterResourceType = NULL;
-            #endif // WITH_PRESENCE
+#endif // WITH_PRESENCE
 
             if (method == OC_REST_PRESENCE ||
                 method == OC_REST_OBSERVE  ||
@@ -101,11 +101,12 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData,
             }
             cbNode->requestUri = requestUri;    // I own it now
             cbNode->devAddr = devAddr;          // I own it now
-            OC_LOG_V(INFO, TAG, "Added Callback for uri : %s", requestUri);
+            OIC_LOG_V(INFO, TAG, "Added Callback for uri : %s", requestUri);
             LL_APPEND(cbList, cbNode);
             *clientCB = cbNode;
         }
     }
+#ifdef WITH_PRESENCE
     else
     {
         // Ensure that the handle the SDK hands back up to the application layer for the
@@ -124,8 +125,7 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData,
         *handle = cbNode->handle;
     }
 
-    #ifdef WITH_PRESENCE
-    if(method == OC_REST_PRESENCE && resourceTypeName)
+    if (method == OC_REST_PRESENCE && resourceTypeName)
     {
         // Amend the found or created node by adding a new resourceType to it.
         return InsertResourceTypeFilter(cbNode,(char *)resourceTypeName);
@@ -135,40 +135,40 @@ AddClientCB (ClientCB** clientCB, OCCallbackData* cbData,
     {
         OICFree(resourceTypeName);
     }
-    #else
+#else
     OICFree(resourceTypeName);
-    #endif
+#endif
 
     return OC_STACK_OK;
 
-    exit:
-        return OC_STACK_NO_MEMORY;
+exit:
+    return OC_STACK_NO_MEMORY;
 }
 
 void DeleteClientCB(ClientCB * cbNode)
 {
-    if(cbNode)
+    if (cbNode)
     {
         LL_DELETE(cbList, cbNode);
-        OC_LOG (INFO, TAG, PCF("Deleting token"));
-        OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)cbNode->token, cbNode->tokenLength);
+        OIC_LOG (INFO, TAG, "Deleting token");
+        OIC_LOG_BUFFER(INFO, TAG, (const uint8_t *)cbNode->token, cbNode->tokenLength);
         CADestroyToken (cbNode->token);
         OICFree(cbNode->devAddr);
         OICFree(cbNode->handle);
-        OC_LOG_V (INFO, TAG, "Deleting callback with uri %s", cbNode->requestUri);
+        OIC_LOG_V (INFO, TAG, "Deleting callback with uri %s", cbNode->requestUri);
         OICFree(cbNode->requestUri);
-        if(cbNode->deleteCallback)
+        if (cbNode->deleteCallback)
         {
             cbNode->deleteCallback(cbNode->context);
         }
 
-        #ifdef WITH_PRESENCE
-        if(cbNode->presence)
+#ifdef WITH_PRESENCE
+        if (cbNode->presence)
         {
             OICFree(cbNode->presence->timeOut);
             OICFree(cbNode->presence);
         }
-        if(cbNode->method == OC_REST_PRESENCE)
+        if (cbNode->method == OC_REST_PRESENCE)
         {
             OCResourceType * pointer = cbNode->filterResourceType;
             OCResourceType * next = NULL;
@@ -180,7 +180,7 @@ void DeleteClientCB(ClientCB * cbNode)
                 pointer = next;
             }
         }
-        #endif // WITH_PRESENCE
+#endif // WITH_PRESENCE
         OICFree(cbNode);
         cbNode = NULL;
     }
@@ -208,58 +208,57 @@ static void CheckAndDeleteTimedOutCB(ClientCB* cbNode)
 
     if (cbNode->TTL < now)
     {
-        OC_LOG(INFO, TAG, PCF("Deleting timed-out callback"));
+        OIC_LOG(INFO, TAG, "Deleting timed-out callback");
         DeleteClientCB(cbNode);
     }
 }
 
 ClientCB* GetClientCB(const CAToken_t token, uint8_t tokenLength,
-        OCDoHandle handle, const char * requestUri)
+                      OCDoHandle handle, const char * requestUri)
 {
-
     ClientCB* out = NULL;
 
-    if(token && *token && tokenLength <= CA_MAX_TOKEN_LEN && tokenLength > 0)
+    if (token && tokenLength <= CA_MAX_TOKEN_LEN && tokenLength > 0)
     {
-        OC_LOG (INFO, TAG, PCF ("Looking for token"));
-        OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)token, tokenLength);
-        OC_LOG(INFO, TAG, PCF("\tFound in callback list"));
+        OIC_LOG (INFO, TAG,  "Looking for token");
+        OIC_LOG_BUFFER(INFO, TAG, (const uint8_t *)token, tokenLength);
+        OIC_LOG(INFO, TAG, "\tFound in callback list");
         LL_FOREACH(cbList, out)
         {
-            OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)out->token, tokenLength);
+            OIC_LOG_BUFFER(INFO, TAG, (const uint8_t *)out->token, tokenLength);
 
-            if(memcmp(out->token, token, tokenLength) == 0)
+            if (memcmp(out->token, token, tokenLength) == 0)
             {
                 return out;
             }
             CheckAndDeleteTimedOutCB(out);
         }
     }
-    else if(handle)
+    else if (handle)
     {
         LL_FOREACH(cbList, out)
         {
-            if(out->handle == handle)
+            if (out->handle == handle)
             {
                 return out;
             }
             CheckAndDeleteTimedOutCB(out);
         }
     }
-    else if(requestUri)
+    else if (requestUri)
     {
-        OC_LOG_V(INFO, TAG, "Looking for uri %s", requestUri);
+        OIC_LOG_V(INFO, TAG, "Looking for uri %s", requestUri);
         LL_FOREACH(cbList, out)
         {
-            OC_LOG_V(INFO, TAG, "\tFound %s", out->requestUri);
-            if(out->requestUri && strcmp(out->requestUri, requestUri ) == 0)
+            OIC_LOG_V(INFO, TAG, "\tFound %s", out->requestUri);
+            if (out->requestUri && strcmp(out->requestUri, requestUri ) == 0)
             {
                 return out;
             }
             CheckAndDeleteTimedOutCB(out);
         }
     }
-    OC_LOG(INFO, TAG, PCF("Callback Not found !!"));
+    OIC_LOG(INFO, TAG, "Callback Not found !!");
     return NULL;
 }
 
@@ -267,11 +266,11 @@ ClientCB* GetClientCB(const CAToken_t token, uint8_t tokenLength,
 OCStackResult InsertResourceTypeFilter(ClientCB * cbNode, char * resourceTypeName)
 {
     OCResourceType * newResourceType = NULL;
-    if(cbNode && resourceTypeName)
+    if (cbNode && resourceTypeName)
     {
         // Form a new resourceType member.
         newResourceType = (OCResourceType *) OICMalloc(sizeof(OCResourceType));
-        if(!newResourceType)
+        if (!newResourceType)
         {
             return OC_STACK_NO_MEMORY;
         }
@@ -300,7 +299,7 @@ void DeleteClientCBList()
 void FindAndDeleteClientCB(ClientCB * cbNode)
 {
     ClientCB* tmp;
-    if(cbNode)
+    if (cbNode)
     {
         LL_FOREACH(cbList, tmp)
         {
@@ -315,15 +314,12 @@ void FindAndDeleteClientCB(ClientCB * cbNode)
 
 OCStackResult AddMCPresenceNode(OCMulticastNode** outnode, char* uri, uint32_t nonce)
 {
-    if(!outnode)
+    if (!outnode)
     {
         return OC_STACK_INVALID_PARAM;
     }
 
-    OCMulticastNode *node;
-
-    node = (OCMulticastNode*) OICMalloc(sizeof(OCMulticastNode));
-
+    OCMulticastNode *node = (OCMulticastNode*) OICMalloc(sizeof(*node));
     if (node)
     {
         node->nonce = nonce;
@@ -338,19 +334,17 @@ OCStackResult AddMCPresenceNode(OCMulticastNode** outnode, char* uri, uint32_t n
 
 OCMulticastNode* GetMCPresenceNode(const char * uri)
 {
-    OCMulticastNode* out = NULL;
-
-    if(uri)
+    if (uri)
     {
+        OCMulticastNode* out = NULL;
         LL_FOREACH(mcPresenceNodes, out)
         {
-            if(out->uri && strcmp(out->uri, uri) == 0)
+            if (out->uri && strcmp(out->uri, uri) == 0)
             {
                 return out;
             }
         }
     }
-    OC_LOG(INFO, TAG, PCF("MulticastNode Not found !!"));
+    OIC_LOG(INFO, TAG, "MulticastNode Not found !!");
     return NULL;
 }
-