80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Some indentation changes in 86box.c and added a fatal_ex() function.

Browse Source
This commit is contained in:
OBattler
2021-06-07 00:15:09 +02:00
parent f0da82fa2b
commit 63a5c3a281
1 changed files with 74 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/86box.c
View File

@@ -208,34 +208,32 @@ void
pclog_ex(const char *fmt, va_list ap) pclog_ex(const char *fmt, va_list ap)
{ {
#ifndef RELEASE_BUILD #ifndef RELEASE_BUILD
char temp[1024]; char temp[1024];
if (strcmp(fmt, "") == 0) if (strcmp(fmt, "") == 0)
return; return;
if (stdlog == NULL) { if (stdlog == NULL) {
if (log_path[0] != '\0') { if (log_path[0] != '\0') {
stdlog = plat_fopen(log_path, "w"); stdlog = plat_fopen(log_path, "w");
if (stdlog == NULL) if (stdlog == NULL)
stdlog = stdout; stdlog = stdout;
} else { } else
stdlog = stdout; stdlog = stdout;
} }
}
vsprintf(temp, fmt, ap); vsprintf(temp, fmt, ap);
if (suppr_seen && ! strcmp(buff, temp)) { if (suppr_seen && ! strcmp(buff, temp))
seen++; seen++;
} else { else {
if (suppr_seen && seen) { if (suppr_seen && seen)
fprintf(stdlog, "*** %d repeats ***\n", seen); fprintf(stdlog, "*** %d repeats ***\n", seen);
}
seen = 0; seen = 0;
strcpy(buff, temp); strcpy(buff, temp);
fprintf(stdlog, temp, ap); fprintf(stdlog, "%s", temp);
} }
fflush(stdlog); fflush(stdlog);
#endif #endif
} }
@@ -267,47 +265,86 @@ pclog(const char *fmt, ...)
void void
fatal(const char *fmt, ...) fatal(const char *fmt, ...)
{ {
char temp[1024]; char temp[1024];
va_list ap; va_list ap;
char *sp; char *sp;
va_start(ap, fmt); va_start(ap, fmt);
if (stdlog == NULL) { if (stdlog == NULL) {
if (log_path[0] != '\0') { if (log_path[0] != '\0') {
stdlog = plat_fopen(log_path, "w"); stdlog = plat_fopen(log_path, "w");
if (stdlog == NULL) if (stdlog == NULL)
stdlog = stdout; stdlog = stdout;
} else { } else
stdlog = stdout; stdlog = stdout;
} }
}
vsprintf(temp, fmt, ap); vsprintf(temp, fmt, ap);
fprintf(stdlog, "%s", temp); fprintf(stdlog, "%s", temp);
fflush(stdlog); fflush(stdlog);
va_end(ap); va_end(ap);
nvr_save(); nvr_save();
config_save(); config_save();
#ifdef ENABLE_808X_LOG #ifdef ENABLE_808X_LOG
dumpregs(1); dumpregs(1);
#endif #endif
/* Make sure the message does not have a trailing newline. */ /* Make sure the message does not have a trailing newline. */
if ((sp = strchr(temp, '\n')) != NULL) *sp = '\0'; if ((sp = strchr(temp, '\n')) != NULL) *sp = '\0';
/* Cleanly terminate all of the emulator's components so as /* Cleanly terminate all of the emulator's components so as
to avoid things like threads getting stuck. */ to avoid things like threads getting stuck. */
do_stop(); do_stop();
ui_msgbox(MBX_ERROR | MBX_FATAL | MBX_ANSI, temp); ui_msgbox(MBX_ERROR | MBX_FATAL | MBX_ANSI, temp);
fflush(stdlog); fflush(stdlog);
exit(-1); exit(-1);
}
void
fatal_ex(const char *fmt, va_list ap)
{
char temp[1024];
char *sp;
if (stdlog == NULL) {
if (log_path[0] != '\0') {
stdlog = plat_fopen(log_path, "w");
if (stdlog == NULL)
stdlog = stdout;
} else
stdlog = stdout;
}
vsprintf(temp, fmt, ap);
fprintf(stdlog, "%s", temp);
fflush(stdlog);
nvr_save();
config_save();
#ifdef ENABLE_808X_LOG
dumpregs(1);
#endif
/* Make sure the message does not have a trailing newline. */
if ((sp = strchr(temp, '\n')) != NULL) *sp = '\0';
/* Cleanly terminate all of the emulator's components so as
to avoid things like threads getting stuck. */
do_stop();
ui_msgbox(MBX_ERROR | MBX_FATAL | MBX_ANSI, temp);
fflush(stdlog);
} }