X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpkgmgrinfo_pkginfo.c;h=053193053b1385e7e8f51fed670bfcfe1e263f81;hb=b457d5162f7a3e078dc8331a3b463dbba4926ae2;hp=ae1073c01bc33a790afeca66a2812bbd35bc5775;hpb=4b14f3c19a648c23d83168479fbb2b070a0f3be8;p=platform%2Fcore%2Fappfw%2Fpkgmgr-info.git

diff --git a/src/pkgmgrinfo_pkginfo.c b/src/pkgmgrinfo_pkginfo.c
index ae1073c..0531930 100644
--- a/src/pkgmgrinfo_pkginfo.c
+++ b/src/pkgmgrinfo_pkginfo.c
@@ -117,7 +117,7 @@ long long _pkgmgr_calculate_dir_size(char *dirname)
 	int q = 0; /*quotient*/
 	int r = 0; /*remainder*/
 	DIR *dp = NULL;
-	struct dirent ep, *result;
+	struct dirent *ep;
 	struct stat fileinfo;
 	char abs_filename[FILENAME_MAX] = { 0, };
 	retvm_if(dirname == NULL, PMINFO_R_ERROR, "dirname is NULL");
@@ -128,22 +128,20 @@ long long _pkgmgr_calculate_dir_size(char *dirname)
 		return -1;
 	}
 
-	for (ret = readdir_r(dp, &ep, &result);
-			ret == 0 && result != NULL;
-			ret = readdir_r(dp, &ep, &result)) {
-		if (!strcmp(ep.d_name, ".") ||
-			!strcmp(ep.d_name, "..")) {
+	for (ep = readdir(dp); ep != NULL; ep = readdir(dp)) {
+		if (!strcmp(ep->d_name, ".") ||
+			!strcmp(ep->d_name, "..")) {
 			continue;
 		}
 		snprintf(abs_filename, FILENAME_MAX, "%s/%s", dirname,
-			 ep.d_name);
+			 ep->d_name);
 		if (lstat(abs_filename, &fileinfo) < 0)
 			perror(abs_filename);
 		else {
 			if (S_ISDIR(fileinfo.st_mode)) {
 				total += fileinfo.st_size;
-				if (strcmp(ep.d_name, ".")
-				    && strcmp(ep.d_name, "..")) {
+				if (strcmp(ep->d_name, ".")
+				    && strcmp(ep->d_name, "..")) {
 					ret = _pkgmgr_calculate_dir_size
 					    (abs_filename);
 					total = total + ret;
@@ -376,7 +374,7 @@ static int _pkginfo_get_packages(uid_t uid, const char *locale,
 	author_x *author = NULL;
 	GList *bind_params = NULL;
 	sqlite3 *db;
-	sqlite3_stmt *stmt;
+	sqlite3_stmt *stmt = NULL;
 	pkgmgrinfo_filter_x *tmp_filter = NULL;
 	bool is_check_storage = true;
 
@@ -570,7 +568,8 @@ catch:
 
 	g_list_free_full(bind_params, free);
 	sqlite3_close_v2(db);
-	sqlite3_finalize(stmt);
+	if (stmt)
+		sqlite3_finalize(stmt);
 
 	return ret;
 }