PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some compiler warnings

Browse Source 
Change-Id: I23c490e6228b0fcf656c76ac314c69508ba2329d
This commit is contained in:
that
2014-09-21 23:13:02 +02:00
committed by Dees Troy
parent 78d0c5fc25
commit d43bf2dc77
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
partition.cpp
View File

@@ -864,7 +864,7 @@ bool TWPartition::Find_Partition_Size(void) {
char label[32], device[32];
unsigned long size = 0;
sscanf(line, "%s %lx %*lx %*lu %s", label, &size, device);
sscanf(line, "%s %lx %*x %*u %s", label, &size, device);
// Skip header, annotation and blank lines
if ((strncmp(device, "/dev/", 5) != 0) || (strlen(line) < 8))
@@ -1391,13 +1391,13 @@ string TWPartition::Get_Restore_File_System(string restore_folder) {
first_period = Backup_FileName.find(".");
if (first_period == string::npos) {
LOGERR("Unable to find file system (first period).\n");
return false;
return string();
}
Restore_File_System = Backup_FileName.substr(first_period + 1, Backup_FileName.size() - first_period - 1);
second_period = Restore_File_System.find(".");
if (second_period == string::npos) {
LOGERR("Unable to find file system (second period).\n");
return false;
return string();
}
Restore_File_System.resize(second_period);
LOGINFO("Restore file system is: '%s'.\n", Restore_File_System.c_str());

2
twrp-functions.cpp
View File

@@ -66,7 +66,7 @@ int TWFunc::Exec_Cmd(const string& cmd, string &result) {
memset(&buffer, 0, sizeof(buffer));
if (fgets(buffer, 128, exec) != NULL) {
buffer[128] = '\n';
buffer[129] = NULL;
buffer[129] = 0;
result += buffer;
}
}