Corrected signed/unsigned integer comparison warnings.

The return value of the ftell() function was assigned to an unsigned
integer typed variable and then compared to -1.  Since ftell() actually
returns a 'long' assign to a 'long' instead.  This addresses
signed/unsigned integer comparison warnings.

Change-Id: I990e891ee2ad1f81cd0721ad82646fcf2e79d2b0
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4689
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c
index 36ef460..16104df 100644 (file)
--- a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c
+++ b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c
@@ -1633,7 +1633,7 @@ bool read_file(const char* name, char** bytes, size_t* length)
 
     FILE* file;
     char* buffer;
-    size_t fileLen;
+    long fileLen;
 
     // Open file
     file = fopen(name, "rt");
@@ -1654,7 +1654,7 @@ bool read_file(const char* name, char** bytes, size_t* length)
     }
     fseek(file, 0, SEEK_SET);
 
-    LOGI("file size: %d", fileLen);
+    LOGI("file size: %ld", fileLen);
 
     // Allocate memory
     buffer = calloc(1, sizeof(char) * fileLen + 1);

diff --git a/resource/csdk/connectivity/samples/linux/sample_main.c b/resource/csdk/connectivity/samples/linux/sample_main.c
index 392c5bf..c3ef1b2 100644 (file)
--- a/resource/csdk/connectivity/samples/linux/sample_main.c
+++ b/resource/csdk/connectivity/samples/linux/sample_main.c
@@ -1601,7 +1601,7 @@ bool read_file(const char* name, CAPayload_t* bytes, size_t* length)
 
     FILE* file = NULL;
     CAPayload_t buffer = NULL;
-    unsigned long fileLen = 0;
+    long fileLen = 0;
 
     // Open file
     file = fopen(name, "rb");