aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2006-11-12 12:23:08 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2006-11-12 12:23:08 +0000
commit78e8f0c6d99b5a6a38bcc17dfd3291bc2c25aa83 (patch)
tree6666a95f5847efe0c54c90526b3d58d27c255841
parentb8af534ee807051a754941eee1dd74404504ffa5 (diff)
more fixes of variable shadowin; proper function declaration
svn path=/trunk/externals/iem/iemmatrix/; revision=6267
-rw-r--r--src/mtx_index.c14
-rw-r--r--src/mtx_sum.c2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mtx_index.c b/src/mtx_index.c
index dfa226a..a4ca156 100644
--- a/src/mtx_index.c
+++ b/src/mtx_index.c
@@ -99,11 +99,11 @@ static void setAtomListConstFloat (int n, t_atom *x, t_float f)
SETFLOAT(x,f);
}
-static void writeIndexedValuesIntoList (int n, int *index, t_atom *x, t_atom *y)
+static void writeIndexedValuesIntoList (int n, int *indx, t_atom *x, t_atom *y)
{
- for (;n--;index++,y++)
- if (*index)
- *y = x[*index-1];
+ for (;n--;indx++,y++)
+ if (*indx)
+ *y = x[*indx-1];
}
static void mTXIndexRightMatrix (MTXindex *mtx_index_obj, t_symbol *s,
@@ -165,7 +165,7 @@ static void mTXIndexMatrix (MTXindex *mtx_index_obj, t_symbol *s,
t_atom *list_out = mtx_index_obj->list_out;
int index_rows = mtx_index_obj->index_rows;
int index_columns = mtx_index_obj->index_columns;
- int *index = mtx_index_obj->index_in;
+ int *indx = mtx_index_obj->index_in;
// size check
if (!size) {
@@ -181,14 +181,14 @@ static void mTXIndexMatrix (MTXindex *mtx_index_obj, t_symbol *s,
post("mtx_index: index exceeds matrix dimensions");
return;
}
- if ((!index)||(mtx_index_obj->index_size == 0)) {
+ if ((!indx)||(mtx_index_obj->index_size == 0)) {
post("mtx_index: index with what? no right matrix defined");
return;
}
// main part
list_out += 2;
setAtomListConstFloat (mtx_index_obj->index_size, list_out, mtx_index_obj->fill_value);
- writeIndexedValuesIntoList (mtx_index_obj->index_size, index,list_in,list_out);
+ writeIndexedValuesIntoList (mtx_index_obj->index_size, indx,list_in,list_out);
list_out = mtx_index_obj->list_out;
SETSYMBOL(list_out, gensym("matrix"));
SETFLOAT(list_out, index_rows);
diff --git a/src/mtx_sum.c b/src/mtx_sum.c
index ebc3161..fd20ab9 100644
--- a/src/mtx_sum.c
+++ b/src/mtx_sum.c
@@ -49,7 +49,7 @@ static void mtx_sum_list(t_matrix *x, t_symbol *s, int argc, t_atom *argv){
}
-static void *mtx_sum_new()
+static void *mtx_sum_new(void)
{
t_matrix *x = (t_matrix *)pd_new(mtx_sum_class);
outlet_new(&x->x_obj, 0);