Add logic about checking the NULL and modify warning code.

This patch include, check the NULL and modify warning code.

Change-Id: Ie28548563357e0c9565ecdcd776cce60d3d42f33
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp b/service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp
index e005bcfb00a96b036e451830e8f328d8019337bf..1efff709724b12a43b6c23ea6f89b22a3122eefc 100755 (executable)
--- a/service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp
+++ b/service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp
@@ -131,7 +131,7 @@ void *OCProcessThread(void *ptr)
 \r
 int main(void)\r
 {\r
-    pthread_t OCThread = NULL;\r
+    pthread_t OCThread = 0;\r
 \r
     std::cout << "start Iotivity" << std::endl;\r
 \r

diff --git a/service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp b/service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp
index 8b2cd560adfc4073640991660331bf6c7857a10a..374405e23b92b4075d5d8333b1311fc834ce961d 100755 (executable)
--- a/service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp
+++ b/service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp
@@ -82,7 +82,7 @@ void syncCallback(OIC::Service::NSSyncInfo *sync)
 int main()\r
 {\r
     int num = 0;\r
-    pthread_t processThread = NULL;\r
+    pthread_t processThread = 0;\r
 \r
     std::cout << "start Iotivity" << std::endl;\r
 \r

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 1c0d70b829b80db18cc7721324ff779b6b0872fc..f526a466790915829ae32658200c41b8117a5754 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -135,7 +135,9 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
     {\r
         NS_LOG(DEBUG, "resourceType == NS_RESOURCE_MESSAGE");\r
         NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement));\r
+        NS_VERIFY_NOT_NULL_V(element);\r
         NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData));\r
+        NS_VERIFY_NOT_NULL_V(subData);\r
 \r
         OICStrcpy(subData->id, UUID_STRING_SIZE, id);\r
         NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id);\r
@@ -192,7 +194,9 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
     {\r
         NS_LOG(DEBUG, "resourceType == NS_RESOURCE_SYNC");\r
         NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement));\r
+        NS_VERIFY_NOT_NULL_V(element);\r
         NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData));\r
+        NS_VERIFY_NOT_NULL_V(subData);\r
 \r
         OICStrcpy(subData->id, UUID_STRING_SIZE, id);\r
         NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id);\r