godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove uses of `vformat()` with no placeholders 

This is identical to passing the string directly.

(cherry picked from commit dcc92c174e)
This commit is contained in:
Hugo Locurcio 2023-06-28 16:27:55 +02:00 committed by Yuri Sizov
parent a084f0568f
commit e32330473a
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/unix/os_unix.cpp
View File

@ -315,7 +315,7 @@ Dictionary OS_Unix::get_memory_info() const {
mach_msg_type_number_t count = HOST_VM_INFO64_COUNT; mach_msg_type_number_t count = HOST_VM_INFO64_COUNT;
vm_statistics64_data_t vmstat; vm_statistics64_data_t vmstat;
if (host_statistics64(mach_host_self(), HOST_VM_INFO64, (host_info64_t)&vmstat, &count) != KERN_SUCCESS) { if (host_statistics64(mach_host_self(), HOST_VM_INFO64, (host_info64_t)&vmstat, &count) != KERN_SUCCESS) {
ERR_PRINT(vformat("Could not get host vm statistics.")); ERR_PRINT("Could not get host vm statistics.");
} }
struct xsw_usage swap_used; struct xsw_usage swap_used;
len = sizeof(swap_used); len = sizeof(swap_used);

22
platform/macos/export/codesign.cpp
View File

@ -1211,7 +1211,7 @@ Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const
// Read Info.plist. // Read Info.plist.
if (!p_info.is_empty()) { if (!p_info.is_empty()) {
print_verbose(vformat("CodeSign: Reading bundle info...")); print_verbose("CodeSign: Reading bundle info...");
PList info_plist; PList info_plist;
if (info_plist.load_file(p_info)) { if (info_plist.load_file(p_info)) {
info_hash1 = file_hash_sha1(p_info); info_hash1 = file_hash_sha1(p_info);
@ -1262,7 +1262,7 @@ Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const
} }
} }
} else if (MachO::is_macho(main_exe)) { } else if (MachO::is_macho(main_exe)) {
print_verbose(vformat("CodeSign: Executable is thin...")); print_verbose("CodeSign: Executable is thin...");
files_to_sign.push_back(main_exe); files_to_sign.push_back(main_exe);
} else { } else {
r_error_msg = TTR("Invalid binary format."); r_error_msg = TTR("Invalid binary format.");
@ -1284,7 +1284,7 @@ Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const
// Generate core resources. // Generate core resources.
if (!p_bundle_path.is_empty()) { if (!p_bundle_path.is_empty()) {
print_verbose(vformat("CodeSign: Generating bundle CodeResources...")); print_verbose("CodeSign: Generating bundle CodeResources...");
CodeSignCodeResources cr; CodeSignCodeResources cr;
if (p_ios_bundle) { if (p_ios_bundle) {
@ -1366,7 +1366,7 @@ Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const
CharString uuid_str = id.utf8(); CharString uuid_str = id.utf8();
print_verbose(vformat("CodeSign: Used bundle ID: %s", id)); print_verbose(vformat("CodeSign: Used bundle ID: %s", id));
print_verbose(vformat("CodeSign: Processing entitlements...")); print_verbose("CodeSign: Processing entitlements...");
Ref<CodeSignEntitlementsText> cet; Ref<CodeSignEntitlementsText> cet;
Ref<CodeSignEntitlementsBinary> ceb; Ref<CodeSignEntitlementsBinary> ceb;
@ -1381,7 +1381,7 @@ Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const
ceb = Ref<CodeSignEntitlementsBinary>(memnew(CodeSignEntitlementsBinary(entitlements))); ceb = Ref<CodeSignEntitlementsBinary>(memnew(CodeSignEntitlementsBinary(entitlements)));
} }
print_verbose(vformat("CodeSign: Generating requirements...")); print_verbose("CodeSign: Generating requirements...");
Ref<CodeSignRequirements> rq; Ref<CodeSignRequirements> rq;
String team_id = ""; String team_id = "";
rq = Ref<CodeSignRequirements>(memnew(CodeSignRequirements())); rq = Ref<CodeSignRequirements>(memnew(CodeSignRequirements()));
@ -1396,10 +1396,10 @@ Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const
} }
print_verbose(vformat("CodeSign: Signing executable for cputype: %d ...", mh.get_cputype())); print_verbose(vformat("CodeSign: Signing executable for cputype: %d ...", mh.get_cputype()));
print_verbose(vformat("CodeSign: Generating CodeDirectory...")); print_verbose("CodeSign: Generating CodeDirectory...");
Ref<CodeSignCodeDirectory> cd1 = memnew(CodeSignCodeDirectory(0x14, 0x01, true, uuid_str, team_id.utf8(), 12, mh.get_exe_limit(), mh.get_code_limit())); Ref<CodeSignCodeDirectory> cd1 = memnew(CodeSignCodeDirectory(0x14, 0x01, true, uuid_str, team_id.utf8(), 12, mh.get_exe_limit(), mh.get_code_limit()));
Ref<CodeSignCodeDirectory> cd2 = memnew(CodeSignCodeDirectory(0x20, 0x02, true, uuid_str, team_id.utf8(), 12, mh.get_exe_limit(), mh.get_code_limit())); Ref<CodeSignCodeDirectory> cd2 = memnew(CodeSignCodeDirectory(0x20, 0x02, true, uuid_str, team_id.utf8(), 12, mh.get_exe_limit(), mh.get_code_limit()));
print_verbose(vformat("CodeSign: Calculating special slot hashes...")); print_verbose("CodeSign: Calculating special slot hashes...");
if (info_hash2.size() == 0x20) { if (info_hash2.size() == 0x20) {
cd2->set_hash_in_slot(info_hash2, CodeSignCodeDirectory::SLOT_INFO_PLIST); cd2->set_hash_in_slot(info_hash2, CodeSignCodeDirectory::SLOT_INFO_PLIST);
} }
@ -1444,7 +1444,7 @@ Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const
ERR_FAIL_V_MSG(FAILED, "CodeSign: Can't resize signature load command."); ERR_FAIL_V_MSG(FAILED, "CodeSign: Can't resize signature load command.");
} }
print_verbose(vformat("CodeSign: Calculating executable code hashes...")); print_verbose("CodeSign: Calculating executable code hashes...");
// Calculate executable code hashes. // Calculate executable code hashes.
PackedByteArray buffer; PackedByteArray buffer;
PackedByteArray hash1, hash2; PackedByteArray hash1, hash2;
@ -1481,11 +1481,11 @@ Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const
cd1->set_hash_in_slot(hash1, cd1->get_page_count()); cd1->set_hash_in_slot(hash1, cd1->get_page_count());
} }
print_verbose(vformat("CodeSign: Generating signature...")); print_verbose("CodeSign: Generating signature...");
Ref<CodeSignSignature> cs; Ref<CodeSignSignature> cs;
cs = Ref<CodeSignSignature>(memnew(CodeSignSignature())); cs = Ref<CodeSignSignature>(memnew(CodeSignSignature()));
print_verbose(vformat("CodeSign: Writing signature superblob...")); print_verbose("CodeSign: Writing signature superblob...");
// Write signature data to the executable. // Write signature data to the executable.
CodeSignSuperBlob sb = CodeSignSuperBlob(); CodeSignSuperBlob sb = CodeSignSuperBlob();
sb.add_blob(cd2); sb.add_blob(cd2);
@ -1502,7 +1502,7 @@ Error CodeSign::_codesign_file(bool p_use_hardened_runtime, bool p_force, const
sb.write_to_file(mh.get_file()); sb.write_to_file(mh.get_file());
} }
if (files_to_sign.size() > 1) { if (files_to_sign.size() > 1) {
print_verbose(vformat("CodeSign: Rebuilding fat executable...")); print_verbose("CodeSign: Rebuilding fat executable...");
LipO lip; LipO lip;
if (!lip.create_file(main_exe, files_to_sign)) { if (!lip.create_file(main_exe, files_to_sign)) {
CLEANUP(); CLEANUP();

4
scene/resources/visual_shader.cpp
View File

@ -4854,7 +4854,7 @@ VisualShaderNodeVarying::VisualShaderNodeVarying() {
////////////// Varying Setter ////////////// Varying Setter
String VisualShaderNodeVaryingSetter::get_caption() const { String VisualShaderNodeVaryingSetter::get_caption() const {
return vformat("VaryingSetter"); return "VaryingSetter";
} }
int VisualShaderNodeVaryingSetter::get_input_port_count() const { int VisualShaderNodeVaryingSetter::get_input_port_count() const {
@ -4896,7 +4896,7 @@ VisualShaderNodeVaryingSetter::VisualShaderNodeVaryingSetter() {
////////////// Varying Getter ////////////// Varying Getter
String VisualShaderNodeVaryingGetter::get_caption() const { String VisualShaderNodeVaryingGetter::get_caption() const {
return vformat("VaryingGetter"); return "VaryingGetter";
} }
int VisualShaderNodeVaryingGetter::get_input_port_count() const { int VisualShaderNodeVaryingGetter::get_input_port_count() const {