summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDees Troy <dees_troy@teamw.in>2014-04-01 20:36:37 +0200
committerGerrit Code Review <gerrit2@gerrit>2014-04-01 20:36:37 +0200
commit90a203fa93ae1a4115be4e925ed304016975c36a (patch)
treecd0b38788c95a81327d4ebfda1a44034b956afbb
parentMerge "correctly mount tmpfs as /tmp in recovery" into android-4.4 (diff)
parentCleanup DU Get_Folder_Size function (diff)
downloadandroid_bootable_recovery-90a203fa93ae1a4115be4e925ed304016975c36a.tar
android_bootable_recovery-90a203fa93ae1a4115be4e925ed304016975c36a.tar.gz
android_bootable_recovery-90a203fa93ae1a4115be4e925ed304016975c36a.tar.bz2
android_bootable_recovery-90a203fa93ae1a4115be4e925ed304016975c36a.tar.lz
android_bootable_recovery-90a203fa93ae1a4115be4e925ed304016975c36a.tar.xz
android_bootable_recovery-90a203fa93ae1a4115be4e925ed304016975c36a.tar.zst
android_bootable_recovery-90a203fa93ae1a4115be4e925ed304016975c36a.zip
-rw-r--r--twrpDU.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/twrpDU.cpp b/twrpDU.cpp
index d2345d768..3047e2b15 100644
--- a/twrpDU.cpp
+++ b/twrpDU.cpp
@@ -67,10 +67,7 @@ uint64_t twrpDU::Get_Folder_Size(const string& Path) {
DIR* d;
struct dirent* de;
struct stat st;
- unsigned long long dusize = 0;
- unsigned long long dutemp = 0;
-
- parent = Path.substr(0, Path.find_last_of('/'));
+ uint64_t dusize = 0;
d = opendir(Path.c_str());
if (d == NULL) {
@@ -79,14 +76,10 @@ uint64_t twrpDU::Get_Folder_Size(const string& Path) {
return 0;
}
- while ((de = readdir(d)) != NULL)
- {
+ while ((de = readdir(d)) != NULL) {
if (de->d_type == DT_DIR && !check_skip_dirs(Path, de->d_name)) {
- dutemp = Get_Folder_Size((Path + "/" + de->d_name));
- dusize += dutemp;
- dutemp = 0;
- }
- else if (de->d_type == DT_REG) {
+ dusize += Get_Folder_Size(Path + "/" + de->d_name);
+ } else if (de->d_type == DT_REG) {
stat((Path + "/" + de->d_name).c_str(), &st);
dusize += (uint64_t)(st.st_size);
}