do code optimization of EntityHandler.

our service has three entityHandler.
almost, which of operation same is response.

second patch included one more optimization.
our service not using the response value in EntityHandler.
so, i remove related response value.

third patch included remove set ehResultValue.
because of, our service is ehResult value always return OC_EH_OK.

fifth patch included remove comments and not required value.
remove unnecessary comments and not required value in NSProviderListener.c
payload value is not used.

Change-Id: I719a65e70f3ad51da0ed0488be48b973e8a61ab7
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9825
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/notification/src/provider/NSProviderListener.c b/service/notification/src/provider/NSProviderListener.c
index dae2364..e6fb4c3 100644 (file)
--- a/service/notification/src/provider/NSProviderListener.c
+++ b/service/notification/src/provider/NSProviderListener.c
@@ -26,27 +26,15 @@ OCEntityHandlerResult NSEntityHandlerNotificationCb(OCEntityHandlerFlag flag,
     NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - IN");\r
 \r
     OCEntityHandlerResult ehResult = OC_EH_OK;\r
-    OCEntityHandlerResponse response =\r
-    { 0, 0, OC_EH_ERROR, 0, 0,\r
-    { },\r
-    { 0 }, false };\r
 \r
     (void)callback;\r
 \r
-    // Validate pointer\r
     if (!entityHandlerRequest)\r
     {\r
         NS_LOG(ERROR, "Invalid request pointer");\r
         return OC_EH_ERROR;\r
     }\r
 \r
-    // Initialize certain response fields\r
-    response.numSendVendorSpecificHeaderOptions = 0;\r
-    memset(response.sendVendorSpecificHeaderOptions, 0,\r
-            sizeof response.sendVendorSpecificHeaderOptions);\r
-    memset(response.resourceUri, 0, sizeof response.resourceUri);\r
-    OCRepPayload* payload = NULL;\r
-\r
     if (flag & OC_REQUEST_FLAG)\r
     {\r
         NS_LOG(DEBUG, "Flag includes OC_REQUEST_FLAG");\r
@@ -57,33 +45,14 @@ OCEntityHandlerResult NSEntityHandlerNotificationCb(OCEntityHandlerFlag flag,
 \r
             NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SEND_POLICY,\r
                     NSCopyOCEntityHandlerRequest(entityHandlerRequest));\r
-            ehResult = OC_EH_OK;\r
 \r
         }\r
-        else if (OC_REST_PUT == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - OC_REST_PUT");\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else if (OC_REST_POST == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - OC_REST_POST");\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else if (OC_REST_DELETE == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - OC_REST_DELETE");\r
-            ehResult = OC_EH_OK;\r
-        }\r
         else\r
         {\r
-            NS_LOG_V (DEBUG, "Received unsupported method %d from client",\r
-                    entityHandlerRequest->method);\r
-            ehResult = OC_EH_OK;\r
+            NS_LOG_V (DEBUG, "Received method %d from client", entityHandlerRequest->method);\r
         }\r
     }\r
 \r
-    OCPayloadDestroy(response.payload);\r
     NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - OUT");\r
     return ehResult;\r
 }\r
