aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-05-15 09:11:01 +0200
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-05-15 09:17:03 +0200
commit2e1ed3f8121e60bbf7f4943f716e8caa3e89740a (patch)
treedf1e403f8f60c7d664e3b9fa604fa0abf909dbcf
parent07396f23e5ee50ff985ffd04d91960fac8d74022 (diff)
downloaduClibc-2e1ed3f8121e60bbf7f4943f716e8caa3e89740a.tar.gz
uClibc-2e1ed3f8121e60bbf7f4943f716e8caa3e89740a.tar.bz2
ldd: tweak whitespace
Tweak whitespace in preprocessor conditionals. No obj-code changes. Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--utils/ldd.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/utils/ldd.c b/utils/ldd.c
index ed7dfa5f4..04fbbc684 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;