ref: f51d9ead5217bb2b5f1b0dd2c7a045150f7522ac
parent: 15b935c6166a9b62d1aab18a8f91e473c52705cf
author: robs <robs>
date: Sun Nov 4 11:32:36 EST 2007
warning quashing
--- a/libgsm/long_term.c
+++ b/libgsm/long_term.c
@@ -4,7 +4,7 @@
* details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
*/
-/* $Header: /cvsroot/sox/sox/libgsm/long_term.c,v 1.1 2007/09/06 16:50:55 cbagwell Exp $ */
+/* $Header: /cvsroot/sox/sox/libgsm/long_term.c,v 1.2 2007/11/04 16:32:36 robs Exp $ */
#include <stdio.h>
#include <assert.h>
@@ -875,6 +875,8 @@
word * bc /* gain factor OUT */
)
{+ (void)S; /* Denotes intentionally unused */
+
assert( d ); assert( dp ); assert( e );
assert( dpp); assert( Nc ); assert( bc );
--- a/libgsm/lpc.c
+++ b/libgsm/lpc.c
@@ -4,7 +4,7 @@
* details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
*/
-/* $Header: /cvsroot/sox/sox/libgsm/lpc.c,v 1.1 2007/09/06 16:50:55 cbagwell Exp $ */
+/* $Header: /cvsroot/sox/sox/libgsm/lpc.c,v 1.2 2007/11/04 16:32:36 robs Exp $ */
#include <stdio.h>
#include <assert.h>
@@ -326,6 +326,7 @@
word * LARc) /* 0..7 LARc's OUT */
{longword L_ACF[9];
+ (void)S; /* Denotes intentionally unused */
#if defined(USE_FLOAT_MUL) && defined(FAST)
if (S->fast) Fast_Autocorrelation (s, L_ACF );
--- a/libgsm/private.h
+++ b/libgsm/private.h
@@ -4,7 +4,7 @@
* details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
*/
-/*$Header: /cvsroot/sox/sox/libgsm/private.h,v 1.1 2007/09/06 16:50:56 cbagwell Exp $*/
+/*$Header: /cvsroot/sox/sox/libgsm/private.h,v 1.2 2007/11/04 16:32:36 robs Exp $*/
#ifndef PRIVATE_H
#define PRIVATE_H
@@ -102,7 +102,7 @@
>= MAX_LONGWORD ? MIN_LONGWORD : -(longword)utmp-2 ) \
: ((b) <= 0 ? (a) + (b) \
: (utmp = (ulongword)(a) + (ulongword)(b)) >= MAX_LONGWORD \
- ? MAX_LONGWORD : utmp))
+ ? MAX_LONGWORD : (longword)utmp))
/*
* # define GSM_ADD(a, b) \
--- a/libgsm/rpe.c
+++ b/libgsm/rpe.c
@@ -4,7 +4,7 @@
* details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
*/
-/* $Header: /cvsroot/sox/sox/libgsm/rpe.c,v 1.1 2007/09/06 16:50:56 cbagwell Exp $ */
+/* $Header: /cvsroot/sox/sox/libgsm/rpe.c,v 1.2 2007/11/04 16:32:36 robs Exp $ */
#include <stdio.h>
#include <assert.h>
@@ -458,6 +458,7 @@
word xM[13], xMp[13];
word mant, exp;
+ (void)S; /* Denotes intentionally unused */
Weighting_filter(e, x);
RPE_grid_selection(x, xM, Mc);
@@ -480,6 +481,7 @@
word exp, mant;
word xMp[ 13 ];
+ (void)S; /* Denotes intentionally unused */
APCM_quantization_xmaxc_to_exp_mant( xmaxcr, &exp, &mant );
APCM_inverse_quantization( xMcr, mant, exp, xMp );
RPE_grid_positioning( Mcr, xMp, erp );
--- a/src/amr.h
+++ b/src/amr.h
@@ -33,8 +33,8 @@
static sox_size_t decode_1_frame(sox_format_t * ft)
{amr_t amr = (amr_t) ft->priv;
- int block_size_1;
- unsigned char coded[AMR_CODED_MAX];
+ size_t block_size_1;
+ UWord8 coded[AMR_CODED_MAX];
if (fread(coded, sizeof(coded[0]), 1, ft->fp) != 1)
return AMR_FRAME;
@@ -48,7 +48,7 @@
static void encode_1_frame(sox_format_t * ft)
{amr_t amr = (amr_t) ft->priv;
- unsigned char coded[AMR_CODED_MAX];
+ UWord8 coded[AMR_CODED_MAX];
fwrite(coded, 1, (unsigned)E_IF_encode(amr->state, amr->mode, amr->pcm, coded, 1), ft->fp);
}