Refactor function parameter Null checker

Signed-off-by: Seungha Son <seungha.son@samsung.com>
Change-Id: I947621f8d47ac553c9511cdd8656794315659629

1 files changed, 8 insertions, 37 deletions

diff --git a/src/badge_internal.c b/src/badge_internal.c
index dc5058f..a097857 100755
--- a/src/badge_internal.c
+++ b/src/badge_internal.c
@@ -242,10 +242,7 @@ 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)
-		return 0;
-
-	if (!pkgname)
+	if (!caller || !pkgname)
 		return 0;
 
 	ret = package_manager_compare_package_cert_info(pkgname, caller, &compare_result);
@@ -265,13 +262,7 @@ static int _badge_check_writable(const char *caller,
 	char *sqlbuf = NULL;
 	int sqlret;
 
-	if (!db)
-		return BADGE_ERROR_INVALID_PARAMETER;
-
-	if (!caller)
-		return BADGE_ERROR_INVALID_PARAMETER;
-
-	if (!pkgname)
+	if (!db || !caller || !pkgname)
 		return BADGE_ERROR_INVALID_PARAMETER;
 
 	if (g_strcmp0(caller, pkgname) == 0)
@@ -552,10 +543,7 @@ int _badge_remove(const char *caller, const char *pkgname, uid_t uid)
 	int sqlret;
 	char *sqlbuf = NULL;
 
-	if (!caller)
-		return BADGE_ERROR_INVALID_PARAMETER;
-
-	if (!pkgname)
+	if (!caller || !pkgname)
 		return BADGE_ERROR_INVALID_PARAMETER;
 
 	sqlret = db_util_open(BADGE_DB_PATH, &db, 0);
@@ -811,10 +799,7 @@ int _badge_set_count(const char *caller, const char *pkgname,
 	char *sqlbuf = NULL;
 	int sqlret;
 
-	if (!caller)
-		return BADGE_ERROR_INVALID_PARAMETER;
-
-	if (!pkgname)
+	if (!caller || !pkgname)
 		return BADGE_ERROR_INVALID_PARAMETER;
 
 	sqlret = db_util_open(BADGE_DB_PATH, &db, 0);
@@ -878,10 +863,7 @@ int _badge_get_count(const char *pkgname, unsigned int *count, uid_t uid)
 	sqlite3_stmt *stmt = NULL;
 	int sqlret;
 
-	if (!pkgname)
-		return BADGE_ERROR_INVALID_PARAMETER;
-
-	if (!count)
+	if (!pkgname || !count)
 		return BADGE_ERROR_INVALID_PARAMETER;
 
 	sqlret = db_util_open(BADGE_DB_PATH, &db, 0);
@@ -1044,10 +1026,7 @@ int _badge_get_display(const char *pkgname, unsigned int *is_display, uid_t uid)
 	sqlite3_stmt *stmt = NULL;
 	int sqlret;
 
-	if (!pkgname)
-		return BADGE_ERROR_INVALID_PARAMETER;
-
-	if (!is_display)
+	if (!pkgname || !is_display)
 		return BADGE_ERROR_INVALID_PARAMETER;
 
 	sqlret = db_util_open(BADGE_DB_PATH, &db, 0);
@@ -1202,21 +1181,13 @@ badge_h *_badge_new(const char *pkgname, const char *writable_pkgs,
 {
 	badge_h *badge = NULL;
 
-	if (!pkgname) {
-		ERR("PKGNAME is NULL");
+	if (!pkgname || !writable_pkgs) {
+		ERR("Invalid parameters");
 		if (err)
 			*err = BADGE_ERROR_INVALID_PARAMETER;
 		return NULL;
 	}
 
-	if (!writable_pkgs) {
-		ERR("writable_pkgs is NULL");
-		if (err)
-			*err = BADGE_ERROR_INVALID_PARAMETER;
-		return NULL;
-	}
-
-
 	badge = (badge_h *)malloc(sizeof(struct _badge_h));
 	if (!badge) {
 		ERR("fail to alloc handle");