- Use readdir instead of readdir_r
(readdir_r is now deprecated at gcc6)
- Fix wrong indentation
Change-Id: I7716823c5ecfdf001dd70bd77131ba05c1439ae6
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
if (cert_db.ref) {
if (--cert_db.ref == 0)
sqlite3_close_v2(GET_DB(cert_db));
if (cert_db.ref) {
if (--cert_db.ref == 0)
sqlite3_close_v2(GET_DB(cert_db));
}
_LOGE("Certificate DB is already closed !!\n");
return -1;
}
_LOGE("Certificate DB is already closed !!\n");
return -1;
int q = 0; /*quotient*/
int r = 0; /*remainder*/
DIR *dp = NULL;
int q = 0; /*quotient*/
int r = 0; /*remainder*/
DIR *dp = NULL;
- struct dirent ep, *result;
struct stat fileinfo;
char abs_filename[FILENAME_MAX] = { 0, };
retvm_if(dirname == NULL, PMINFO_R_ERROR, "dirname is NULL");
struct stat fileinfo;
char abs_filename[FILENAME_MAX] = { 0, };
retvm_if(dirname == NULL, PMINFO_R_ERROR, "dirname is NULL");
- 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,
continue;
}
snprintf(abs_filename, FILENAME_MAX, "%s/%s", dirname,
if (lstat(abs_filename, &fileinfo) < 0)
perror(abs_filename);
else {
if (S_ISDIR(fileinfo.st_mode)) {
total += fileinfo.st_size;
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;
ret = _pkgmgr_calculate_dir_size
(abs_filename);
total = total + ret;