From 132173badfe9315e94ab30fb19d366adbc63e826 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 7 Nov 2015 22:47:34 +0100 Subject: [PATCH] cppcheck: fix 2 reports [lib-src/libnyquist/nyquist/nyqsrc/sndwritepa.c:249]: (style) Same expression in both branches of ternary operator [lib-src/libnyquist/nyquist/nyqsrc/f0.cpp:137]: (error) Mismatching allocation and deallocation: results --- lib-src/libnyquist/nyquist/nyqsrc/f0.cpp | 2 +- lib-src/libnyquist/nyquist/nyqsrc/sndwritepa.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib-src/libnyquist/nyquist/nyqsrc/f0.cpp b/lib-src/libnyquist/nyquist/nyqsrc/f0.cpp index 7b4f08ed7..99ca5dad2 100644 --- a/lib-src/libnyquist/nyquist/nyqsrc/f0.cpp +++ b/lib-src/libnyquist/nyquist/nyqsrc/f0.cpp @@ -134,6 +134,6 @@ float best_f0(float *samples, int n, int m, float threshold, int Tmax) best_f0=f0; } } - delete(results); + delete[] results; return best_f0; } diff --git a/lib-src/libnyquist/nyquist/nyqsrc/sndwritepa.c b/lib-src/libnyquist/nyquist/nyqsrc/sndwritepa.c index cfd317d33..24d5c247e 100644 --- a/lib-src/libnyquist/nyquist/nyqsrc/sndwritepa.c +++ b/lib-src/libnyquist/nyquist/nyqsrc/sndwritepa.c @@ -246,7 +246,7 @@ long lookup_format(long format, long mode, long bits, long swap) sf_format |= (swap ? SF_ENDIAN_LITTLE : SF_ENDIAN_BIG); #endif #ifdef XL_LITTLE_ENDIAN - sf_format |= (swap ? SF_ENDIAN_LITTLE : SF_ENDIAN_LITTLE); + sf_format |= (swap ? SF_ENDIAN_BIG : SF_ENDIAN_LITTLE); #endif break; default: