ProfessionalUwU/SDRPlusPlus
1
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-09-20 04:52:36 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #615 from hewittc/format-security

Browse Source 
Satisfy GCC -Wformat-security with string literals
This commit is contained in:
AlexandreRouma 2022-01-26 13:29:32 +01:00 committed by GitHub
commit e158eabbf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/gui/menus/module_manager.cpp
View File

@ -43,10 +43,10 @@ namespace module_manager_menu {
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);
ImGui::Text(name.c_str());
ImGui::TextUnformatted(name.c_str());
ImGui::TableSetColumnIndex(1);
ImGui::Text(inst.module.info->name);
ImGui::TextUnformatted(inst.module.info->name);
ImGui::TableSetColumnIndex(2);
ImVec2 origPos = ImGui::GetCursorPos();
@ -69,7 +69,7 @@ namespace module_manager_menu {
}
ImGui::GenericDialog("module_mgr_error_", errorOpen, GENERIC_DIALOG_BUTTONS_OK, []() {
ImGui::Text(errorMessage.c_str());
ImGui::TextUnformatted(errorMessage.c_str());
});
// Add module row with slightly different settings
@ -114,4 +114,4 @@ namespace module_manager_menu {
core::configManager.release(true);
}
}
}
}

4
core/src/gui/menus/vfo_color.cpp
View File

@ -129,8 +129,8 @@ namespace vfo_color_menu {
core::configManager.release(true);
}
ImGui::SameLine();
ImGui::Text(name.c_str());
ImGui::TextUnformatted(name.c_str());
}
ImGui::EndTable();
}
}
}

4
core/src/gui/style.cpp
View File

@ -49,7 +49,7 @@ namespace ImGui {
void LeftLabel(const char* text) {
float vpos = ImGui::GetCursorPosY();
ImGui::SetCursorPosY(vpos + GImGui->Style.FramePadding.y);
ImGui::Text(text);
ImGui::TextUnformatted(text);
ImGui::SameLine();
ImGui::SetCursorPosY(vpos);
}
@ -57,4 +57,4 @@ namespace ImGui {
void FillWidth() {
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth());
}
}
}

2
core/src/gui/widgets/waterfall.cpp
View File

@ -433,7 +433,7 @@ namespace ImGui {
char buf[128];
ImGui::BeginTooltip();
ImGui::Text(name.c_str());
ImGui::TextUnformatted(name.c_str());
if (ImGui::IsKeyDown(GLFW_KEY_LEFT_CONTROL) || ImGui::IsKeyDown(GLFW_KEY_RIGHT_CONTROL)) {
ImGui::Separator();

6
decoder_modules/m17_decoder/src/main.cpp
View File

@ -193,19 +193,19 @@ private:
ImGui::TableSetColumnIndex(0);
ImGui::Text("Source");
ImGui::TableSetColumnIndex(1);
ImGui::Text(_this->lsf.src.c_str());
ImGui::TextUnformatted(_this->lsf.src.c_str());
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);
ImGui::Text("Destination");
ImGui::TableSetColumnIndex(1);
ImGui::Text(_this->lsf.dst.c_str());
ImGui::TextUnformatted(_this->lsf.dst.c_str());
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);
ImGui::Text("Data Type");
ImGui::TableSetColumnIndex(1);
ImGui::Text(M17DataTypesTxt[_this->lsf.dataType]);
ImGui::TextUnformatted(M17DataTypesTxt[_this->lsf.dataType]);
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);

4
misc_modules/frequency_manager/src/main.cpp
View File

@ -738,7 +738,7 @@ private:
}
ImGui::BeginTooltip();
ImGui::Text(hoveredBookmarkName.c_str());
ImGui::TextUnformatted(hoveredBookmarkName.c_str());
ImGui::Separator();
ImGui::Text("List: %s", hoveredBookmark.listName.c_str());
ImGui::Text("Frequency: %s", utils::formatFreq(hoveredBookmark.bookmark.frequency).c_str());
@ -863,4 +863,4 @@ MOD_EXPORT void _DELETE_INSTANCE_(void* instance) {
MOD_EXPORT void _END_() {
config.disableAutoSave();
config.save();
}
}