[Svace] fix svace issues

update files to fix svace issues

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/api/capi/src/nnstreamer-capi-pipeline.c b/api/capi/src/nnstreamer-capi-pipeline.c
index 9bbe065..296158e 100644 (file)
--- a/api/capi/src/nnstreamer-capi-pipeline.c
+++ b/api/capi/src/nnstreamer-capi-pipeline.c
@@ -406,6 +406,7 @@ ml_pipeline_construct (const char *pipeline_description, ml_pipeline_h * pipe)
         case GST_ITERATOR_ERROR:
           ml_logw
               ("There is an error or a resync-event while inspecting a pipeline. However, we can still execute the pipeline.");
+          /* fallthrough */
         case GST_ITERATOR_DONE:
           done = TRUE;
       }

diff --git a/gst/nnstreamer/tensor_filter/tensor_filter.c b/gst/nnstreamer/tensor_filter/tensor_filter.c
index 5d4f501..e5168be 100644 (file)
--- a/gst/nnstreamer/tensor_filter/tensor_filter.c
+++ b/gst/nnstreamer/tensor_filter/tensor_filter.c
@@ -1091,53 +1091,51 @@ static void
 gst_tensor_filter_compare_tensors (GstTensorsInfo * info1,
     GstTensorsInfo * info2)
 {
-  gchar null[] = "";
-  gchar *result = null;
-  gchar *dimstr = NULL;
-  int i;
+  gchar *result = NULL;
+  gchar *line, *tmp, *left, *right;
+  guint i;
 
   for (i = 0; i < NNS_TENSOR_SIZE_LIMIT; i++) {
-    gchar *line, *tmp;
-    gchar *left = NULL, *right = NULL;
-
     if (info1->num_tensors <= i && info2->num_tensors <= i)
       break;
 
     if (info1->num_tensors > i) {
-      dimstr = gst_tensor_get_dimension_string (info1->info[i].dimension);
+      tmp = gst_tensor_get_dimension_string (info1->info[i].dimension);
       left = g_strdup_printf ("%s [%s]",
-          gst_tensor_get_type_string (info1->info[i].type), dimstr);
-      g_free (dimstr);
+          gst_tensor_get_type_string (info1->info[i].type), tmp);
+      g_free (tmp);
     } else {
-      left = null;
+      left = g_strdup ("None");
     }
 
     if (info2->num_tensors > i) {
-      dimstr = gst_tensor_get_dimension_string (info2->info[i].dimension);
+      tmp = gst_tensor_get_dimension_string (info2->info[i].dimension);
       right = g_strdup_printf ("%s [%s]",
-          gst_tensor_get_type_string (info2->info[i].type), dimstr);
-      g_free (dimstr);
+          gst_tensor_get_type_string (info2->info[i].type), tmp);
+      g_free (tmp);
     } else {
-      right = null;
+      right = g_strdup ("None");
     }
 
     line =
         g_strdup_printf ("%2d : %s | %s %s\n", i, left, right,
-        !strcmp (left, right) ? "" : "FAILED");
-    if (left && left[0] != '\0')
-      g_free (left);
-    if (right && right[0] != '\0')
-      g_free (right);
+        g_str_equal (left, right) ? "" : "FAILED");
 
-    tmp = g_strdup_printf ("%s%s", result, line);
+    g_free (left);
+    g_free (right);
 
-    if (result[0] != '\0')
+    if (result) {
+      tmp = g_strdup_printf ("%s%s", result, line);
       g_free (result);
-    result = tmp;
-    g_free (line);
+      g_free (line);
+
+      result = tmp;
+    } else {
+      result = line;
+    }
   }
 
-  if (result != null) {
+  if (result) {
     /* print warning message */
     g_warning ("Tensor info :\n%s", result);
     g_free (result);

diff --git a/tests/common/unittest_common.cpp b/tests/common/unittest_common.cpp
index 6603f1d..6122d27 100644 (file)
--- a/tests/common/unittest_common.cpp
+++ b/tests/common/unittest_common.cpp
@@ -502,11 +502,11 @@ TEST (conf_custom, env_str_01)
   const gchar *base_confenv;
   gchar *confenv;
 
+  ASSERT_TRUE (fp != NULL);
+
   base_confenv = g_getenv ("NNSTREAMER_CONF");
   confenv = (base_confenv != NULL) ? g_strdup (base_confenv) : NULL;
 
-  ASSERT_TRUE (fp != NULL);
-
   g_fprintf (fp, "[common]\n");
   g_fprintf (fp, "enable_envvar=True\n");
   g_fprintf (fp, "[filter]\n");