Cleanup gcc-3.2 compiler warning - gcl.git - GNU Common Lisp

diff --git a/gcl/h/protoize.h b/gcl/h/protoize.h
index 96889aef1..92247d762 100644
--- a/gcl/h/protoize.h
+++ b/gcl/h/protoize.h

@@ -501,6 +501,7 @@ typedef void (*funcvoid)(void);

/* unixfsys.c:329:OF */ extern bool file_exists (object file); /* (file) object file; */

/* unixfsys.c:359:OF */ extern FILE *backup_fopen (char *filename, char *option); /* (filename, option) char *filename; char *option; */

/* unixfsys.c:372:OF */ extern int file_len (FILE *fp); /* (fp) FILE *fp; */

+/* unixfsys.c:382:OF */ extern object truename (object); /* () */

/* unixfsys.c:382:OF */ extern void Ltruename (void); /* () */

/* unixfsys.c:418:OF */ extern object fSsetenv (object variable, object value); /* (variable, value) object variable; object value; */

/* unixfsys.c:442:OF */ extern object fLdelete_file (object path); /* (path) object path; */

diff --git a/gcl/o/array.c b/gcl/o/array.c
index d4a246cf2..5f5a64b01 100755
--- a/gcl/o/array.c
+++ b/gcl/o/array.c

@@ -280,9 +280,13 @@ DEFUNO_NEW("ASET", object, fSaset, SI, 1, ARG_LIMIT, NONE, OO,

rank-- ;

while(1)

{

- if (k >= x->a.a_dims[m])

+ if (k >= x->a.a_dims[m]) {

+ object x,x1;

+ x=make_fixnum(m);

+ x1=make_fixnum(k);

FEerror("Index number ~a: ~a to array is out of bounds",

- 2,make_fixnum (m),make_fixnum(k));

+ 2,x,x1);

+ }

i1 += k;

if (m < rank)

{object u;

diff --git a/gcl/o/error.c b/gcl/o/error.c
index fafb65379..d22ebcf6a 100755
--- a/gcl/o/error.c
+++ b/gcl/o/error.c

@@ -777,16 +777,21 @@ vfun_wrong_number_of_args(object x)

void

check_arg_range(int n, int m)

-{ if (VFUN_NARGS < n)

- Icall_error_handler(

- sKtoo_few_arguments,

+{

+ object x,x1;

+

+ x=make_fixnum(n);

+ x1=make_fixnum(VFUN_NARGS);

+ if (VFUN_NARGS < n)

+ Icall_error_handler(

+ sKtoo_few_arguments,

make_simple_string("Needed at least ~D args, but received ~d"),

- 2,make_fixnum(n),make_fixnum(VFUN_NARGS));

+ 2,x,x1);

else if (VFUN_NARGS > m)

Icall_error_handler(

sKtoo_many_arguments,

make_simple_string("Needed no more than ~D args, but received ~d"),

- 2,make_fixnum(m),make_fixnum(VFUN_NARGS));

+ 2,x,x1);

}

diff --git a/gcl/o/fasdump.c b/gcl/o/fasdump.c
index 6d1096709..a4c80cc49 100755
--- a/gcl/o/fasdump.c
+++ b/gcl/o/fasdump.c

@@ -1399,9 +1399,12 @@ read_fasd1(int i, object *loc)

case DP(d_begin_dump:)

{int vers=GETD("version=%d");

- if(vers!=FASD_VERSION)

- FEerror("This file was dumped with FASD version ~a not ~a.",

- 2,make_fixnum(vers),make_fixnum(FASD_VERSION));}

+ if(vers!=FASD_VERSION) {

+ object x,x1;

+ x=make_fixnum(vers);

+ x1=make_fixnum(FASD_VERSION);

+ FEerror("This file was dumped with FASD version ~a not ~a.",

+ 2,x,x1);}}

{int leng;

GET4(leng);

current_fasd.table_length=make_fixnum(leng);}