Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 029a82db authored by Matt Mower's avatar Matt Mower Committed by Dees Troy
Browse files

Very minor code cleanup 

Change-Id: Ie0b97da2cce7bb93307ed49b1138bc2f36df34d0
parent a8a89d19

gui/action.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1874,9 +1874,8 @@ int GUIAction::setbootslot(std::string arg) 
{

	operation_start("Set Boot Slot");

	if (!simulate)

	{

		PartitionManager.Set_Active_Slot(arg);

	} else

	else

		simulate_progress_bar();

	operation_end(0);

	return 0;

partition.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2331,7 +2331,7 @@ bool TWPartition::Raw_Read_Write(PartitionSettings *part_settings) { 
			goto exit;

		}

		backedup_size += (unsigned long long)(bs);

		Remain = Remain - (unsigned long long)(bs);

		Remain -= (unsigned long long)(bs);

		if (part_settings->progress)

			part_settings->progress->UpdateSize(backedup_size);

		if (PartitionManager.Check_Backup_Cancel() != 0)
@@ -2398,9 +2398,9 @@ unsigned long long TWPartition::Get_Restore_Size(PartitionSettings *part_setting 
		}

	}



	string Full_FileName, Restore_File_System = Get_Restore_File_System(part_settings);

	string Full_FileName = part_settings->Backup_Folder + "/" + Backup_FileName;

	string Restore_File_System = Get_Restore_File_System(part_settings);



	Full_FileName = part_settings->Backup_Folder + "/" + Backup_FileName;

	if (Is_Image(Restore_File_System)) {

		Restore_Size = TWFunc::Get_File_Size(Full_FileName);

		return Restore_Size;

partitionmanager.cpp

+2 −4
Original line number Diff line number Diff line
@@ -362,8 +362,7 @@ void TWPartitionManager::Output_Partition(TWPartition* Part) { 
		printf("   Format_Block_Size: %lu\n", Part->Format_Block_Size);

	if (!Part->MTD_Name.empty())

		printf("   MTD_Name: %s\n", Part->MTD_Name.c_str());

	string back_meth = Part->Backup_Method_By_Name();

	printf("   Backup_Method: %s\n", back_meth.c_str());

	printf("   Backup_Method: %s\n", Part->Backup_Method_By_Name().c_str());

	if (Part->Mount_Flags || !Part->Mount_Options.empty())

		printf("   Mount_Options: %s\n", Part->Mount_Options.c_str());

	if (Part->MTP_Storage_ID)
@@ -584,9 +583,8 @@ bool TWPartitionManager::Backup_Partition(PartitionSettings *part_settings) { 


	if (part_settings->Part->Backup(part_settings, &tar_fork_pid)) {

		bool md5Success = false;

		if (part_settings->adbbackup) {

		if (part_settings->adbbackup)

			md5Success = true;

		}

		else

			md5Success = Make_MD5(part_settings);