From f98df54969e42ca1a89486ac41faf496d4e46ec6 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Mon, 1 Jan 2007 12:52:09 +0000 Subject: [PATCH] cleanup: Various simple whitespace changes. Organization: Straylight/Edgeware From: Mark Wooding --- client/tripectl.c | 9 ++------- pkstream/pkstream.c | 12 +++--------- proxy/tripe-mitm.c | 8 ++------ server/admin.c | 28 ++++++++++++++-------------- server/tripe.c | 5 +---- 5 files changed, 22 insertions(+), 40 deletions(-) diff --git a/client/tripectl.c b/client/tripectl.c index 4aece8d1..7386b304 100644 --- a/client/tripectl.c +++ b/client/tripectl.c @@ -268,10 +268,7 @@ static void logfile(const char *name) } } -static void sighup(int sig, void *v) -{ - logfile(logname); -} +static void sighup(int sig, void *v) { logfile(logname); } static void cleanup(void) { @@ -287,9 +284,7 @@ static void sigdie(int sig) } static void version(FILE *fp) -{ - pquis(fp, "$, TrIPE version " VERSION "\n"); -} + { pquis(fp, "$, TrIPE version " VERSION "\n"); } static void usage(FILE *fp) { diff --git a/pkstream/pkstream.c b/pkstream/pkstream.c index e291a9bd..6e36adc2 100644 --- a/pkstream/pkstream.c +++ b/pkstream/pkstream.c @@ -89,14 +89,10 @@ static size_t pk_nmax = 128, pk_szmax = 1024 * 1024; /*----- Main code ---------------------------------------------------------*/ static int nonblockify(int fd) -{ - return (fdflags(fd, O_NONBLOCK, O_NONBLOCK, 0, 0)); -} + { return (fdflags(fd, O_NONBLOCK, O_NONBLOCK, 0, 0)); } static int cloexec(int fd) -{ - return (fdflags(fd, 0, 0, FD_CLOEXEC, FD_CLOEXEC)); -} + { return (fdflags(fd, 0, 0, FD_CLOEXEC, FD_CLOEXEC)); } static void dolisten(void); @@ -318,9 +314,7 @@ static void usage(FILE *fp) } static void version(FILE *fp) -{ - pquis(fp, "$, tripe version " VERSION "\n"); -} + { pquis(fp, "$, tripe version " VERSION "\n"); } static void help(FILE *fp) { diff --git a/proxy/tripe-mitm.c b/proxy/tripe-mitm.c index 9aa29901..107362ee 100644 --- a/proxy/tripe-mitm.c +++ b/proxy/tripe-mitm.c @@ -603,14 +603,10 @@ static void parse(char *p) /*----- Main driver -------------------------------------------------------*/ static void version(FILE *fp) -{ - pquis(fp, "$, TrIPE version " VERSION "\n"); -} + { pquis(fp, "$, TrIPE version " VERSION "\n"); } static void usage(FILE *fp) -{ - pquis(fp, "Usage: $ [-k KEYRING] DIRECTIVE...\n"); -} + { pquis(fp, "Usage: $ [-k KEYRING] DIRECTIVE...\n"); } static void help(FILE *fp) { diff --git a/server/admin.c b/server/admin.c index b0dd5cb8..44c9b2b3 100644 --- a/server/admin.c +++ b/server/admin.c @@ -338,6 +338,7 @@ static void a_vwrite(admin *a, const char *status, const char *tag, const char *fmt, va_list ap) { dstr d = DSTR_INIT; + if (tag) dstr_puts(&d, "BG"); dstr_puts(&d, status); if (tag) quotify(&d, tag); @@ -351,6 +352,7 @@ static void a_write(admin *a, const char *status, const char *tag, const char *fmt, ...) { va_list ap; + va_start(ap, fmt); a_vwrite(a, status, tag, fmt, ap); va_end(ap); @@ -372,6 +374,7 @@ static void a_ok(admin *a) { a_write(a, "OK", 0, A_END); } static void a_info(admin *a, const char *fmt, ...) { va_list ap; + va_start(ap, fmt); a_vwrite(a, "INFO", 0, fmt, ap); va_end(ap); @@ -380,6 +383,7 @@ static void a_info(admin *a, const char *fmt, ...) static void a_fail(admin *a, const char *fmt, ...) { va_list ap; + va_start(ap, fmt); a_vwrite(a, "FAIL", 0, fmt, ap); va_end(ap); @@ -442,6 +446,7 @@ static void a_alert(unsigned f_and, unsigned f_eq, const char *status, const char *fmt, ...) { va_list ap; + va_start(ap, fmt); a_valert(f_and, f_eq, status, fmt, ap); va_end(ap); @@ -570,9 +575,7 @@ static void a_sigdie(int sig, void *v) */ static void a_sighup(int sig, void *v) -{ - a_warn("SERVER", "ignore", "signal", "SIGHUP", A_END); -} + { a_warn("SERVER", "ignore", "signal", "SIGHUP", A_END); } /* --- @a_parsetime@ --- * * @@ -1174,9 +1177,7 @@ static void acmd_trace(admin *a, unsigned ac, char *av[]) #endif static void acmd_watch(admin *a, unsigned ac, char *av[]) -{ - traceish(a, ac, av, "watch", w_opts, &a->f); -} + { traceish(a, ac, av, "watch", w_opts, &a->f); } static void alertcmd(admin *a, unsigned f_and, unsigned f_eq, const char *tag, unsigned ac, char *av[]) @@ -1199,10 +1200,7 @@ static void acmd_warn(admin *a, unsigned ac, char *av[]) { alertcmd(a, AF_WARN, AF_WARN, "WARN", ac, av); } static void acmd_port(admin *a, unsigned ac, char *av[]) -{ - a_info(a, "%u", p_port(), A_END); - a_ok(a); -} + { a_info(a, "%u", p_port(), A_END); a_ok(a); } static void acmd_daemon(admin *a, unsigned ac, char *av[]) { @@ -1224,6 +1222,7 @@ static void acmd_daemon(admin *a, unsigned ac, char *av[]) static void acmd_list(admin *a, unsigned ac, char *av[]) { peer *p; + for (p = p_first(); p; p = p_next(p)) a_info(a, "%s", p_name(p), A_END); a_ok(a); @@ -1357,6 +1356,7 @@ static void acmd_stats(admin *a, unsigned ac, char *av[]) static void acmd_kill(admin *a, unsigned ac, char *av[]) { peer *p; + if ((p = a_findpeer(a, av[0])) != 0) { p_destroy(p); a_ok(a); @@ -1366,6 +1366,7 @@ static void acmd_kill(admin *a, unsigned ac, char *av[]) static void acmd_forcekx(admin *a, unsigned ac, char *av[]) { peer *p; + if ((p = a_findpeer(a, av[0])) != 0) { kx_start(&p->kx, 1); a_ok(a); @@ -1392,6 +1393,7 @@ static void acmd_version(admin *a, unsigned ac, char *av[]) static void acmd_tunnels(admin *a, unsigned ac, char *av[]) { int i; + for (i = 0; tunnels[i]; i++) a_info(a, "%s", tunnels[i]->name, A_END); a_ok(a); @@ -1443,6 +1445,7 @@ static const acmd acmdtab[] = { static void acmd_help(admin *a, unsigned ac, char *av[]) { const acmd *c; + for (c = acmdtab; c->name; c++) { if (c->help) a_info(a, "%s", c->name, "*%s", c->help, A_END); @@ -1687,10 +1690,7 @@ static void a_accept(int fd, unsigned mode, void *v) * Use: Informs the admin module that it's a daemon. */ -void a_daemon(void) -{ - flags |= F_DAEMON; -} +void a_daemon(void) { flags |= F_DAEMON; } /* --- @a_init@ --- * * diff --git a/server/tripe.c b/server/tripe.c index be37617a..7e4ffc07 100644 --- a/server/tripe.c +++ b/server/tripe.c @@ -96,10 +96,7 @@ static void usage(FILE *fp) [-k PRIV-KEYRING] [-K PUB-KEYRING] [-t KEY-TAG]\n"); } -static void version(FILE *fp) -{ - pquis(fp, "$, version " VERSION "\n"); -} +static void version(FILE *fp) { pquis(fp, "$, version " VERSION "\n"); } static void help(FILE *fp) { -- [mdw]