Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix format-security warnings #1

Merged
merged 1 commit into from May 17, 2020
Merged

Fix format-security warnings #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/frontend_fox/CStatusComm.cpp
View file
Open in desktop
Expand Up @@ -62,40 +62,40 @@ void CStatusComm::error(const string &message,VSeverity severity,bool reformatIf
{
case none:
fprintf(stderr,"error - %s\n",message.c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Error",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Error","%s",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
break;
case light:
fprintf(stderr,"light error - %s\n",message.c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Light Error",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Light Error","%s",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
break;
case medium:
fprintf(stderr,"medium error - %s\n",message.c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Medium Error",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Medium Error","%s",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
break;
case hard:
fprintf(stderr,"hard error - %s\n",message.c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Hard Error",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Hard Error","%s",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
break;
case fatal:
fprintf(stderr,"fatal error - %s\n",message.c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Fatal Error!",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Fatal Error!","%s",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
break;
default:
fprintf(stderr,"unknwon severity error - %s\n",message.c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Error -- unknown severity",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
fprintf(stderr,"unknown severity error - %s\n",message.c_str());
FXMessageBox::error(mainWindow,MBOX_OK,"Error -- unknown severity","%s",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
break;
}
}

void CStatusComm::warning(const string &message,bool reformatIfNeeded)
{
fprintf(stderr,"warning -- %s\n",message.c_str());
FXMessageBox::warning(mainWindow,MBOX_OK,_("Warning"),escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
FXMessageBox::warning(mainWindow,MBOX_OK,_("Warning"),"%s",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
}

void CStatusComm::message(const string &message,bool reformatIfNeeded)
{
FXMessageBox::information(mainWindow,MBOX_OK,_("Note"),escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
FXMessageBox::information(mainWindow,MBOX_OK,_("Note"),"%s",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str());
}

VAnswer CStatusComm::question(const string &message,/*VQuestion*/int options,bool reformatIfNeeded)
Expand All @@ -110,7 +110,7 @@ VAnswer CStatusComm::question(const string &message,/*VQuestion*/int options,boo
if(flags==0)
flags=MBOX_OK;

switch(FXMessageBox::question(mainWindow,flags,_("Question"),escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str()))
switch(FXMessageBox::question(mainWindow,flags,_("Question"),"%s",escapeAmpersand(reformatIfNeeded ? breakIntoLines(message) : message).c_str()))
{
case MBOX_CLICKED_YES:
return(yesAns);
Expand Down