summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2010-11-20 18:09:55 +0100
committerGravatar waker <wakeroid@gmail.com>2010-11-20 18:09:55 +0100
commit553c7dde58674a9846452fbf06c9645fc1174d4e (patch)
treee87c24d1578f759f21edbbb1027064ef703e1fc3
parent25a1c56fbfeac9d121e32d6e2219fcf400486187 (diff)
fixed few c99 incompatibilities in dumb
-rw-r--r--plugins/dumb/dumb-kode54/src/it/loadmod.c4
-rw-r--r--plugins/dumb/dumb-kode54/src/it/loadmod2.c4
-rw-r--r--plugins/dumb/dumb-kode54/src/it/readmod.c8
-rw-r--r--plugins/dumb/dumb-kode54/src/it/readmod2.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/plugins/dumb/dumb-kode54/src/it/loadmod.c b/plugins/dumb/dumb-kode54/src/it/loadmod.c
index 0b7dc618..dd43b611 100644
--- a/plugins/dumb/dumb-kode54/src/it/loadmod.c
+++ b/plugins/dumb/dumb-kode54/src/it/loadmod.c
@@ -26,7 +26,7 @@
* pointer to the DUH struct. When you have finished with it, you must
* pass the pointer to unload_duh() so that the memory can be freed.
*/
-DUH *dumb_load_mod_quick(const char *filename, int restrict)
+DUH *dumb_load_mod_quick(const char *filename, int restr)
{
DUH *duh;
DUMBFILE *f = dumbfile_open(filename);
@@ -34,7 +34,7 @@ DUH *dumb_load_mod_quick(const char *filename, int restrict)
if (!f)
return NULL;
- duh = dumb_read_mod_quick(f, restrict);
+ duh = dumb_read_mod_quick(f, restr);
dumbfile_close(f);
diff --git a/plugins/dumb/dumb-kode54/src/it/loadmod2.c b/plugins/dumb/dumb-kode54/src/it/loadmod2.c
index 7847d19f..c1f46e4c 100644
--- a/plugins/dumb/dumb-kode54/src/it/loadmod2.c
+++ b/plugins/dumb/dumb-kode54/src/it/loadmod2.c
@@ -21,9 +21,9 @@
-DUH *dumb_load_mod(const char *filename, int restrict)
+DUH *dumb_load_mod(const char *filename, int restr)
{
- DUH *duh = dumb_load_mod_quick(filename, restrict);
+ DUH *duh = dumb_load_mod_quick(filename, restr);
dumb_it_do_initial_runthrough(duh);
return duh;
}
diff --git a/plugins/dumb/dumb-kode54/src/it/readmod.c b/plugins/dumb/dumb-kode54/src/it/readmod.c
index a934af40..538d86ba 100644
--- a/plugins/dumb/dumb-kode54/src/it/readmod.c
+++ b/plugins/dumb/dumb-kode54/src/it/readmod.c
@@ -439,7 +439,7 @@ static DUMBFILE *dumbfile_buffer_mod_2(DUMBFILE *f, long *remain)
}
-static DUMB_IT_SIGDATA *it_mod_load_sigdata(DUMBFILE *f, int restrict)
+static DUMB_IT_SIGDATA *it_mod_load_sigdata(DUMBFILE *f, int restr)
{
DUMB_IT_SIGDATA *sigdata;
int n_channels;
@@ -554,7 +554,7 @@ static DUMB_IT_SIGDATA *it_mod_load_sigdata(DUMBFILE *f, int restrict)
}
// moo
- if ( restrict && sigdata->n_samples == 15 )
+ if ( restr && sigdata->n_samples == 15 )
{
free(sigdata);
dumbfile_close(f);
@@ -760,13 +760,13 @@ static DUMB_IT_SIGDATA *it_mod_load_sigdata(DUMBFILE *f, int restrict)
return sigdata;
}
-DUH *dumb_read_mod_quick(DUMBFILE *f, int restrict)
+DUH *dumb_read_mod_quick(DUMBFILE *f, int restr)
{
sigdata_t *sigdata;
DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
- sigdata = it_mod_load_sigdata(f, restrict);
+ sigdata = it_mod_load_sigdata(f, restr);
if (!sigdata)
return NULL;
diff --git a/plugins/dumb/dumb-kode54/src/it/readmod2.c b/plugins/dumb/dumb-kode54/src/it/readmod2.c
index 102ead12..299c584e 100644
--- a/plugins/dumb/dumb-kode54/src/it/readmod2.c
+++ b/plugins/dumb/dumb-kode54/src/it/readmod2.c
@@ -21,9 +21,9 @@
-DUH *dumb_read_mod(DUMBFILE *f, int restrict)
+DUH *dumb_read_mod(DUMBFILE *f, int restr)
{
- DUH *duh = dumb_read_mod_quick(f, restrict);
+ DUH *duh = dumb_read_mod_quick(f, restr);
dumb_it_do_initial_runthrough(duh);
return duh;
}