From d1dc65d6ee46bb99d9dbbb95adf51df4604e95e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 16 Aug 2012 00:11:00 +0100 Subject: [PATCH] fft: shouldn't ever call exit() Libraries shouldn't ever just call exit(). Let's hope we'll remember to cherry-pick this commit again if we ever update these files. https://bugzilla.gnome.org/show_bug.cgi?id=681904 --- gst-libs/gst/fft/kiss_fftr_f32.c | 12 ++++-------- gst-libs/gst/fft/kiss_fftr_f64.c | 12 ++++-------- gst-libs/gst/fft/kiss_fftr_s16.c | 12 ++++-------- gst-libs/gst/fft/kiss_fftr_s32.c | 12 ++++-------- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/gst-libs/gst/fft/kiss_fftr_f32.c b/gst-libs/gst/fft/kiss_fftr_f32.c index ab11c04e30..17d7004a72 100644 --- a/gst-libs/gst/fft/kiss_fftr_f32.c +++ b/gst-libs/gst/fft/kiss_fftr_f32.c @@ -77,10 +77,8 @@ kiss_fftr_f32 (kiss_fftr_f32_cfg st, const kiss_fft_f32_scalar * timedata, int k, ncfft; kiss_fft_f32_cpx fpnk, fpk, f1k, f2k, tw, tdc; - if (st->substate->inverse) { - fprintf (stderr, "kiss fft usage error: improper alloc\n"); - exit (1); - } + /* kiss fft usage error: improper alloc */ + g_return_if_fail (st->substate->inverse == 0); ncfft = st->substate->nfft; @@ -134,10 +132,8 @@ kiss_fftri_f32 (kiss_fftr_f32_cfg st, const kiss_fft_f32_cpx * freqdata, /* input buffer timedata is stored row-wise */ int k, ncfft; - if (st->substate->inverse == 0) { - fprintf (stderr, "kiss fft usage error: improper alloc\n"); - exit (1); - } + /* kiss fft usage error: improper alloc */ + g_return_if_fail (st->substate->inverse != 0); ncfft = st->substate->nfft; diff --git a/gst-libs/gst/fft/kiss_fftr_f64.c b/gst-libs/gst/fft/kiss_fftr_f64.c index 740be2711d..2b9bf8e820 100644 --- a/gst-libs/gst/fft/kiss_fftr_f64.c +++ b/gst-libs/gst/fft/kiss_fftr_f64.c @@ -78,10 +78,8 @@ kiss_fftr_f64 (kiss_fftr_f64_cfg st, const kiss_fft_f64_scalar * timedata, int k, ncfft; kiss_fft_f64_cpx fpnk, fpk, f1k, f2k, tw, tdc; - if (st->substate->inverse) { - fprintf (stderr, "kiss fft usage error: improper alloc\n"); - exit (1); - } + /* kiss fft usage error: improper alloc */ + g_return_if_fail (st->substate->inverse == 0); ncfft = st->substate->nfft; @@ -135,10 +133,8 @@ kiss_fftri_f64 (kiss_fftr_f64_cfg st, const kiss_fft_f64_cpx * freqdata, /* input buffer timedata is stored row-wise */ int k, ncfft; - if (st->substate->inverse == 0) { - fprintf (stderr, "kiss fft usage error: improper alloc\n"); - exit (1); - } + /* kiss fft usage error: improper alloc */ + g_return_if_fail (st->substate->inverse != 0); ncfft = st->substate->nfft; diff --git a/gst-libs/gst/fft/kiss_fftr_s16.c b/gst-libs/gst/fft/kiss_fftr_s16.c index f1ec990cb3..a824f29a18 100644 --- a/gst-libs/gst/fft/kiss_fftr_s16.c +++ b/gst-libs/gst/fft/kiss_fftr_s16.c @@ -78,10 +78,8 @@ kiss_fftr_s16 (kiss_fftr_s16_cfg st, const kiss_fft_s16_scalar * timedata, int k, ncfft; kiss_fft_s16_cpx fpnk, fpk, f1k, f2k, tw, tdc; - if (st->substate->inverse) { - fprintf (stderr, "kiss fft usage error: improper alloc\n"); - exit (1); - } + /* kiss fft usage error: improper alloc */ + g_return_if_fail (st->substate->inverse == 0); ncfft = st->substate->nfft; @@ -135,10 +133,8 @@ kiss_fftri_s16 (kiss_fftr_s16_cfg st, const kiss_fft_s16_cpx * freqdata, /* input buffer timedata is stored row-wise */ int k, ncfft; - if (st->substate->inverse == 0) { - fprintf (stderr, "kiss fft usage error: improper alloc\n"); - exit (1); - } + /* kiss fft usage error: improper alloc */ + g_return_if_fail (st->substate->inverse != 0); ncfft = st->substate->nfft; diff --git a/gst-libs/gst/fft/kiss_fftr_s32.c b/gst-libs/gst/fft/kiss_fftr_s32.c index 260da2962c..a1024b4427 100644 --- a/gst-libs/gst/fft/kiss_fftr_s32.c +++ b/gst-libs/gst/fft/kiss_fftr_s32.c @@ -78,10 +78,8 @@ kiss_fftr_s32 (kiss_fftr_s32_cfg st, const kiss_fft_s32_scalar * timedata, int k, ncfft; kiss_fft_s32_cpx fpnk, fpk, f1k, f2k, tw, tdc; - if (st->substate->inverse) { - fprintf (stderr, "kiss fft usage error: improper alloc\n"); - exit (1); - } + /* kiss fft usage error: improper alloc */ + g_return_if_fail (st->substate->inverse == 0); ncfft = st->substate->nfft; @@ -135,10 +133,8 @@ kiss_fftri_s32 (kiss_fftr_s32_cfg st, const kiss_fft_s32_cpx * freqdata, /* input buffer timedata is stored row-wise */ int k, ncfft; - if (st->substate->inverse == 0) { - fprintf (stderr, "kiss fft usage error: improper alloc\n"); - exit (1); - } + /* kiss fft usage error: improper alloc */ + g_return_if_fail (st->substate->inverse != 0); ncfft = st->substate->nfft;