From 56bec225f22fb1ea926d3f2a71fbdcbe8f2c8732 Mon Sep 17 00:00:00 2001 From: David Griffith Date: Sun, 30 Aug 2015 17:48:40 -0700 Subject: [PATCH] Change some exit() calls to simple returns. --- src/curses/ux_audio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c index f9315c5..2bdbf52 100644 --- a/src/curses/ux_audio.c +++ b/src/curses/ux_audio.c @@ -216,7 +216,7 @@ void os_start_sample (int number, int volume, int repeats, zword eos) err = pthread_create(&playaiff_id, &attr, (void *) &playaiff, &myeffect); if (err != 0) { printf("Can't create playaiff thread :[%s]", strerror(err)); - exit(1); + return; } sem_wait(&playaiff_okay); } else if (myeffect.type == MOD || myeffect.type == OGGV) { @@ -227,7 +227,7 @@ void os_start_sample (int number, int volume, int repeats, zword eos) err = pthread_create(&playmusic_id, &attr, (void *) &playmusic, &myeffect); if (err != 0) { printf("Can't create playmusic thread :[%s]", strerror(err)); - exit(1); + return; } sem_wait(&playmusic_okay); } else { @@ -649,8 +649,8 @@ static void *playmod(EFFECT *raw_effect) mod = ModPlug_Load(filedata, size); fseek(myeffect.fp, filestart, SEEK_SET); if (!mod) { - printf("Unable to load module\n"); - exit(1); + printf("Unable to load MOD chunk.\n\r"); + return; } if (myeffect.vol < 1) myeffect.vol = 1; @@ -749,13 +749,13 @@ static void *playogg(EFFECT *raw_effect) fseek(myeffect.fp, myeffect.result.data.startpos, SEEK_SET); if (ov_open_callbacks(myeffect.fp, &vf, NULL, 0, OV_CALLBACKS_NOCLOSE) < 0) { - printf("Unable to open OGGV stream.\n\r"); + printf("Unable to load OGGV chunk.\n\r"); return; } info = ov_info(&vf, -1); if (info == NULL) { - printf("Unable to get info on OGGV stream.\n\r"); + printf("Unable to get info on OGGV chunk.\n\r"); return; } -- 2.34.1