Fix implementation of count_aliases.

Change-Id: If6bd7ba464e96f16693b3c0aad68240ce5394b2d

diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp
index 46c0c6b04b4a329d8ee04e46b9ed9de61d395504..f81e24f9e5c0454a9b90ccea6fd839c147e46fe2 100644 (file)
--- a/src/ckm/ckm-common.cpp
+++ b/src/ckm/ckm-common.cpp
@@ -386,37 +386,32 @@ size_t count_aliases(alias_type_ type, size_t minimum_initial_element_count)
         case ALIAS_DATA:
             ec = ckmc_get_data_alias_list(&aliasList);
             break;
+        default:
+            RUNNER_ASSERT_MSG(false, "Unsupported value ALIAS_KEY == " << (int)type);
     }
+
     if(ec == CKMC_ERROR_DB_ALIAS_UNKNOWN)
         return 0;
-    else if(ec==0)
-    {
-        ckmc_alias_list_s *plist = aliasList;
-        size_t return_count = 0;
-        while(plist)
-        {
-            plist = plist->next;
-            return_count ++;
-        }
-        ckmc_alias_list_all_free(aliasList);
 
-        RUNNER_ASSERT_MSG(
-                return_count >= minimum_initial_element_count,
-                "Error: alias list failed, current element count: " << return_count <<
-                " while expected minimal count of " << minimum_initial_element_count <<
-                " elements");
+    RUNNER_ASSERT_MSG(ec == CKMC_ERROR_NONE,
+                      "Error: alias list failed, ec: " << CKMCErrorToString(ec));
 
-        return return_count;
-    }
-    else
+    ckmc_alias_list_s *plist = aliasList;
+    size_t return_count = 0;
+    while(plist)
     {
-        // error - fail
-        RUNNER_ASSERT_MSG(
-                ec >= 0,
-                "Error: alias list failed, ec: " << CKMCErrorToString(ec));
+        plist = plist->next;
+        return_count ++;
     }
+    ckmc_alias_list_all_free(aliasList);
+
+    RUNNER_ASSERT_MSG(
+      return_count >= minimum_initial_element_count,
+      "Error: alias list failed, current element count: " << return_count <<
+      " while expected minimal count of " << minimum_initial_element_count <<
+      " elements");
 
-    return 0;
+    return return_count;
 }
 
 std::string sharedDatabase(const CKM::Alias & alias)