qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 06:51:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

finally get Sys_Error `right'

Browse source
This commit is contained in:
Bill Currie 2002-05-21 21:03:46 +00:00
parent 25969dbad7
commit 1b550c80b1
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libs/util/sys.c
View file

@ -194,15 +194,20 @@ Sys_Print (FILE *stream, const char *fmt, va_list args)
dvsprintf (msg, fmt, args); dvsprintf (msg, fmt, args);
if (stream == stderr) {
#ifdef WIN32 #ifdef WIN32
if (stream == stderr) MessageBox (NULL, msg->str, "Fatal Error", 0 /* MB_OK */ );
MessageBox (NULL, msg->str, "Error", 0 /* MB_OK */ );
#endif #endif
fputs ("Fatal Error: ", stream);
}
/* translate to ASCII instead of printing [xx] --KB */ /* translate to ASCII instead of printing [xx] --KB */
for (p = (unsigned char *) msg->str; *p; p++) for (p = (unsigned char *) msg->str; *p; p++)
putc (sys_char_map[*p], stream); putc (sys_char_map[*p], stream);
if (stream == stderr) {
fputs ("\n", stream);
}
fflush (stream); fflush (stream);
} }
@ -217,7 +222,6 @@ Sys_StdPrintf (const char *fmt, va_list args)
static void static void
Sys_ErrPrintf (const char *fmt, va_list args) Sys_ErrPrintf (const char *fmt, va_list args)
{ {
fprintf (stderr, "Fatal Error: ");
Sys_Print (stderr, fmt, args); Sys_Print (stderr, fmt, args);
} }
@ -291,7 +295,7 @@ Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
if (!VirtualProtect if (!VirtualProtect
((LPVOID) startaddr, length, PAGE_READWRITE, &flOldProtect)) ((LPVOID) startaddr, length, PAGE_READWRITE, &flOldProtect))
Sys_Error ("Protection change failed\n"); Sys_Error ("Protection change failed");
#else #else
# ifdef HAVE_MPROTECT # ifdef HAVE_MPROTECT
int r; int r;
@ -306,7 +310,7 @@ Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
r = mprotect ((char *) addr, length + startaddr - addr + psize, 7); r = mprotect ((char *) addr, length + startaddr - addr + psize, 7);
if (r < 0) if (r < 0)
Sys_Error ("Protection change failed\n"); Sys_Error ("Protection change failed");
# endif # endif
#endif #endif
} }
@ -358,7 +362,6 @@ Sys_Error (const char *error, ...)
va_start (argptr, error); va_start (argptr, error);
sys_err_printf_function (error, argptr); sys_err_printf_function (error, argptr);
va_end (argptr); va_end (argptr);
sys_err_printf_function ("\r\n", argptr); // FIXME is argptr ok?
Sys_Shutdown (); Sys_Shutdown ();