From 05534209f104a435d91042fd4b816aaaae7b7b54 Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Wed, 11 Sep 2013 08:11:56 +0200 Subject: Add TWFunc::Exec_Cmd() with no 'result' agrument Signed-off-by: Vojtech Bocek Change-Id: Id8acff1ac9b3c7e4b562c80562a8ff42a1d132b9 --- partition.cpp | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'partition.cpp') diff --git a/partition.cpp b/partition.cpp index 11a4d9ec9..c1c99f6f2 100644 --- a/partition.cpp +++ b/partition.cpp @@ -684,14 +684,13 @@ bool TWPartition::Get_Size_Via_df(bool Display_Error) { char command[255], line[512]; int include_block = 1; unsigned int min_len; - string result; if (!Mount(Display_Error)) return false; min_len = Actual_Block_Device.size() + 2; sprintf(command, "df %s > /tmp/dfoutput.txt", Mount_Point.c_str()); - TWFunc::Exec_Cmd(command, result); + TWFunc::Exec_Cmd(command); fp = fopen("/tmp/dfoutput.txt", "rt"); if (fp == NULL) { LOGINFO("Unable to open /tmp/dfoutput.txt.\n"); @@ -921,9 +920,8 @@ bool TWPartition::Mount(bool Display_Error) { Update_Size(Display_Error); if (!Symlink_Mount_Point.empty()) { - string Command, Result; - Command = "mount '" + Symlink_Path + "' '" + Symlink_Mount_Point + "'"; - TWFunc::Exec_Cmd(Command, Result); + string Command = "mount '" + Symlink_Path + "' '" + Symlink_Mount_Point + "'"; + TWFunc::Exec_Cmd(Command); } return true; } @@ -1243,13 +1241,13 @@ bool TWPartition::Wipe_EXT23(string File_System) { return false; if (TWFunc::Path_Exists("/sbin/mke2fs")) { - string command, result; + string command; gui_print("Formatting %s using mke2fs...\n", Display_Name.c_str()); Find_Actual_Block_Device(); command = "mke2fs -t " + File_System + " -m 0 " + Actual_Block_Device; LOGINFO("mke2fs command: %s\n", command.c_str()); - if (TWFunc::Exec_Cmd(command, result) == 0) { + if (TWFunc::Exec_Cmd(command) == 0) { Current_File_System = File_System; Recreate_AndSec_Folder(); gui_print("Done.\n"); @@ -1278,7 +1276,7 @@ bool TWPartition::Wipe_EXT4() { } #else if (TWFunc::Path_Exists("/sbin/make_ext4fs")) { - string Command, result; + string Command; gui_print("Formatting %s using make_ext4fs...\n", Display_Name.c_str()); Find_Actual_Block_Device(); @@ -1295,7 +1293,7 @@ bool TWPartition::Wipe_EXT4() { } Command += " -a " + Mount_Point + " " + Actual_Block_Device; LOGINFO("make_ext4fs command: %s\n", Command.c_str()); - if (TWFunc::Exec_Cmd(Command, result) == 0) { + if (TWFunc::Exec_Cmd(Command) == 0) { Current_File_System = "ext4"; Recreate_AndSec_Folder(); gui_print("Done.\n"); @@ -1311,7 +1309,7 @@ bool TWPartition::Wipe_EXT4() { } bool TWPartition::Wipe_FAT() { - string command, result; + string command; if (TWFunc::Path_Exists("/sbin/mkdosfs")) { if (!UnMount(true)) @@ -1320,7 +1318,7 @@ bool TWPartition::Wipe_FAT() { gui_print("Formatting %s using mkdosfs...\n", Display_Name.c_str()); Find_Actual_Block_Device(); command = "mkdosfs " + Actual_Block_Device; - if (TWFunc::Exec_Cmd(command, result) == 0) { + if (TWFunc::Exec_Cmd(command) == 0) { Current_File_System = "vfat"; Recreate_AndSec_Folder(); gui_print("Done.\n"); @@ -1338,7 +1336,7 @@ bool TWPartition::Wipe_FAT() { } bool TWPartition::Wipe_EXFAT() { - string command, result; + string command; if (TWFunc::Path_Exists("/sbin/mkexfatfs")) { if (!UnMount(true)) @@ -1347,7 +1345,7 @@ bool TWPartition::Wipe_EXFAT() { gui_print("Formatting %s using mkexfatfs...\n", Display_Name.c_str()); Find_Actual_Block_Device(); command = "mkexfatfs " + Actual_Block_Device; - if (TWFunc::Exec_Cmd(command, result) == 0) { + if (TWFunc::Exec_Cmd(command) == 0) { Recreate_AndSec_Folder(); gui_print("Done.\n"); return true; @@ -1404,7 +1402,7 @@ bool TWPartition::Wipe_RMRF() { } bool TWPartition::Wipe_F2FS() { - string command, result; + string command; if (TWFunc::Path_Exists("/sbin/mkfs.f2fs")) { if (!UnMount(true)) @@ -1413,7 +1411,7 @@ bool TWPartition::Wipe_F2FS() { gui_print("Formatting %s using mkfs.f2fs...\n", Display_Name.c_str()); Find_Actual_Block_Device(); command = "mkfs.f2fs " + Actual_Block_Device; - if (TWFunc::Exec_Cmd(command, result) == 0) { + if (TWFunc::Exec_Cmd(command) == 0) { Recreate_AndSec_Folder(); gui_print("Done.\n"); return true; @@ -1534,7 +1532,7 @@ bool TWPartition::Backup_Tar(string backup_folder) { bool TWPartition::Backup_DD(string backup_folder) { char back_name[255], backup_size[32]; - string Full_FileName, Command, result, DD_BS; + string Full_FileName, Command, DD_BS; int use_compression; sprintf(backup_size, "%llu", Backup_Size); @@ -1550,7 +1548,7 @@ bool TWPartition::Backup_DD(string backup_folder) { Command = "dd if=" + Actual_Block_Device + " of='" + Full_FileName + "'" + " bs=" + DD_BS + "c count=1"; LOGINFO("Backup command: '%s'\n", Command.c_str()); - TWFunc::Exec_Cmd(Command, result); + TWFunc::Exec_Cmd(Command); if (TWFunc::Get_File_Size(Full_FileName) == 0) { LOGERR("Backup file size for '%s' is 0 bytes.\n", Full_FileName.c_str()); return false; @@ -1560,7 +1558,7 @@ bool TWPartition::Backup_DD(string backup_folder) { bool TWPartition::Backup_Dump_Image(string backup_folder) { char back_name[255]; - string Full_FileName, Command, result; + string Full_FileName, Command; int use_compression; TWFunc::GUI_Operation_Text(TW_BACKUP_TEXT, Display_Name, "Backing Up"); @@ -1573,7 +1571,7 @@ bool TWPartition::Backup_Dump_Image(string backup_folder) { Command = "dump_image " + MTD_Name + " '" + Full_FileName + "'"; LOGINFO("Backup command: '%s'\n", Command.c_str()); - TWFunc::Exec_Cmd(Command, result); + TWFunc::Exec_Cmd(Command); if (TWFunc::Get_File_Size(Full_FileName) == 0) { // Actual size may not match backup size due to bad blocks on MTD devices so just check for 0 bytes LOGERR("Backup file size for '%s' is 0 bytes.\n", Full_FileName.c_str()); @@ -1637,7 +1635,7 @@ bool TWPartition::Restore_Tar(string restore_folder, string Restore_File_System) } bool TWPartition::Restore_DD(string restore_folder) { - string Full_FileName, Command, result; + string Full_FileName, Command; TWFunc::GUI_Operation_Text(TW_RESTORE_TEXT, Display_Name, "Restoring"); Full_FileName = restore_folder + "/" + Backup_FileName; @@ -1657,22 +1655,22 @@ bool TWPartition::Restore_DD(string restore_folder) { gui_print("Restoring %s...\n", Display_Name.c_str()); Command = "dd bs=4096 if='" + Full_FileName + "' of=" + Actual_Block_Device; LOGINFO("Restore command: '%s'\n", Command.c_str()); - TWFunc::Exec_Cmd(Command, result); + TWFunc::Exec_Cmd(Command); return true; } bool TWPartition::Restore_Flash_Image(string restore_folder) { - string Full_FileName, Command, result; + string Full_FileName, Command; gui_print("Restoring %s...\n", Display_Name.c_str()); Full_FileName = restore_folder + "/" + Backup_FileName; // Sometimes flash image doesn't like to flash due to the first 2KB matching, so we erase first to ensure that it flashes Command = "erase_image " + MTD_Name; LOGINFO("Erase command: '%s'\n", Command.c_str()); - TWFunc::Exec_Cmd(Command, result); + TWFunc::Exec_Cmd(Command); Command = "flash_image " + MTD_Name + " '" + Full_FileName + "'"; LOGINFO("Restore command: '%s'\n", Command.c_str()); - TWFunc::Exec_Cmd(Command, result); + TWFunc::Exec_Cmd(Command); return true; } -- cgit v1.2.3