From: Son seungha Date: Mon, 29 May 2017 01:24:30 +0000 (+0000) Subject: Revert "Pass pid as a function paramter" X-Git-Tag: accepted/tizen/unified/20170607.063212~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55d4ff8bc0f8d8849c44bd3c0fe420136cc2f01b;p=platform%2Fcore%2Fappfw%2Fdata-provider-master.git Revert "Pass pid as a function paramter" This reverts commit 0fdc2f28fa869887e9eb49430849cbacaf4323c0. Change-Id: Ic91395f078fcfc7911d88c118b19edb9846d7c25 --- diff --git a/include/badge_service.h b/include/badge_service.h index 6428739..3bbc725 100755 --- a/include/badge_service.h +++ b/include/badge_service.h @@ -23,8 +23,8 @@ extern int badge_service_fini(void); int badge_get_badge_existing(GVariant *parameters, GVariant **reply_body, uid_t uid); int badge_get_badge_list(GVariant *parameters, GVariant **reply_body, uid_t uid); int badge_insert(GVariant *parameters, GVariant **reply_body, uid_t uid); -int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t pid); -int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t pid); +int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid); +int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid); int badge_get_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid); int badge_set_display_option(GVariant *parameters, GVariant **reply_body, uid_t uid); int badge_get_display_option(GVariant *parameters, GVariant **reply_body, const gchar *sender, uid_t uid); diff --git a/src/badge_service.c b/src/badge_service.c index eec1691..69ecfca 100755 --- a/src/badge_service.c +++ b/src/badge_service.c @@ -70,7 +70,6 @@ static void _badge_dbus_method_call_handler(GDBusConnection *conn, GVariant *reply_body = NULL; int ret = BADGE_ERROR_INVALID_PARAMETER; uid_t uid = get_sender_uid(sender); - pid_t pid = get_sender_pid(sender); if (g_strcmp0(method_name, "badge_service_register") == 0) ret = service_register(parameters, &reply_body, sender, @@ -82,9 +81,9 @@ static void _badge_dbus_method_call_handler(GDBusConnection *conn, else if (g_strcmp0(method_name, "insert_badge") == 0) ret = badge_insert(parameters, &reply_body, uid); else if (g_strcmp0(method_name, "delete_badge") == 0) - ret = badge_delete(parameters, &reply_body, uid, pid); + ret = badge_delete(parameters, &reply_body, uid); else if (g_strcmp0(method_name, "set_badge_count") == 0) - ret = badge_set_badge_count(parameters, &reply_body, uid, pid); + ret = badge_set_badge_count(parameters, &reply_body, uid); else if (g_strcmp0(method_name, "get_badge_count") == 0) ret = badge_get_badge_count(parameters, &reply_body, uid); else if (g_strcmp0(method_name, "set_disp_option") == 0) @@ -376,7 +375,7 @@ int badge_insert(GVariant *parameters, GVariant **reply_body, uid_t uid) } /* delete_badge */ -int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t pid) +int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid) { int ret = BADGE_ERROR_NONE; char *pkgname = NULL; @@ -390,10 +389,11 @@ int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t p if (ret != BADGE_ERROR_NONE) return ret; - if (pkgname != NULL && caller != NULL) - ret = badge_db_delete(pkgname, caller, param_uid, pid); - else + if (pkgname != NULL && caller != NULL) { + ret = badge_db_delete(pkgname, caller, param_uid); + } else { return BADGE_ERROR_INVALID_PARAMETER; + } if (ret != BADGE_ERROR_NONE) { ErrPrint("failed to delete badge :%d\n", ret); @@ -426,7 +426,7 @@ int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t p } /* set_badge_count */ -int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t pid) +int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid) { int ret = BADGE_ERROR_NONE; char *pkgname = NULL; @@ -447,7 +447,7 @@ int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid badge_setting_refresh_setting_table(tzplatform_getuid(TZ_SYS_DEFAULT_USER)); need_to_reload_pkginfo_for_badge = 0; } - ret = badge_db_set_count(pkgname, caller, count, param_uid, pid); + ret = badge_db_set_count(pkgname, caller, count, param_uid); } else { return BADGE_ERROR_INVALID_PARAMETER; }