HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix message formatting string

Browse Source
This commit is contained in:
Matthew Brush 2017-08-03 22:20:40 -07:00
parent f90ebafe56
commit bc7e64f78f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sciwrappers.c
View File

@ -56,9 +56,6 @@ sptr_t sci_send_message_internal (const gchar *file, guint line, ScintillaObject
if (status != 0) if (status != 0)
{ {
static const gchar *fmt = "%s:%u: scintilla has non-zero status "
"code '%d' after sending message '%u' to instance '%p' with "
"wParam='%llu' and lParam='%llu': %s";
const gchar *sub_msg = "unknown"; const gchar *sub_msg = "unknown";
switch (status) switch (status)
{ {
@ -78,10 +75,19 @@ sptr_t sci_send_message_internal (const gchar *file, guint line, ScintillaObject
sub_msg = "unknown failure"; sub_msg = "unknown failure";
break; break;
} }
#define SCI_STATUS_FORMAT_STRING "%s:%u: scintilla has non-zero status " \
"code '%d' after sending message '%u' to instance '%p' with " \
"wParam='%lu' and lParam='%ld': %s"
if (status >= SC_STATUS_WARN_START) if (status >= SC_STATUS_WARN_START)
g_warning(fmt, file, line, status, msg, (gpointer)sci, wparam, lparam, sub_msg); {
g_warning(SCI_STATUS_FORMAT_STRING, file, line, status, msg,
(gpointer)sci, wparam, lparam, sub_msg);
}
else else
g_critical(fmt, file, line, status, msg, (gpointer)sci, wparam, lparam, sub_msg); {
g_critical(SCI_STATUS_FORMAT_STRING, file, line, status, msg,
(gpointer)sci, wparam, lparam, sub_msg);
}
} }
return result; return result;