Hide some non critical error messages (d9ff3c5d) · Commits · e / tools / etwrp

gui/action.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1363,7 +1363,7 @@ int GUIAction::decrypt(std::string arg)
		DataManager::GetValue(TW_HAS_DATA_MEDIA, has_datamedia);
		if (has_datamedia != 0) {
		if (tw_get_default_metadata(DataManager::GetSettingsStoragePath().c_str()) != 0) {
		LOGERR("Failed to get default contexts and file mode for storage files.\n");
		LOGINFO("Failed to get default contexts and file mode for storage files.\n");
		} else {
		LOGINFO("Got default contexts and file mode for storage files.\n");
		}

partitionmanager.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -2028,7 +2028,7 @@ bool TWPartitionManager::Add_Remove_MTP_Storage(TWPartition* Part, int message_t
		return false; // MTP is disabled

		if (mtp_write_fd < 0) {
		LOGERR("MTP: mtp_write_fd is not set\n");
		LOGINFO("MTP: mtp_write_fd is not set\n");
		return false;
		}

		@@ -2040,7 +2040,7 @@ bool TWPartitionManager::Add_Remove_MTP_Storage(TWPartition* Part, int message_t
		LOGINFO("sending message to remove %i\n", Part->MTP_Storage_ID);
		mtp_message.storage_id = Part->MTP_Storage_ID;
		if (write(mtp_write_fd, &mtp_message, sizeof(mtp_message)) <= 0) {
		LOGERR("error sending message to remove storage %i\n", Part->MTP_Storage_ID);
		LOGINFO("error sending message to remove storage %i\n", Part->MTP_Storage_ID);
		return false;
		} else {
		LOGINFO("Message sent, remove storage ID: %i\n", Part->MTP_Storage_ID);
		@@ -2054,7 +2054,7 @@ bool TWPartitionManager::Add_Remove_MTP_Storage(TWPartition* Part, int message_t
		mtp_message.maxFileSize = Part->Get_Max_FileSize();
		LOGINFO("sending message to add %i '%s'\n", Part->MTP_Storage_ID, mtp_message.path);
		if (write(mtp_write_fd, &mtp_message, sizeof(mtp_message)) <= 0) {
		LOGERR("error sending message to add storage %i\n", Part->MTP_Storage_ID);
		LOGINFO("error sending message to add storage %i\n", Part->MTP_Storage_ID);
		return false;
		} else {
		LOGINFO("Message sent, add storage ID: %i\n", Part->MTP_Storage_ID);
		@@ -2066,7 +2066,7 @@ bool TWPartitionManager::Add_Remove_MTP_Storage(TWPartition* Part, int message_t
		} else {
		// This hopefully never happens as the error handling should
		// occur in the calling function.
		LOGERR("TWPartitionManager::Add_Remove_MTP_Storage NULL partition given\n");
		LOGINFO("TWPartitionManager::Add_Remove_MTP_Storage NULL partition given\n");
		}
		return true;
		#else
		@@ -2082,7 +2082,7 @@ bool TWPartitionManager::Add_MTP_Storage(string Mount_Point) {
		if (Part) {
		return PartitionManager.Add_Remove_MTP_Storage(Part, MTP_MESSAGE_ADD_STORAGE);
		} else {
		LOGERR("TWFunc::Add_MTP_Storage unable to locate partition for '%s'\n", Mount_Point.c_str());
		LOGINFO("TWFunc::Add_MTP_Storage unable to locate partition for '%s'\n", Mount_Point.c_str());
		}
		#endif
		return false;
		@@ -2094,7 +2094,7 @@ bool TWPartitionManager::Add_MTP_Storage(unsigned int Storage_ID) {
		if (Part) {
		return PartitionManager.Add_Remove_MTP_Storage(Part, MTP_MESSAGE_ADD_STORAGE);
		} else {
		LOGERR("TWFunc::Add_MTP_Storage unable to locate partition for %i\n", Storage_ID);
		LOGINFO("TWFunc::Add_MTP_Storage unable to locate partition for %i\n", Storage_ID);
		}
		#endif
		return false;
		@@ -2106,7 +2106,7 @@ bool TWPartitionManager::Remove_MTP_Storage(string Mount_Point) {
		if (Part) {
		return PartitionManager.Add_Remove_MTP_Storage(Part, MTP_MESSAGE_REMOVE_STORAGE);
		} else {
		LOGERR("TWFunc::Remove_MTP_Storage unable to locate partition for '%s'\n", Mount_Point.c_str());
		LOGINFO("TWFunc::Remove_MTP_Storage unable to locate partition for '%s'\n", Mount_Point.c_str());
		}
		#endif
		return false;
		@@ -2118,7 +2118,7 @@ bool TWPartitionManager::Remove_MTP_Storage(unsigned int Storage_ID) {
		if (Part) {
		return PartitionManager.Add_Remove_MTP_Storage(Part, MTP_MESSAGE_REMOVE_STORAGE);
		} else {
		LOGERR("TWFunc::Remove_MTP_Storage unable to locate partition for %i\n", Storage_ID);
		LOGINFO("TWFunc::Remove_MTP_Storage unable to locate partition for %i\n", Storage_ID);
		}
		#endif
		return false;

set_metadata.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ int tw_get_context(const char* filename) {
		printf("tw_get_context got selinux context: %s\n", selinux_context);
		return 0;
		} else {
		printf("tw_get_context failed to get selinux context");
		printf("tw_get_context failed to get selinux context\n");
		selinux_context = NULL;
		}
		return -1;

twrp.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ int main(int argc, char **argv) {
		}
		} else if (datamedia) {
		if (tw_get_default_metadata(DataManager::GetSettingsStoragePath().c_str()) != 0) {
		LOGERR("Failed to get default contexts and file mode for storage files.\n");
		LOGINFO("Failed to get default contexts and file mode for storage files.\n");
		} else {
		LOGINFO("Got default contexts and file mode for storage files.\n");
		}