Addressed build warnings in resource folder.

Fixed compile-time warnings regarding
* not handling a enumeration value in switch case of OCException
* unused exit label and
* comparison between signed and unsigned integer expressions
in resource/csdk/ and resource/src folders.

Change-Id: Ia2d00ec335db56a5070cbe222093d392dd3a531c
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1182
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/csdk/ocrandom/test/linux/randomtest.cpp b/resource/csdk/ocrandom/test/linux/randomtest.cpp
index 98a1d5c..837a4d8 100644 (file)
--- a/resource/csdk/ocrandom/test/linux/randomtest.cpp
+++ b/resource/csdk/ocrandom/test/linux/randomtest.cpp
@@ -35,7 +35,7 @@ int main(int argc, char* argv[]) {
 }
 
 TEST(RandomGeneration,OCSeedRandom) {
-    EXPECT_EQ((uint32_t )0, OCSeedRandom());
+    EXPECT_EQ(0, OCSeedRandom());
 }
 
 TEST(RandomGeneration,OCGetRandomByte) {

diff --git a/resource/csdk/stack/src/ocobserve.c b/resource/csdk/stack/src/ocobserve.c
index ff573bd..bb7f4a8 100644 (file)
--- a/resource/csdk/stack/src/ocobserve.c
+++ b/resource/csdk/stack/src/ocobserve.c
@@ -44,14 +44,12 @@ static struct ResourceObserver * serverObsList = NULL;
 static char* GetJSONStringForPresence(uint32_t ttl, uint32_t nonce,
         OCPresenceTrigger trigger, OCResourceType *resourceType)
 {
-    cJSON *rootObj = cJSON_CreateObject();
-    if (!rootObj)
-    {
-        return NULL;
-    }
-
     char *jsonEncodedInfo = NULL;
     const char * triggerStr = NULL;
+
+    cJSON *rootObj = cJSON_CreateObject();
+    VERIFY_NON_NULL (rootObj);
+
     cJSON_AddItemToObject (rootObj, OC_RSRVD_TTL, cJSON_CreateNumber(ttl));
 
     cJSON_AddItemToObject (rootObj, OC_RSRVD_NONCE, cJSON_CreateNumber(nonce));

diff --git a/resource/include/StringConstants.h b/resource/include/StringConstants.h
index 593b7de..7aea3ad 100644 (file)
--- a/resource/include/StringConstants.h
+++ b/resource/include/StringConstants.h
@@ -80,6 +80,7 @@ namespace OC
         static const char NOT_FOUND[]                  = "Resource Not Found";
         static const char RESOURCE_ERROR[]             = "Resource Error";
         static const char SLOW_RESOURCE[]              = "Slow Resource";
+        static const char DUPLICATE_REQUEST[]          = "Duplicate Request";
         static const char NO_OBSERVERS[]               = "No Observers";
         static const char OBSV_NO_FOUND[]              = "Stack observer not found";
         static const char OBSV_NOT_ADDED[]             = "Stack observer not added";

diff --git a/resource/src/OCException.cpp b/resource/src/OCException.cpp
index 64d1cfd..af90961 100644 (file)
--- a/resource/src/OCException.cpp
+++ b/resource/src/OCException.cpp
@@ -63,6 +63,8 @@ std::string OC::OCException::reason(const OCStackResult sr)
             return OC::Exception::RESOURCE_ERROR;
         case OC_STACK_SLOW_RESOURCE:
             return OC::Exception::SLOW_RESOURCE;
+        case OC_STACK_DUPLICATE_REQUEST:
+            return OC::Exception::DUPLICATE_REQUEST;
         case OC_STACK_NO_OBSERVERS:
             return OC::Exception::NO_OBSERVERS;
         case OC_STACK_OBSERVER_NOT_FOUND:

diff --git a/resource/unittests/OCExceptionTest.cpp b/resource/unittests/OCExceptionTest.cpp
index 0e0d4a6..7ab265c 100644 (file)
--- a/resource/unittests/OCExceptionTest.cpp
+++ b/resource/unittests/OCExceptionTest.cpp
@@ -53,6 +53,7 @@ namespace OC
                 OC_STACK_NO_RESOURCE,
                 OC_STACK_RESOURCE_ERROR,
                 OC_STACK_SLOW_RESOURCE,
+                OC_STACK_DUPLICATE_REQUEST,
                 OC_STACK_NO_OBSERVERS,
                 OC_STACK_OBSERVER_NOT_FOUND,
                 OC_STACK_VIRTUAL_DO_NOT_HANDLE,
@@ -90,6 +91,7 @@ namespace OC
                 OC::Exception::NOT_FOUND,
                 OC::Exception::RESOURCE_ERROR,
                 OC::Exception::SLOW_RESOURCE,
+                OC::Exception::DUPLICATE_REQUEST,
                 OC::Exception::NO_OBSERVERS,
                 OC::Exception::OBSV_NO_FOUND,
                 OC::Exception::VIRTUAL_DO_NOT_HANDLE,