Fix issues detected by static analysis tool

Change-Id: I81f09b7dd49468a7ddb0b48ccd23055fed441202

diff --git a/ism/src/isf_info_manager.cpp b/ism/src/isf_info_manager.cpp
index d9de2f9..0bdb38a 100644 (file)
--- a/ism/src/isf_info_manager.cpp
+++ b/ism/src/isf_info_manager.cpp
@@ -3045,9 +3045,9 @@ public:
                 if (restart && !m_ise_exiting && m_restart_needed) {
                     struct tms     tiks_buf;
                     static clock_t start_tiks = times (&tiks_buf);
-                    static double  clock_tiks = (double)sysconf (_SC_CLK_TCK);
+                    static clock_t  clock_tiks = sysconf (_SC_CLK_TCK);
                     clock_t curr_tiks = times (&tiks_buf);
-                    double  secs = (double) (curr_tiks - start_tiks) / clock_tiks;
+                    clock_t  secs = (curr_tiks - start_tiks) / clock_tiks;
                     //LOGE ("time second:%f", secs);
                     static String  restart_uuid;
 

diff --git a/ism/src/ltdl.cpp b/ism/src/ltdl.cpp
index b4c9fb7..49db627 100644 (file)
--- a/ism/src/ltdl.cpp
+++ b/ism/src/ltdl.cpp
@@ -2601,7 +2601,7 @@ foreach_dirinpath (
      lt_ptr data2)
 {
   int   result         = 0;
-  int   filenamesize   = 0;
+  size_t filenamesize  = 0;
   size_t lenbase       = LT_STRLEN (base_name);
   size_t argz_len      = 0;
   char *argz           = 0;
@@ -2628,7 +2628,7 @@ foreach_dirinpath (
     {
       size_t lendir = LT_STRLEN (dir_name);
 
-      if ((int)(lendir +1 +lenbase) >= filenamesize)
+      if ((lendir +1 +lenbase) >= filenamesize)
       {
         LT_DLFREE (filename);
         filenamesize   = lendir +1 +lenbase +1; /* "/d" + '/' + "f" + '\0' */
@@ -2638,7 +2638,7 @@ foreach_dirinpath (
       }
 
       assert ((int)lendir > 0);
-      assert (filenamesize > (int)lendir);
+      assert (filenamesize > lendir);
       strncpy (filename, dir_name, filenamesize);
 
       if (base_name && *base_name)

diff --git a/ism/src/scim_helper.cpp b/ism/src/scim_helper.cpp
index 6960a03..bf199c2 100644 (file)
--- a/ism/src/scim_helper.cpp
+++ b/ism/src/scim_helper.cpp
@@ -2156,7 +2156,7 @@ HelperAgent::get_surrounding_text (int maxlen_before, int maxlen_after, String &
             if (maxlen_before < 0) pos = 0;
             if (pos > (int)buffer.length()) pos = (int)buffer.length();
             if (pos < 0) pos = 0;
-            size_t len = maxlen_after + (cursor - pos);
+            size_t len = (maxlen_after + (cursor - pos)) > 0 ? maxlen_after + (cursor - pos) : 0;
             if (maxlen_after < 0) len = String::npos;
             text = buffer.substr (pos, len);
         } else {