Move oops actions from log.c up to application
Change oops() to call the new oops_handler function pointer instead of offering a fixed set of actions. Change server's main() to install a handler for the action requested by -E.
This commit is contained in:
parent
6709931d51
commit
f55860670a
3 changed files with 24 additions and 24 deletions
|
@ -46,7 +46,7 @@
|
|||
#include "player.h"
|
||||
#include "prototypes.h"
|
||||
|
||||
enum oops_action oops_action = OOPS_ABORT;
|
||||
void (*oops_handler)(void) = abort;
|
||||
|
||||
static char logfile[32];
|
||||
static int logfd = -1;
|
||||
|
@ -126,24 +126,14 @@ logerror(char *format, ...)
|
|||
|
||||
/*
|
||||
* Log internal error MSG occured in FILE:LINE.
|
||||
* If debugging, call abort(), else return 1.
|
||||
* Call oops handler, and if it returns, return 1.
|
||||
* Oops handler defaults to abort().
|
||||
*/
|
||||
int
|
||||
oops(char *msg, char *file, int line)
|
||||
{
|
||||
logerror("Oops: %s in %s:%d", msg ? msg : "bug", file, line);
|
||||
switch (oops_action) {
|
||||
case OOPS_ABORT:
|
||||
abort();
|
||||
case OOPS_CRASH_DUMP:
|
||||
#ifndef _WIN32
|
||||
if (fork() == 0)
|
||||
abort();
|
||||
#endif
|
||||
/* fall through */
|
||||
case OOPS_NOTHING:
|
||||
break;
|
||||
}
|
||||
oops_handler();
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue