Mercurial > emacs
changeset 109930:7daea44c7bcc
* eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP
instead of SAFE_ALLOCA.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Tue, 17 Aug 2010 23:07:50 +0200 |
| parents | 64970e6695e8 |
| children | f985155316b2 |
| files | src/ChangeLog src/eval.c |
| diffstat | 2 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Aug 17 12:34:28 2010 -0400 +++ b/src/ChangeLog Tue Aug 17 23:07:50 2010 +0200 @@ -1,3 +1,8 @@ +2010-08-17 Andreas Schwab <schwab@linux-m68k.org> + + * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP + instead of SAFE_ALLOCA. + 2010-08-17 Chong Yidong <cyd@stupidchicken.com> * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA
--- a/src/eval.c Tue Aug 17 12:34:28 2010 -0400 +++ b/src/eval.c Tue Aug 17 23:07:50 2010 +0200 @@ -1034,7 +1034,7 @@ /* Make space to hold the values to give the bound variables */ elt = Flength (varlist); - SAFE_ALLOCA (temps, Lisp_Object *, XFASTINT (elt) * sizeof (Lisp_Object)); + SAFE_ALLOCA_LISP (temps, XFASTINT (elt)); /* Compute the values and store them in `temps' */ @@ -2303,8 +2303,7 @@ register int argnum = 0; USE_SAFE_ALLOCA; - SAFE_ALLOCA (vals, Lisp_Object *, - XINT (numargs) * sizeof (Lisp_Object)); + SAFE_ALLOCA_LISP (vals, XINT (numargs)); GCPRO3 (args_left, fun, fun); gcpro3.var = vals; @@ -2476,8 +2475,7 @@ { /* Avoid making funcall cons up a yet another new vector of arguments by explicitly supplying nil's for optional values */ - SAFE_ALLOCA (funcall_args, Lisp_Object *, - (1 + XSUBR (fun)->max_args) * sizeof (Lisp_Object)); + SAFE_ALLOCA_LISP (funcall_args, 1 + XSUBR (fun)->max_args); for (i = numargs; i < XSUBR (fun)->max_args;) funcall_args[++i] = Qnil; GCPRO1 (*funcall_args); @@ -2489,8 +2487,7 @@ function itself as well as its arguments. */ if (!funcall_args) { - SAFE_ALLOCA (funcall_args, Lisp_Object *, - (1 + numargs) * sizeof (Lisp_Object)); + SAFE_ALLOCA_LISP (funcall_args, 1 + numargs); GCPRO1 (*funcall_args); gcpro1.nvars = 1 + numargs; } @@ -3121,8 +3118,7 @@ USE_SAFE_ALLOCA; numargs = Flength (args); - SAFE_ALLOCA (arg_vector, Lisp_Object *, - XINT (numargs) * sizeof (Lisp_Object)); + SAFE_ALLOCA_LISP (arg_vector, XINT (numargs)); args_left = args; GCPRO3 (*arg_vector, args_left, fun);