Apply coding rule 05/56105/3
authorjusung son <jusung07.son@samsung.com>
Mon, 4 Jan 2016 10:17:12 +0000 (19:17 +0900)
committerjusung son <jusung07.son@samsung.com>
Tue, 5 Jan 2016 04:34:22 +0000 (13:34 +0900)
Change-Id: I0db7e1f54a580fdcf18f78c63656dfd5aa835ce2
Signed-off-by: jusung son <jusung07.son@samsung.com>
src/badge.c
src/badge_db.c
src/badge_internal.c
src/badge_ipc.c
src/badge_setting.c

index 23f676b..3ee7ce5 100755 (executable)
@@ -36,9 +36,9 @@ int badge_create(const char *pkgname, const char *writable_pkg)
        char *caller = NULL;
        int err = BADGE_ERROR_NONE;
 
-       if (pkgname == NULL) {
+       if (pkgname == NULL)
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
+
 
        caller = _badge_get_pkgname_by_pid();
        if (!caller) {
@@ -111,9 +111,8 @@ int badge_remove(const char *app_id)
        int result = BADGE_ERROR_NONE;
        bool existing = false;
 
-       if (app_id == NULL) {
+       if (app_id == NULL)
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
 
        result = _badge_is_existing(app_id, &existing);
 
@@ -169,9 +168,8 @@ int badge_set_count(const char *app_id, unsigned int count)
        int result = BADGE_ERROR_NONE;
        bool existing = false;
 
-       if (app_id == NULL) {
+       if (app_id == NULL)
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
 
        result = _badge_is_existing(app_id, &existing);
 
@@ -213,9 +211,8 @@ int badge_set_display(const char *app_id, unsigned int is_display)
        int result = BADGE_ERROR_NONE;
        bool existing = false;
 
-       if (app_id == NULL) {
+       if (app_id == NULL)
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
 
        result = _badge_is_existing(app_id, &existing);
 
@@ -254,9 +251,8 @@ int badge_get_display(const char *app_id, unsigned int *is_display)
 EXPORT_API
 int badge_register_changed_cb(badge_change_cb callback, void *data)
 {
-       if (callback == NULL) {
+       if (callback == NULL)
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
 
        return _badge_register_changed_cb(callback, data);
 }
@@ -264,9 +260,8 @@ int badge_register_changed_cb(badge_change_cb callback, void *data)
 EXPORT_API
 int badge_unregister_changed_cb(badge_change_cb callback)
 {
-       if (callback == NULL) {
+       if (callback == NULL)
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
 
        return _badge_unregister_changed_cb(callback);
 }
index 03c1c6e..84d9bc6 100755 (executable)
@@ -105,12 +105,11 @@ int badge_db_exec(sqlite3 * db, const char *query, int *num_changes)
        int ret = 0;
        sqlite3_stmt *stmt = NULL;
 
-       if (db == NULL) {
+       if (db == NULL)
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
-       if (query == NULL) {
+
+       if (query == NULL)
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
 
        ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL);
        if (ret != SQLITE_OK) {
@@ -122,9 +121,9 @@ int badge_db_exec(sqlite3 * db, const char *query, int *num_changes)
        if (stmt != NULL) {
                ret = sqlite3_step(stmt);
                if (ret == SQLITE_OK || ret == SQLITE_DONE) {
-                       if (num_changes != NULL) {
+                       if (num_changes != NULL)
                                *num_changes = sqlite3_changes(db);
-                       }
+
                        sqlite3_finalize(stmt);
                } else {
                        ERR("DB err(%d) : %s", ret,
index 4b1c2cc..4aad0f2 100755 (executable)
@@ -231,18 +231,16 @@ static int _is_same_certinfo(const char *caller, const char *pkgname)
        int ret = PACKAGE_MANAGER_ERROR_NONE;
        package_manager_compare_result_type_e compare_result = PACKAGE_MANAGER_COMPARE_MISMATCH;
 
-       if (!caller) {
+       if (!caller)
                return 0;
-       }
-       if (!pkgname) {
+
+       if (!pkgname)
                return 0;
-       }
 
        ret = package_manager_compare_package_cert_info(pkgname, caller, &compare_result);
        if (ret == PACKAGE_MANAGER_ERROR_NONE &&
-               compare_result == PACKAGE_MANAGER_COMPARE_MATCH) {
+               compare_result == PACKAGE_MANAGER_COMPARE_MATCH)
                return 1;
-       }
 
        return 0;
 }
@@ -268,9 +266,8 @@ static int _badge_check_writable(const char *caller,
        if (g_strcmp0(caller, pkgname) == 0)
                return BADGE_ERROR_NONE;
 
-       if (_is_same_certinfo(caller, pkgname) == 1) {
+       if (_is_same_certinfo(caller, pkgname) == 1)
                return BADGE_ERROR_NONE;
-       }
 
        sqlbuf = sqlite3_mprintf("SELECT COUNT(*) FROM %q WHERE " \
                         "pkgname = %Q AND writable_pkgs LIKE '%%%q%%'",
@@ -353,6 +350,8 @@ int _badge_foreach_existed(badge_foreach_cb callback, void *data)
        char *sqlbuf = NULL;
        sqlite3_stmt *stmt = NULL;
        int sqlret;
+       const char *pkg;
+       unsigned int badge_count;
 
        if (!callback)
                return BADGE_ERROR_INVALID_PARAMETER;
@@ -385,9 +384,6 @@ int _badge_foreach_existed(badge_foreach_cb callback, void *data)
                result = BADGE_ERROR_NOT_EXIST;
                goto free_and_return;
        } else if (sqlret == SQLITE_ROW) {
-               const char *pkg = NULL;
-               unsigned int badge_count = 0;
-
                pkg = (const char *)sqlite3_column_text(stmt, 0);
                badge_count = (unsigned int)sqlite3_column_int(stmt, 1);
 
@@ -402,13 +398,9 @@ int _badge_foreach_existed(badge_foreach_cb callback, void *data)
        }
 
        while (sqlite3_step(stmt) == SQLITE_ROW) {
-               const char *pkg = NULL;
-               unsigned int badge_count = 0;
-
                pkg = (const char *)sqlite3_column_text(stmt, 0);
                badge_count = (unsigned int)sqlite3_column_int(stmt, 1);
 
-
                if (pkg)
                        callback(pkg, badge_count, data);
                else
@@ -673,11 +665,10 @@ int _badget_get_count(const char *pkgname, unsigned int *count)
        sqlret = db_util_open(BADGE_DB_PATH, &db, 0);
        if (sqlret != SQLITE_OK || !db) {
                ERR("fail to db_util_open - [%d]", sqlret);
-               if (sqlret == SQLITE_PERM) {
+               if (sqlret == SQLITE_PERM)
                        return BADGE_ERROR_PERMISSION_DENIED;
-               } else {
+               else
                        return BADGE_ERROR_FROM_DB;
-               }
        }
 
        ret = _badge_check_data_inserted(pkgname, db);
@@ -817,18 +808,17 @@ int _badget_get_display(const char *pkgname, unsigned int *is_display)
        sqlret = db_util_open(BADGE_DB_PATH, &db, 0);
        if (sqlret != SQLITE_OK || !db) {
                ERR("fail to db_util_open - [%d]", sqlret);
-               if (sqlret == SQLITE_PERM) {
+               if (sqlret == SQLITE_PERM)
                        return BADGE_ERROR_PERMISSION_DENIED;
-               } else {
+               else
                        return BADGE_ERROR_FROM_DB;
-               }
        }
 
        ret = _badge_check_option_inserted(pkgname, db);
        if (ret != BADGE_ERROR_ALREADY_EXIST) {
-               if (ret == BADGE_ERROR_NOT_EXIST) {
+               if (ret == BADGE_ERROR_NOT_EXIST)
                        *is_display = 1;
-               }
+
                result = ret;
                goto return_close_db;
        }
@@ -874,9 +864,10 @@ void badge_changed_cb_call(unsigned int action, const char *pkgname,
                        unsigned int count)
 {
        GList *list = g_badge_cb_list;
+       struct _badge_cb_data *bd = NULL;
 
        while (list) {
-               struct _badge_cb_data *bd = g_list_nth_data(list, 0);
+               bd = g_list_nth_data(list, 0);
                if (!bd)
                        continue;
 
@@ -945,6 +936,7 @@ int _badge_register_changed_cb(badge_change_cb callback, void *data)
 int _badge_unregister_changed_cb(badge_change_cb callback)
 {
        GList *found = NULL;
+       struct _badge_cb_data *bd = NULL;
 
        if (!callback)
                return BADGE_ERROR_INVALID_PARAMETER;
@@ -953,7 +945,7 @@ int _badge_unregister_changed_cb(badge_change_cb callback)
                                _badge_data_compare);
 
        if (found) {
-               struct _badge_cb_data *bd = g_list_nth_data(found, 0);
+               bd = g_list_nth_data(found, 0);
                g_badge_cb_list = g_list_delete_link(g_badge_cb_list, found);
                free(bd);
        }
@@ -961,11 +953,11 @@ int _badge_unregister_changed_cb(badge_change_cb callback)
        if (!g_badge_cb_list)
                _badge_chanaged_monitor_fini();
 
-       if (found != NULL) {
+       if (found != NULL)
                return BADGE_ERROR_NONE;
-       } else {
+       else
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
+
 }
 
 int _badge_free(badge_h *badge)
@@ -1028,6 +1020,7 @@ char *_badge_pkgs_new(int *err, const char *pkg1, ...)
        char *ptr = NULL;
        gsize length;
        va_list args;
+       char *new_pkgs = NULL;
 
 
        if (err)
@@ -1080,7 +1073,6 @@ char *_badge_pkgs_new(int *err, const char *pkg1, ...)
        va_end(args);
 
        if (g_strstr_len(result, -1, caller_pkgname) == NULL) {
-               char *new_pkgs = NULL;
                new_pkgs = g_strdup_printf("%s%s", caller_pkgname, result);
                if (!new_pkgs) {
                        ERR("fail to alloc memory");
@@ -1108,6 +1100,7 @@ char *_badge_pkgs_new_valist(int *err, const char *pkg1, va_list args)
        char *ptr = NULL;
        gsize length;
        va_list args2;
+       char *new_pkgs = NULL;
 
        if (err)
                *err = BADGE_ERROR_NONE;
@@ -1160,7 +1153,6 @@ char *_badge_pkgs_new_valist(int *err, const char *pkg1, va_list args)
        va_end(args2);
 
        if (g_strstr_len(result, -1, caller_pkgname) == NULL) {
-               char *new_pkgs = NULL;
                new_pkgs = g_strdup_printf("%s%s", caller_pkgname, result);
                if (!new_pkgs) {
                        ERR("fail to alloc memory");
index 3b95277..5e44de5 100755 (executable)
@@ -84,24 +84,18 @@ static inline void _set_master_started_cb(vconf_callback_fn cb)
 {
        int ret = -1;
 
-       ret = vconf_notify_key_changed(VCONFKEY_MASTER_STARTED,
-                       cb, NULL);
-       if (ret != 0) {
-               ERR("failed to notify key(%s) : %d",
-                               VCONFKEY_MASTER_STARTED, ret);
-       }
+       ret = vconf_notify_key_changed(VCONFKEY_MASTER_STARTED, cb, NULL);
+       if (ret != 0)
+               ERR("failed to notify key(%s) : %d", VCONFKEY_MASTER_STARTED, ret);
 }
 
 static inline void _unset_master_started_cb(vconf_callback_fn cb)
 {
        int ret = -1;
 
-       ret = vconf_ignore_key_changed(VCONFKEY_MASTER_STARTED,
-                       cb);
-       if (ret != 0) {
-               ERR("failed to notify key(%s) : %d",
-                               VCONFKEY_MASTER_STARTED, ret);
-       }
+       ret = vconf_ignore_key_changed(VCONFKEY_MASTER_STARTED, cb);
+       if (ret != 0)
+               ERR("failed to notify key(%s) : %d", VCONFKEY_MASTER_STARTED, ret);
 }
 
 int badge_ipc_is_master_ready(void)
@@ -126,12 +120,10 @@ int badge_ipc_add_deferred_task(
        task_list *list = NULL;
        task_list *list_new = NULL;
 
-       list_new =
-           (task_list *) malloc(sizeof(task_list));
+       list_new = (task_list *) malloc(sizeof(task_list));
 
-       if (list_new == NULL) {
+       if (list_new == NULL)
                return BADGE_ERROR_OUT_OF_MEMORY;
-       }
 
        if (s_info.is_started_cb_set_task == 0) {
                _set_master_started_cb(_master_started_cb_task);
@@ -149,9 +141,8 @@ int badge_ipc_add_deferred_task(
        } else {
                list = g_task_list;
 
-               while (list->next != NULL) {
+               while (list->next != NULL)
                        list = list->next;
-               }
 
                list->next = list_new;
                list_new->prev = list;
@@ -159,8 +150,7 @@ int badge_ipc_add_deferred_task(
        return BADGE_ERROR_NONE;
 }
 
-int
-badge_ipc_del_deferred_task(
+int badge_ipc_del_deferred_task(
                void (*badge_add_deferred_task)(void *data))
 {
        task_list *list_del = NULL;
@@ -169,29 +159,26 @@ badge_ipc_del_deferred_task(
 
        list_del = g_task_list;
 
-       if (list_del == NULL) {
+       if (list_del == NULL)
                return BADGE_ERROR_INVALID_PARAMETER;
-       }
 
-       while (list_del->prev != NULL) {
+       while (list_del->prev != NULL)
                list_del = list_del->prev;
-       }
 
        do {
                if (list_del->task_cb == badge_add_deferred_task) {
                        list_prev = list_del->prev;
                        list_next = list_del->next;
 
-                       if (list_prev == NULL) {
+                       if (list_prev == NULL)
                                g_task_list = list_next;
-                       } else {
+                       else
                                list_prev->next = list_next;
-                       }
 
                        if (list_next == NULL) {
-                               if (list_prev != NULL) {
+                               if (list_prev != NULL)
                                        list_prev->next = NULL;
-                               }
+
                        } else {
                                list_next->prev = list_prev;
                        }
@@ -218,9 +205,8 @@ static void _do_deferred_task(void)
        task_list *list_do = NULL;
        task_list *list_temp = NULL;
 
-       if (g_task_list == NULL) {
+       if (g_task_list == NULL)
                return;
-       }
 
        list_do = g_task_list;
        g_task_list = NULL;
@@ -229,9 +215,8 @@ static void _do_deferred_task(void)
                s_info.is_started_cb_set_task = 0;
        }
 
-       while (list_do->prev != NULL) {
+       while (list_do->prev != NULL)
                list_do = list_do->prev;
-       }
 
        while (list_do != NULL) {
                if (list_do->task_cb != NULL) {
@@ -244,36 +229,33 @@ static void _do_deferred_task(void)
        }
 }
 
-static void _master_started_cb_service(keynode_t *node,
-               void *data)
+static void _master_started_cb_service(keynode_t *node, void *data)
 {
        int ret = BADGE_ERROR_NONE;
 
        if (badge_ipc_is_master_ready()) {
                ERR("try to register a badge service");
                ret = badge_ipc_monitor_deregister();
-               if (ret != BADGE_ERROR_NONE) {
+               if (ret != BADGE_ERROR_NONE)
                        ERR("failed to deregister a monitor");
-               }
+
                ret = badge_ipc_monitor_register();
-               if (ret != BADGE_ERROR_NONE) {
+               if (ret != BADGE_ERROR_NONE)
                        ERR("failed to register a monitor");
-               }
+
        } else {
                ERR("try to unregister a badge service");
                ret = badge_ipc_monitor_deregister();
-               if (ret != BADGE_ERROR_NONE) {
+               if (ret != BADGE_ERROR_NONE)
                        ERR("failed to deregister a monitor");
-               }
+
        }
 }
 
-static void _master_started_cb_task(keynode_t *node,
-               void *data)
+static void _master_started_cb_task(keynode_t *node, void *data)
 {
-       if (badge_ipc_is_master_ready()) {
+       if (badge_ipc_is_master_ready())
                _do_deferred_task();
-       }
 }
 
 /*!
@@ -291,13 +273,13 @@ static struct packet *_handler_insert_badge(pid_t pid, int handle, const struct
 
        DBG("");
 
-       //return code, pkgname
+       /* return code, pkgname */
        if (packet_get(packet, "is", &ret, &pkgname) == 2) {
-               if (ret == BADGE_ERROR_NONE) {
+               if (ret == BADGE_ERROR_NONE)
                        badge_changed_cb_call(BADGE_ACTION_CREATE, pkgname, 0);
-               } else {
+               else
                        ERR("failed to insert a new badge:%d", ret);
-               }
+
        } else {
                ERR("failed to get data from a packet");
        }
@@ -318,11 +300,11 @@ static struct packet *_handler_delete_badge(pid_t pid, int handle, const struct
        DBG("");
 
        if (packet_get(packet, "is", &ret, &pkgname) == 2) {
-               if (ret == BADGE_ERROR_NONE) {
+               if (ret == BADGE_ERROR_NONE)
                        badge_changed_cb_call(BADGE_ACTION_REMOVE, pkgname, 0);
-               } else {
+               else
                        ERR("failed to remove a badge:%d", ret);
-               }
+
        } else {
                ERR("failed to get data from a packet");
        }
@@ -344,11 +326,11 @@ static struct packet *_handler_set_badge_count(pid_t pid, int handle, const stru
        DBG("");
 
        if (packet_get(packet, "isi", &ret, &pkgname, &count) == 3) {
-               if (ret == BADGE_ERROR_NONE) {
+               if (ret == BADGE_ERROR_NONE)
                        badge_changed_cb_call(BADGE_ACTION_UPDATE, pkgname, count);
-               } else {
+               else
                        ERR("failed to update count of badge:%d", ret);
-               }
+
        } else {
                ERR("failed to get data from a packet");
        }
@@ -370,11 +352,11 @@ static struct packet *_handler_set_display_option(pid_t pid, int handle, const s
        DBG("");
 
        if (packet_get(packet, "isi", &ret, &pkgname, &is_display) == 3) {
-               if (ret == BADGE_ERROR_NONE) {
+               if (ret == BADGE_ERROR_NONE)
                        badge_changed_cb_call(BADGE_ACTION_CHANGED_DISPLAY, pkgname, is_display);
-               } else {
+               else
                        ERR("failed to update the display option of badge:%d, %d", ret, is_display);
-               }
+
        } else {
                ERR("failed to get data from a packet");
        }
@@ -395,9 +377,9 @@ static int _handler_service_register(pid_t pid, int handle, const struct packet
                ERR("Packet is not valid\n");
                ret = BADGE_ERROR_INVALID_PARAMETER;
        } else {
-               if (ret == BADGE_ERROR_NONE) {
+               if (ret == BADGE_ERROR_NONE)
                        badge_changed_cb_call(BADGE_ACTION_SERVICE_READY, NULL, 0);
-               }
+
        }
        return ret;
 }
@@ -432,11 +414,10 @@ static int badge_ipc_monitor_register(void)
                },
        };
 
-       if (s_info.initialized == 1) {
+       if (s_info.initialized == 1)
                return BADGE_ERROR_NONE;
-       } else {
+       else
                s_info.initialized = 1;
-       }
 
        ERR("register a service\n");
        com_core_packet_use_thread(1);
@@ -470,9 +451,8 @@ static int badge_ipc_monitor_register(void)
 
 int badge_ipc_monitor_deregister(void)
 {
-       if (s_info.initialized == 0) {
+       if (s_info.initialized == 0)
                return BADGE_ERROR_NONE;
-       }
 
        com_core_packet_client_fini(s_info.server_fd);
        s_info.server_fd = BADGE_ERROR_INVALID_PARAMETER;
@@ -486,9 +466,8 @@ int badge_ipc_monitor_init(void)
 {
        int ret = BADGE_ERROR_NONE;
 
-       if (badge_ipc_is_master_ready()) {
+       if (badge_ipc_is_master_ready())
                ret = badge_ipc_monitor_register();
-       }
 
        if (s_info.is_started_cb_set_svc == 0) {
                _set_master_started_cb(_master_started_cb_service);
@@ -538,11 +517,10 @@ int badge_ipc_request_insert(const char *pkgname, const char *writable_pkg, cons
                }
                packet_unref(result);
        } else {
-               if (badge_ipc_is_master_ready() == 1) {
+               if (badge_ipc_is_master_ready() == 1)
                        return BADGE_ERROR_PERMISSION_DENIED;
-               } else {
+               else
                        return BADGE_ERROR_SERVICE_NOT_READY;
-               }
        }
 
        return BADGE_ERROR_NONE;
@@ -573,11 +551,10 @@ int badge_ipc_request_delete(const char *pkgname, const char *caller)
                }
                packet_unref(result);
        } else {
-               if (badge_ipc_is_master_ready() == 1) {
+               if (badge_ipc_is_master_ready() == 1)
                        return BADGE_ERROR_PERMISSION_DENIED;
-               } else {
+               else
                        return BADGE_ERROR_SERVICE_NOT_READY;
-               }
        }
 
        return BADGE_ERROR_NONE;
@@ -608,11 +585,10 @@ int badge_ipc_request_set_count(const char *pkgname, const char *caller, int cou
                }
                packet_unref(result);
        } else {
-               if (badge_ipc_is_master_ready() == 1) {
+               if (badge_ipc_is_master_ready() == 1)
                        return BADGE_ERROR_PERMISSION_DENIED;
-               } else {
+               else
                        return BADGE_ERROR_SERVICE_NOT_READY;
-               }
        }
 
        return BADGE_ERROR_NONE;
@@ -643,11 +619,10 @@ int badge_ipc_request_set_display(const char *pkgname, const char *caller, int d
                }
                packet_unref(result);
        } else {
-               if (badge_ipc_is_master_ready() == 1) {
+               if (badge_ipc_is_master_ready() == 1)
                        return BADGE_ERROR_PERMISSION_DENIED;
-               } else {
+               else
                        return BADGE_ERROR_SERVICE_NOT_READY;
-               }
        }
 
        return BADGE_ERROR_NONE;
@@ -700,9 +675,9 @@ int badge_ipc_setting_property_get(const char *pkgname, const char *property, ch
                        packet_unref(result);
                        return BADGE_ERROR_IO_ERROR;
                }
-               if (status == BADGE_ERROR_NONE && ret != NULL) {
+               if (status == BADGE_ERROR_NONE && ret != NULL)
                        *value = strdup(ret);
-               }
+
                packet_unref(result);
        } else {
                ERR("failed to receive answer(delete)");
index fa92b74..39969e5 100755 (executable)
@@ -209,6 +209,8 @@ EXPORT_API int badge_setting_db_get(const char *pkgname, const char *property, c
        sqlite3_stmt *stmt = NULL;
        int sqlret;
        const char *column = NULL;
+       int get_bytes;
+       char *get_data;
 
        if (!pkgname)
                return BADGE_ERROR_INVALID_PARAMETER;
@@ -254,8 +256,8 @@ EXPORT_API int badge_setting_db_get(const char *pkgname, const char *property, c
 
        sqlret = sqlite3_step(stmt);
        if (sqlret == SQLITE_ROW) {
-               int get_bytes = sqlite3_column_bytes(stmt, 0);
-               char *get_data = (char *)calloc(get_bytes + 1, sizeof(char));
+               get_bytes = sqlite3_column_bytes(stmt, 0);
+               get_data = (char *)calloc(get_bytes + 1, sizeof(char));
                if (get_data != NULL) {
                        memcpy(get_data, sqlite3_column_text(stmt, 0),
                                        get_bytes * sizeof(char));
@@ -296,9 +298,8 @@ EXPORT_API int badge_setting_property_set(const char *pkgname, const char *prope
                return BADGE_ERROR_INVALID_PARAMETER;
 
        ret = badge_ipc_setting_property_set(pkgname, property, value);
-       if (ret != BADGE_ERROR_NONE) {
+       if (ret != BADGE_ERROR_NONE)
                return ret;
-       }
 
        return BADGE_ERROR_NONE;
 }
@@ -317,9 +318,8 @@ EXPORT_API int badge_setting_property_get(const char *pkgname, const char *prope
                return BADGE_ERROR_INVALID_PARAMETER;
 
        ret = badge_ipc_setting_property_get(pkgname, property, value);
-       if (ret != BADGE_ERROR_NONE) {
+       if (ret != BADGE_ERROR_NONE)
                return ret;
-       }
 
        return BADGE_ERROR_NONE;
 }