fixed a few warnings

svn path=/trunk/externals/maxlib/; revision=4411

4 files changed, 18 insertions, 11 deletions

diff --git a/src/arbran.c b/src/arbran.c
index cf76517..d708e11 100644
--- a/src/arbran.c
+++ b/src/arbran.c
@@ -57,7 +57,7 @@ static void rand_arbran_pdfscale(t_rand_arbran *x)
 	t_float a = 0;

 	t_int k = 0;

 	t_float *tx, *tp;

-	t_int ix, ip;

+	int ix, ip;

 	if (!garray_getfloatarray(bx, &ix, &tx))

 	{

 		post("arbran: couldn't read from array!");

@@ -86,7 +86,7 @@ static void rand_arbran_bang(t_rand_arbran *x)
 	t_float a, u, a0, slope, b, d, r;

 	t_int k = 0;

 	t_float *tx, *tp;

-	t_int ix, ip;

+	int ix, ip;

 	if (!garray_getfloatarray(bx, &ix, &tx))

 	{

 		post("arbran: couldn't read from array!");

diff --git a/src/arraycopy.c b/src/arraycopy.c
index c7f34cf..ea5f61b 100644
--- a/src/arraycopy.c
+++ b/src/arraycopy.c
@@ -82,7 +82,8 @@ static void arraycopy_docopy(t_arraycopy *x)
 {

 	t_garray *b;		/* make local copy of array */

 	t_float *tab;                 /* the content itselfe */

-	t_int items, i;

+	int items;

+	t_int i;

 	t_garray *A;

 	int npoints;

 	t_float *vec;

diff --git a/src/beat.c b/src/beat.c
index 0dec647..a2f565e 100644
--- a/src/beat.c
+++ b/src/beat.c
@@ -131,7 +131,7 @@ static int beat_evaluate(t_beat *x)
 		for(i = 1; i < 6; i++)

 		{

 			sortp = &(theories[BEAT_LONG - i]);

-			sprintf(info, " %4d[%3d]", sortp->theory, sortp->points);

+			sprintf(info, " %4d[%3d]", (int) sortp->theory, (int) sortp->points);

 			strcat(string, info);

 		}

 		sprintf(info, "  %g %g", clock_getlogicaltime(), x->x_beatexpect);

diff --git a/src/chord.c b/src/chord.c
index fb9ba3f..142576c 100644
--- a/src/chord.c
+++ b/src/chord.c
@@ -412,7 +412,7 @@ static void chord_quintad(t_chord *x)
 	static t_type_root quintads[8][8][8][8];

 	register int i, j, k, l;

 	register t_type_root *t;

-	int members[5];

+	t_int members[5];

 	int interval1, interval2, interval3, interval4;

 	int *st;

 	int maj9[5][4] = {{1,1,2,3}, {0,1,1,2}, {3,0,1,1}, {2,3,0,1}, {1,2,3,0}};

@@ -963,7 +963,7 @@ static void chord_sextad(t_chord *x)
 	register int i, j, k, l, m;

 	register t_type_root *t;

 	register int* st;

-	int members[6];

+	t_int members[6];

 	int interval1, interval2, interval3, interval4, interval5;

 

 	int D9b3[6][5] =

@@ -1214,11 +1214,14 @@ static int chord_name_third(t_chord *x, char* chord, int c, int rootName)
 	if (x->x_pc[third]) {					// if one is there

 		x->x_pc[third] = 0;					// erase from pcs array

 		chord[c++] = name_class[(rootName+2)%7];

-		if (chord_accidental(third))			// if it has an chord_accidental

+		if (chord_accidental(third)) {			// if it has an chord_accidental

 			// make it a flat if the root also has an chord_accidental

-			if (chord_accidental(x->x_chord_root)) chord[c++] = 'b';

+			if (chord_accidental(x->x_chord_root)) 

+				chord[c++] = 'b';

 			// otherwise make it a sharp

-			else					   chord[c++] = '#';

+			else					   

+				chord[c++] = '#';

+		}

 		chord[c++] = ' ';

 		return c;						// return if major third found

 	}

@@ -1393,10 +1396,13 @@ static int chord_name_thirteenth(t_chord *x, char* chord, int c, int rootName)
 	if (x->x_pc[thirteenth]) {

 		x->x_pc[thirteenth] = 0;

 		chord[c++] = name_class[(rootName+5)%7];

-		if (chord_accidental(thirteenth))

+		if (chord_accidental(thirteenth)) {

 			if (chord_accidental(x->x_chord_root))

-				chord[c++] = 'b'; else

+				chord[c++] = 'b'; 

+			else

 				chord[c++] = '#';

+		}

+		

 		chord[c++] = ' ';

 		return c;

 	}