# HG changeset patch # User Kim F. Storm # Date 1087912620 0 # Node ID 2bb92448ff94f6167b21583c1ee2144ba6b9bd9b # Parent db1817b882943165c89423c0953fece90e23b9f7 (Fmapconcat, Fmapcar): Use new SAFE_ALLOCA_LISP and SAFE_FREE_LISP macros. diff -r db1817b88294 -r 2bb92448ff94 src/fns.c --- a/src/fns.c Tue Jun 22 13:56:34 2004 +0000 +++ b/src/fns.c Tue Jun 22 13:57:00 2004 +0000 @@ -3000,7 +3000,6 @@ register Lisp_Object *args; register int i; struct gcpro gcpro1; - int nbytes; Lisp_Object ret; USE_SAFE_ALLOCA; @@ -3009,8 +3008,7 @@ nargs = leni + leni - 1; if (nargs < 0) return build_string (""); - nbytes = nargs * sizeof (Lisp_Object); - SAFE_ALLOCA_LISP (args, nbytes); + SAFE_ALLOCA_LISP (args, nargs); GCPRO1 (separator); mapcar1 (leni, args, function, sequence); @@ -3023,7 +3021,7 @@ args[i] = separator; ret = Fconcat (nargs, args); - SAFE_FREE (nbytes); + SAFE_FREE_LISP (nargs); return ret; } @@ -3038,20 +3036,18 @@ register Lisp_Object len; register int leni; register Lisp_Object *args; - int nbytes; Lisp_Object ret; USE_SAFE_ALLOCA; len = Flength (sequence); leni = XFASTINT (len); - nbytes = leni * sizeof (Lisp_Object); - SAFE_ALLOCA_LISP (args, nbytes); + SAFE_ALLOCA_LISP (args, leni); mapcar1 (leni, args, function, sequence); ret = Flist (leni, args); - SAFE_FREE(nbytes); + SAFE_FREE_LISP (leni); return ret; }