From 9a299e569b3aee6f2369cdc90c72b10bcf22d87a Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Wed, 23 Sep 2015 14:36:13 +0900 Subject: [PATCH] Fix clear cache fix return value of pkgmgr_client_usr_clear_cache_dir in case of invalid parameter fix dbus method parameter type of clear cache request Change-Id: I70c1059c6661761497bada49423dc89bd6d575e1 Signed-off-by: Sangyoon Jang --- client/src/pkgmgr.c | 2 +- server/src/request.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/client/src/pkgmgr.c b/client/src/pkgmgr.c index 100b52a..d9e0b81 100644 --- a/client/src/pkgmgr.c +++ b/client/src/pkgmgr.c @@ -1422,7 +1422,7 @@ API int pkgmgr_client_usr_clear_cache_dir(const char *pkgid, uid_t uid) if (pkgid == NULL) { ERR("invalid parameter"); - return PMINFO_R_EINVAL; + return PKGMGR_R_EINVAL; } pc = pkgmgr_client_new(PC_REQUEST); diff --git a/server/src/request.c b/server/src/request.c index f6a79d3..114edab 100644 --- a/server/src/request.c +++ b/server/src/request.c @@ -65,7 +65,6 @@ static const char instropection_xml[] = " " " " " " - " " " " " " " " @@ -348,18 +347,17 @@ static int __handle_request_cleardata(uid_t uid, static int __handle_request_clearcache(uid_t uid, GDBusMethodInvocation *invocation, GVariant *parameters) { - char *pkgtype; char *pkgid; - g_variant_get(parameters, "(&s&s)", &pkgtype, &pkgid); - if (pkgtype == NULL || pkgid == NULL) { + g_variant_get(parameters, "(&s)", &pkgid); + if (pkgid == NULL) { g_dbus_method_invocation_return_value(invocation, g_variant_new("(i)", PKGMGR_R_ECOMM)); return -1; } - if (_pm_queue_push(uid, "", PKGMGR_REQUEST_TYPE_CLEARCACHE, pkgtype, - pkgid, "")) { + if (_pm_queue_push(uid, "", PKGMGR_REQUEST_TYPE_CLEARCACHE, + "clearcache", pkgid, "")) { g_dbus_method_invocation_return_value(invocation, g_variant_new("(i)", PKGMGR_R_ESYSTEM)); return -1; -- 2.7.4