diff options
| author | Paul Eggert | 2012-07-05 11:35:48 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-07-05 11:35:48 -0700 |
| commit | 38182d901d030c7d65f4aa7a49b583afb30eb9b7 (patch) | |
| tree | a69e1a571495d6ca1c034359d7c995639774ab9b /src/callproc.c | |
| parent | 6dd5a677dbf794eedaa8325c46d57ac041373361 (diff) | |
| download | emacs-38182d901d030c7d65f4aa7a49b583afb30eb9b7.tar.gz emacs-38182d901d030c7d65f4aa7a49b583afb30eb9b7.zip | |
More xmalloc and related cleanup.
* alloc.c, bidi.c, buffer.c, buffer.h, bytecode.c, callint.c:
* callproc.c, charset.c, coding.c, composite.c, data.c, dispnew.c:
* doc.c, editfns.c, emacs.c, eval.c, fileio.c, filelock.c, fns.c:
* font.c, fontset.c, frame.c, fringe.c, ftfont.c, ftxfont.c, gmalloc.c:
* gtkutil.c, image.c, keyboard.c, keymap.c, lread.c, macros.c, menu.c:
* nsfns.m, nsfont.m, nsmenu.m, nsterm.m, print.c, process.c, ralloc.c:
* regex.c, region-cache.c, scroll.c, search.c, sound.c, syntax.c:
* sysdep.c, term.c, termcap.c, unexmacosx.c, window.c, xdisp.c:
* xfaces.c, xfns.c, xftfont.c, xgselect.c, xmenu.c, xrdb.c, xselect.c:
* xterm.c:
Omit needless casts involving void * pointers and allocation.
Prefer "P = xmalloc (sizeof *P)" to "P = xmalloc (sizeof (TYPE_OF_P))",
as the former is more robust if P's type is changed.
Prefer xzalloc to xmalloc + memset 0.
Simplify malloc-or-realloc to realloc.
Don't worry about xmalloc returning a null pointer.
Prefer xstrdup to xmalloc + strcpy.
* editfns.c (Fmessage_box): Grow message_text by at least 80 when
growing it.
* keyboard.c (apply_modifiers_uncached): Prefer local array to
alloca of a constant.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/callproc.c b/src/callproc.c index 0418e4e8cd5..39fcb99c4b5 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1174,7 +1174,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L | |||
| 1174 | on that. */ | 1174 | on that. */ |
| 1175 | pwd_var = xmalloc (i + 6); | 1175 | pwd_var = xmalloc (i + 6); |
| 1176 | #else | 1176 | #else |
| 1177 | pwd_var = (char *) alloca (i + 6); | 1177 | pwd_var = alloca (i + 6); |
| 1178 | #endif | 1178 | #endif |
| 1179 | temp = pwd_var + 4; | 1179 | temp = pwd_var + 4; |
| 1180 | memcpy (pwd_var, "PWD=", 4); | 1180 | memcpy (pwd_var, "PWD=", 4); |
| @@ -1242,7 +1242,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L | |||
| 1242 | } | 1242 | } |
| 1243 | 1243 | ||
| 1244 | /* new_length + 2 to include PWD and terminating 0. */ | 1244 | /* new_length + 2 to include PWD and terminating 0. */ |
| 1245 | env = new_env = (char **) alloca ((new_length + 2) * sizeof (char *)); | 1245 | env = new_env = alloca ((new_length + 2) * sizeof *env); |
| 1246 | /* If we have a PWD envvar, pass one down, | 1246 | /* If we have a PWD envvar, pass one down, |
| 1247 | but with corrected value. */ | 1247 | but with corrected value. */ |
| 1248 | if (egetenv ("PWD")) | 1248 | if (egetenv ("PWD")) |
| @@ -1250,7 +1250,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L | |||
| 1250 | 1250 | ||
| 1251 | if (STRINGP (display)) | 1251 | if (STRINGP (display)) |
| 1252 | { | 1252 | { |
| 1253 | char *vdata = (char *) alloca (sizeof "DISPLAY=" + SBYTES (display)); | 1253 | char *vdata = alloca (sizeof "DISPLAY=" + SBYTES (display)); |
| 1254 | strcpy (vdata, "DISPLAY="); | 1254 | strcpy (vdata, "DISPLAY="); |
| 1255 | strcat (vdata, SSDATA (display)); | 1255 | strcat (vdata, SSDATA (display)); |
| 1256 | new_env = add_env (env, new_env, vdata); | 1256 | new_env = add_env (env, new_env, vdata); |