commit 962c2f87766f200eb364e839038fafe50ddb0a93 Author: Roger Dingledine arma@torproject.org Date: Fri May 11 16:27:55 2018 -0400
get rid of whitespace before #ifdef's
i don't know if whitespace is ok to have before preprocessing directives on all platforms, but anyway we almost never have it, so now things are more uniform. --- src/or/control.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/or/control.c b/src/or/control.c index 6f87f5ab5..9323173f5 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1861,24 +1861,24 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "process/pid")) { int myPid = -1;
- #ifdef _WIN32 +#ifdef _WIN32 myPid = _getpid(); - #else +#else myPid = getpid(); - #endif +#endif
tor_asprintf(answer, "%d", myPid); } else if (!strcmp(question, "process/uid")) { - #ifdef _WIN32 +#ifdef _WIN32 *answer = tor_strdup("-1"); - #else +#else int myUid = geteuid(); tor_asprintf(answer, "%d", myUid); #endif /* defined(_WIN32) */ } else if (!strcmp(question, "process/user")) { - #ifdef _WIN32 +#ifdef _WIN32 *answer = tor_strdup(""); - #else +#else int myUid = geteuid(); const struct passwd *myPwEntry = tor_getpwuid(myUid);
tor-commits@lists.torproject.org