Revision

970

Author

kvv@apple.com

Date

2011-11-07 16:47:52 -0800 (Mon, 07 Nov 2011)

Log Message

- darwintrace: compiler warning build fix

Modified Paths

• trunk/CHANGES
• trunk/darwintrace/darwintrace.c

Diff

--- trunk/CHANGES	2011-11-07 21:05:19 UTC (rev 969)
+++ trunk/CHANGES	2011-11-08 00:47:52 UTC (rev 970)
@@ -1,5 +1,8 @@
 Darwin Build Scripts Change History
 -----------------------------------
+Release 26.1 [7-Nov-2011]
+	- darwintrace: compiler warning build fix
+
 Release 26 [6-Nov-2011]
 	- darwintrace: preserve DYLD_INSERT_LIBRARIES and DARWINTRACE_LOG
 	- darwintrace: interpose posix_spawn

--- trunk/darwintrace/darwintrace.c	2011-11-07 21:05:19 UTC (rev 969)
+++ trunk/darwintrace/darwintrace.c	2011-11-08 00:47:52 UTC (rev 970)
@@ -565,9 +565,9 @@
   int result;
   char* redirpath = darwintrace_redirect_path(path);
   darwintrace_log_exec(redirpath, argv);
-  envp = darwintrace_make_environ(envp);
-  result = execve(redirpath, argv, envp);
-  darwintrace_free_environ(envp);
+  char *const *new_envp = darwintrace_make_environ(envp);
+  result = execve(redirpath, argv, new_envp);
+  darwintrace_free_environ(new_envp);
   darwintrace_free_path(redirpath, path);
   return result;
 }
@@ -585,9 +585,9 @@
   int result;
   char* redirpath = darwintrace_redirect_path(path);
   darwintrace_log_exec(redirpath, argv);
-  envp = darwintrace_make_environ(envp);
-  result = __posix_spawn(pid, redirpath, desc, argv, envp);
-  darwintrace_free_environ(envp);
+  char *const *new_envp = darwintrace_make_environ(envp);
+  result = __posix_spawn(pid, redirpath, desc, argv, new_envp);
+  darwintrace_free_environ(new_envp);
   darwintrace_free_path(redirpath, path);
   return result;
 }