@@ -94,57 +63,19 @@ OCEntityHandlerResult NSEntityHandlerMessageCb(OCEntityHandlerFlag flag,
     NS_LOG(DEBUG, "NSEntityHandlerMessageCb - IN");\r
 \r
     OCEntityHandlerResult ehResult = OC_EH_OK;\r
-    OCEntityHandlerResponse response =\r
-    { 0, 0, OC_EH_ERROR, 0, 0,\r
-    { },\r
-    { 0 }, false };\r
 \r
     (void)callback;\r
 \r
-    // Validate pointer\r
     if (!entityHandlerRequest)\r
     {\r
         NS_LOG (ERROR,"Invalid request pointer");\r
         return OC_EH_ERROR;\r
     }\r
 \r
-    // Initialize certain response fields\r
-    response.numSendVendorSpecificHeaderOptions = 0;\r
-    memset(response.sendVendorSpecificHeaderOptions, 0,\r
-            sizeof response.sendVendorSpecificHeaderOptions);\r
-    memset(response.resourceUri, 0, sizeof response.resourceUri);\r
-    OCRepPayload* payload = NULL;\r
-\r
     if (flag & OC_REQUEST_FLAG)\r
     {\r
         NS_LOG(DEBUG, "Flag includes OC_REQUEST_FLAG");\r
-\r
-        if (OC_REST_GET == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_REST_GET");\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else if (OC_REST_PUT == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_REST_PUT");\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else if (OC_REST_POST == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_REST_POST");\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else if (OC_REST_DELETE == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_REST_DELETE");\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else\r
-        {\r
-            NS_LOG_V(DEBUG, "Received unsupported method %d from client",\r
-                    entityHandlerRequest->method);\r
-            ehResult = OC_EH_OK;\r
-        }\r
+        NS_LOG_V(DEBUG, "Received method %d from client", entityHandlerRequest->method);\r
     }\r
 \r
     if (flag & OC_OBSERVE_FLAG)\r
@@ -171,7 +102,6 @@ OCEntityHandlerResult NSEntityHandlerMessageCb(OCEntityHandlerFlag flag,
         }\r
     }\r
 \r
-    OCPayloadDestroy(response.payload);\r
     NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OUT");\r
     return ehResult;\r
 }\r
@@ -181,42 +111,20 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag,
 {\r
     NS_LOG(DEBUG, "NSEntityHandlerSyncCb - IN");\r
     OCEntityHandlerResult ehResult = OC_EH_OK;\r
-    OCEntityHandlerResponse response =\r
-    { 0, 0, OC_EH_ERROR, 0, 0,\r
-    { },\r
-    { 0 }, false };\r
 \r
     (void)callback;\r
 \r
-    // Validate pointer\r
     if (!entityHandlerRequest)\r
     {\r
         NS_LOG(ERROR, "Invalid request pointer");\r
         return OC_EH_ERROR;\r
     }\r
 \r
-    // Initialize certain response fields\r
-    response.numSendVendorSpecificHeaderOptions = 0;\r
-    memset(response.sendVendorSpecificHeaderOptions, 0,\r
-            sizeof response.sendVendorSpecificHeaderOptions);\r
-    memset(response.resourceUri, 0, sizeof response.resourceUri);\r
-    OCRepPayload* payload = NULL;\r
-\r
     if (flag & OC_REQUEST_FLAG)\r
     {\r
         NS_LOG(DEBUG, "Flag includes OC_REQUEST_FLAG");\r
 \r
-        if (OC_REST_GET == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OC_REST_GET");\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else if (OC_REST_PUT == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OC_REST_PUT");\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else if (OC_REST_POST == entityHandlerRequest->method)\r
+        if (OC_REST_POST == entityHandlerRequest->method)\r
         {\r
             /** Receive sync data from consumer which read or dismiss notification message.\r
                            And broadcast the sync data to all subscribers including provider app\r
@@ -226,19 +134,10 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag,
 \r
             NSPushQueue(NOTIFICATION_SCHEDULER, TASK_RECV_READ,\r
                     NSGetSyncInfo(entityHandlerRequest->payload));\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else if (OC_REST_DELETE == entityHandlerRequest->method)\r
-        {\r
-            NS_LOG(DEBUG, "Received OC_REST_DELETE from client");\r
-            ehResult = OC_EH_OK;\r
-        }\r
-        else\r
-        {\r
-            NS_LOG_V(DEBUG, "Received unsupported method %d from client",\r
-                    entityHandlerRequest->method);\r
-            ehResult = OC_EH_OK;\r
+\r
         }\r
+\r
+        NS_LOG_V(DEBUG, "Received method %d from client", entityHandlerRequest->method);\r
     }\r
 \r
     if (flag & OC_OBSERVE_FLAG)\r
@@ -268,7 +167,6 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag,
         }\r
     }\r
 \r
-    OCPayloadDestroy(response.payload);\r
     NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OUT");\r
     return ehResult;\r
 }\r