From: Sangyoon Jang <s89.jang@samsung.com>
Date: Wed, 23 Sep 2015 05:36:13 +0000 (+0900)
Subject: Fix clear cache
X-Git-Tag: accepted/tizen/tv/20150925.012529
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6414772071242bbf9c96e91d0c8145a90b68f692;p=platform%2Fcore%2Fappfw%2Fslp-pkgmgr.git

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 <s89.jang@samsung.com>
---

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[] =
 	"      <arg type='i' name='ret' direction='out'/>"
 	"    </method>"
 	"    <method name='clearcache'>"
-	"      <arg type='s' name='pkgtype' direction='in'/>"
 	"      <arg type='s' name='pkgid' direction='in'/>"
 	"      <arg type='i' name='ret' direction='out'/>"
 	"    </method>"
@@ -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;