libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 17:46:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Turned back all fprintf/exit(1) bits into error()

Browse Source 
svn-id: r38716
This commit is contained in:
Filippos Karapetis 2009-02-21 18:16:17 +00:00
parent 11b2ddfc54
commit 426def4f44
8 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/sci/engine/gc.cpp
View File

@ -79,8 +79,7 @@ static reg_t worklist_pop(worklist_t **wlp) {
reg_t retval; reg_t retval;
if (!wl || !wl->used) { if (!wl || !wl->used) {
fprintf(stderr, "Attempt to pop from empty worklist"); error("Attempt to pop from empty worklist");
exit(1);
} }
retval = wl->entries[--wl->used]; retval = wl->entries[--wl->used];

3
engines/sci/engine/kernel.cpp
View File

@ -727,9 +727,8 @@ void kernel_compile_signature(const char **s) {
break; break;
default: { default: {
sciprintf("INTERNAL ERROR when compiling kernel function signature '%s': (%02x) not understood (aka" error("INTERNAL ERROR when compiling kernel function signature '%s': (%02x) not understood (aka"
" '%c')\n", *s, c, c); " '%c')\n", *s, c, c);
exit(1);
} }
} }
} while (*src && (*src == KSIG_SPEC_ALLOW_INV || *src == KSIG_SPEC_ELLIPSIS || (c < 'a' && c != KSIG_SPEC_ANY))); } while (*src && (*src == KSIG_SPEC_ALLOW_INV || *src == KSIG_SPEC_ELLIPSIS || (c < 'a' && c != KSIG_SPEC_ANY)));

3
engines/sci/engine/seg_manager.cpp
View File

@ -1808,8 +1808,7 @@ seg_interface_t *get_seg_interface(SegManager *self, seg_id_t segid) {
memcpy(retval, seg_interfaces[mobj->type - 1], sizeof(seg_interface_t)); memcpy(retval, seg_interfaces[mobj->type - 1], sizeof(seg_interface_t));
if (mobj->type != retval->type_id) { if (mobj->type != retval->type_id) {
fprintf(stderr, "Improper segment interface for %d", mobj->type); error(stderr, "Improper segment interface for %d", mobj->type);
exit(1);
} }
retval->segmgr = self; retval->segmgr = self;

3
engines/sci/engine/vm.cpp
View File

@ -540,8 +540,7 @@ void vm_handle_fatal_error(EngineState *s, int line, const char *file) {
if (jump_initialized) if (jump_initialized)
longjmp(vm_error_address, 0); longjmp(vm_error_address, 0);
#endif #endif
fprintf(stderr, "Could not recover, exitting...\n"); error(stderr, "Could not recover, exitting...\n");
exit(1);
} }
static inline script_t *script_locate_by_segment(EngineState *s, seg_id_t seg) { static inline script_t *script_locate_by_segment(EngineState *s, seg_id_t seg) {

3
engines/sci/gfx/widgets.cpp
View File

@ -211,8 +211,7 @@ static void _gfxw_unallocate_widget(gfx_state_t *state, gfxw_widget_t *widget) {
GFXERROR("Error occured while drawing widget!\n"); \ GFXERROR("Error occured while drawing widget!\n"); \
return 1; \ return 1; \
} else if (retval == GFX_FATAL) { \ } else if (retval == GFX_FATAL) { \
GFXERROR("Fatal error occured while drawing widget!\nGraphics state invalid; aborting program..."); \ error("Fatal error occured while drawing widget!\nGraphics state invalid; aborting program..."); \
exit(1); \
} \ } \
} }

10
engines/sci/sfx/iterator.cpp
View File

@ -1939,10 +1939,7 @@ void song_iterator_add_death_listener(song_iterator_t *it,
void *client, void *client,
void (*notify)(void *self, void *notifier)) { void (*notify)(void *self, void *notifier)) {
if (it->death_listeners_nr >= SONGIT_MAX_LISTENERS) { if (it->death_listeners_nr >= SONGIT_MAX_LISTENERS) {
fprintf(stderr, "FATAL: Too many death listeners for song" error("FATAL: Too many death listeners for song iterator");
" iterator\n");
BREAKPOINT();
exit(1);
} }
it->death_listeners[it->death_listeners_nr].notify = notify; it->death_listeners[it->death_listeners_nr].notify = notify;
@ -1967,10 +1964,7 @@ void song_iterator_remove_death_listener(song_iterator_t *it,
} }
} }
fprintf(stderr, "FATAL: Could not remove death listener from " error("FATAL: Could not remove death listener from song iterator\n");
"song iterator\n");
BREAKPOINT();
exit(1);
} }

3
engines/sci/sfx/mixer/soft.cpp
View File

@ -606,9 +606,8 @@ static void mix_compute_input_linear(sfx_pcm_mixer_t *self, int add_result,
return; return;
default: default:
fprintf(stderr, "[soft-mixer] Fatal: Invalid mode returned by PCM feed %s-%d's get_timestamp(): %d\n", error("[soft-mixer] Fatal: Invalid mode returned by PCM feed %s-%d's get_timestamp(): %d\n",
f->debug_name, f->debug_nr, newmode); f->debug_name, f->debug_nr, newmode);
exit(1);
} }
} }

6
engines/sci/sfx/softseq/opl2.cpp
View File

@ -473,13 +473,11 @@ static void opl2_poll(sfx_softseq_t *self, byte *dest, int count) {
gint16 *ptr = buffer; gint16 *ptr = buffer;
if (!ready) { if (!ready) {
fprintf(stderr, "synth_mixer(): !ready \n"); error("synth_mixer(): !ready \n");
exit(1);
} }
if (!buffer) { if (!buffer) {
fprintf(stderr, "synth_mixer(): !buffer \n"); error("synth_mixer(): !buffer \n");
exit(1);
} }
#if 0 #if 0