projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6fa9aef
)
Omit timestamp and thread id in the mingw32 message box.
author
Fabian Keil
<fk@fabiankeil.de>
Sat, 7 Mar 2009 11:34:36 +0000
(11:34 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Sat, 7 Mar 2009 11:34:36 +0000
(11:34 +0000)
errlog.c
patch
|
blob
|
history
diff --git
a/errlog.c
b/errlog.c
index
9131987
..
ae943f6
100644
(file)
--- a/
errlog.c
+++ b/
errlog.c
@@
-1,4
+1,4
@@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.8
6 2009/02/09 21:21:15
fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.8
7 2009/03/01 18:28:24
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@
-33,6
+33,10
@@
const char errlog_rcs[] = "$Id: errlog.c,v 1.86 2009/02/09 21:21:15 fabiankeil E
*
* Revisions :
* $Log: errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.87 2009/03/01 18:28:24 fabiankeil
+ * Help clang understand that we aren't dereferencing
+ * NULL pointers here.
+ *
* Revision 1.86 2009/02/09 21:21:15 fabiankeil
* Now that init_log_module() is called earlier, call show_version()
* later on from main() directly so it doesn't get called for --help
* Revision 1.86 2009/02/09 21:21:15 fabiankeil
* Now that init_log_module() is called earlier, call show_version()
* later on from main() directly so it doesn't get called for --help
@@
-513,8
+517,8
@@
static inline void unlock_loginit() {}
* Function : fatal_error
*
* Description : Displays a fatal error to standard error (or, on
* Function : fatal_error
*
* Description : Displays a fatal error to standard error (or, on
- * a WIN32 GUI, to a dialog box), and exits
- *
JunkBuster
with status code 1.
+ * a WIN32 GUI, to a dialog box), and exits
Privoxy
+ * with status code 1.
*
* Parameters :
* 1 : error_message = The error message to display.
*
* Parameters :
* 1 : error_message = The error message to display.
@@
-522,10
+526,17
@@
static inline void unlock_loginit() {}
* Returns : Does not return.
*
*********************************************************************/
* Returns : Does not return.
*
*********************************************************************/
-static void fatal_error(const char *
error_message)
+static void fatal_error(const char *error_message)
{
#if defined(_WIN32) && !defined(_WIN_CONSOLE)
{
#if defined(_WIN32) && !defined(_WIN_CONSOLE)
- MessageBox(g_hwndLogFrame, error_message, "Privoxy Error",
+ /* Skip timestamp and thread id for the message box. */
+ const char *box_message = strstr(error_message, "Fatal error");
+ if (NULL == box_message)
+ {
+ /* Shouldn't happen but ... */
+ box_message = error_message;
+ }
+ MessageBox(g_hwndLogFrame, box_message, "Privoxy Error",
MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);
/* Cleanup - remove taskbar icon etc. */
MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);
/* Cleanup - remove taskbar icon etc. */