* callproc.c (child_setup): Rewrite to avoid two strlen calls.

diff --git a/src/ChangeLog b/src/ChangeLog
index b843dfc6965152f2689f42c2fe2224dea3fb4fee..bcf40a4e470430f0087f80ac8c37212522f22695 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-19  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * callproc.c (child_setup): Rewrite to avoid two strlen calls.
+
        * process.c (Fformat_network_address): Use EMACS_INT, not EMACS_UINT.
        We prefer signed integers, even for size calculations.
 

diff --git a/src/callproc.c b/src/callproc.c
index fae47b7a699fe9f341d883716dc2fbf50bcd2b60..12621c90db50ed8643d9279729d2b926acf5821d 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1230,8 +1230,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
 
     if (STRINGP (display))
       {
-       int vlen = strlen ("DISPLAY=") + strlen (SSDATA (display)) + 1;
-       char *vdata = (char *) alloca (vlen);
+       char *vdata = (char *) alloca (sizeof "DISPLAY=" + SBYTES (display));
        strcpy (vdata, "DISPLAY=");
        strcat (vdata, SSDATA (display));
        new_env = add_env (env, new_env, vdata);