[git commit branch/0.9.33] ldd: tweak whitespace
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Tue May 15 07:17:03 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=2e1ed3f8121e60bbf7f4943f716e8caa3e89740a
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/0.9.33
Tweak whitespace in preprocessor conditionals. No obj-code changes.
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
utils/ldd.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/utils/ldd.c b/utils/ldd.c
index ed7dfa5..04fbbc6 100644
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -705,9 +705,8 @@ foo:
"LD_TRACE_LOADED_OBJECTS=1",
NULL
};
+# ifdef __LDSO_STANDALONE_SUPPORT__
char * lib_path = getenv("LD_LIBRARY_PATH");
-
-#ifdef __LDSO_STANDALONE_SUPPORT__
/* The 'extended' environment inclusing the LD_LIBRARY_PATH */
static char *ext_environment[ARRAY_SIZE(environment) + 1];
char **envp = (char **) environment;
@@ -742,21 +741,21 @@ foo:
execle(TRUSTED_LDSO, TRUSTED_LDSO, filename, NULL, envp);
_exit(0xdead);
}
-#else
+# else
if ((pid = vfork()) == 0) {
/* Cool, it looks like we should be able to actually
* run this puppy. Do so now... */
execle(filename, filename, NULL, environment);
_exit(0xdead);
}
-#endif
+# endif
/* Wait till it returns */
waitpid(pid, &status, 0);
-#ifdef __LDSO_STANDALONE_SUPPORT__
+# ifdef __LDSO_STANDALONE_SUPPORT__
/* Do not leak */
free(lib_path);
-#endif
+# endif
if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
return 1;
More information about the uClibc-cvs
mailing list