From eedcadd57f932b125c4966a1bb44d8c35d558f6c Mon Sep 17 00:00:00 2001
From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 9 Mar 2012 00:15:42 +0000
Subject: [PATCH] applied Thomas's patch to fix some -Wall -Werror issues,
 thanks Thomas

git-svn-id: https://svn.code.sf.net/p/freetel/code@344 01035d8c-6547-0410-b346-abe4f91aad63
---
 codec2-dev/src/fft.c          |  1 -
 codec2-dev/unittest/extract.c |  5 +++--
 codec2-dev/unittest/tcodec2.c | 20 ++++++++++----------
 codec2-dev/unittest/tinterp.c |  3 ++-
 codec2-dev/unittest/tnlp.c    |  3 ++-
 codec2-dev/unittest/vqtrain.c |  1 +
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/codec2-dev/src/fft.c b/codec2-dev/src/fft.c
index 73c46c84..df1fbcf1 100644
--- a/codec2-dev/src/fft.c
+++ b/codec2-dev/src/fft.c
@@ -76,7 +76,6 @@ fft (float x[], int n, int isign)
     {
       initialize_fft (n);
     }
-  int isReverse = 0;
   int c;
   for (c = 0; c < n * 2; c += 2)
     {
diff --git a/codec2-dev/unittest/extract.c b/codec2-dev/unittest/extract.c
index dcd75df4..36c6d681 100644
--- a/codec2-dev/unittest/extract.c
+++ b/codec2-dev/unittest/extract.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <assert.h>
 
 void scan_line(FILE *fp, float f[], int n);
 
@@ -110,8 +111,8 @@ void scan_line(FILE *fp, float f[], int n)
     char   *ps,*pe;
     int	   i;
 
-    fgets(s,MAX_STR,fp);
-    ps = pe = s;
+    ps = pe = fgets(s,MAX_STR,fp); 
+    assert(ps);
     for(i=0; i<n; i++) {
 	while( isspace(*pe)) pe++;
 	while( !isspace(*pe)) pe++;
diff --git a/codec2-dev/unittest/tcodec2.c b/codec2-dev/unittest/tcodec2.c
index bc590b78..d89669e8 100644
--- a/codec2-dev/unittest/tcodec2.c
+++ b/codec2-dev/unittest/tcodec2.c
@@ -130,22 +130,22 @@ int test2()
 	encode_lsps_scalar(lsp_indexes, lsps, LPC_ORD);
 	energy_index = encode_energy(e);
 	nbit = 0;
-	pack(bits, &nbit, Wo_index, WO_BITS);
+	pack((unsigned char*)bits, (unsigned *)&nbit, Wo_index, WO_BITS);
 	for(i=0; i<LPC_ORD; i++) {
-	    pack(bits, &nbit, lsp_indexes[i], lsp_bits(i));
+	    pack((unsigned char*)bits, (unsigned *)&nbit, lsp_indexes[i], lsp_bits(i));
 	}
-	pack(bits, &nbit, energy_index, E_BITS);
-	pack(bits, &nbit, voiced1, 1);
-	pack(bits, &nbit, voiced2, 1);
+	pack((unsigned char*)bits, (unsigned *)&nbit, energy_index, E_BITS);
+	pack((unsigned char*)bits, (unsigned *)&nbit, voiced1, 1);
+	pack((unsigned char*)bits, (unsigned *)&nbit, voiced2, 1);
  
 	nbit = 0;
-	Wo_index = unpack(bits, &nbit, WO_BITS);
+	Wo_index = unpack((unsigned char*)bits, (unsigned *)&nbit, WO_BITS);
 	for(i=0; i<LPC_ORD; i++) {
-	    lsp_indexes[i] = unpack(bits, &nbit, lsp_bits(i));
+	    lsp_indexes[i] = unpack((unsigned char*)bits, (unsigned *)&nbit, lsp_bits(i));
 	}
-	energy_index = unpack(bits, &nbit, E_BITS);
-	voiced1 = unpack(bits, &nbit, 1);
-	voiced2 = unpack(bits, &nbit, 1);
+	energy_index = unpack((unsigned char*)bits, (unsigned *)&nbit, E_BITS);
+	voiced1 = unpack((unsigned char*)bits, (unsigned *)&nbit, 1);
+	voiced2 = unpack((unsigned char*)bits, (unsigned *)&nbit, 1);
 
 	model.Wo = decode_Wo(Wo_index);
 	model.L = PI/model.Wo;
diff --git a/codec2-dev/unittest/tinterp.c b/codec2-dev/unittest/tinterp.c
index e743e6ba..52e782b4 100644
--- a/codec2-dev/unittest/tinterp.c
+++ b/codec2-dev/unittest/tinterp.c
@@ -97,8 +97,9 @@ void load_amp(MODEL *model, char file[], int frame)
     f = fopen(file,"rt");
 
     for(i=0; i<frame; i++)
-	fgets(s, 1023, f);
+	ps = fgets(s, 1023, f);
 
+    /// can frame ever be 0? what if fgets fails?
     ps = s;
     ps = get_next_float(ps, &model->Wo);
     ps = get_next_int(ps, &model->L);
diff --git a/codec2-dev/unittest/tnlp.c b/codec2-dev/unittest/tnlp.c
index 5ecff877..2f85f7fd 100644
--- a/codec2-dev/unittest/tnlp.c
+++ b/codec2-dev/unittest/tnlp.c
@@ -116,7 +116,8 @@ char *argv[];
     if (dump) 
       dump_on(argv[dump+1]);
 #else
-#warning "Compile with -DDUMP if you expect to dump anything."
+/// TODO
+/// #warning "Compile with -DDUMP if you expect to dump anything."
 #endif
 
     nlp_states = nlp_create();
diff --git a/codec2-dev/unittest/vqtrain.c b/codec2-dev/unittest/vqtrain.c
index ef423158..dbea6f3d 100644
--- a/codec2-dev/unittest/vqtrain.c
+++ b/codec2-dev/unittest/vqtrain.c
@@ -37,6 +37,7 @@
 #include <string.h>
 #include <math.h>
 #include <ctype.h>
+#include <assert.h>
 
 /*-----------------------------------------------------------------------*\
 
-- 
2.25.1