From a4a287391f00c8b39f29aa4af752985b5150fd0b Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 31 Mar 2012 20:34:05 +0200 Subject: [PATCH] Fix some indentation in various places. --- games/fortune/fortune/fortune.c | 7 ++----- lib/libc/gen/ualarm.c | 5 ++--- sbin/ip6fw/ip6fw.c | 4 ++-- usr.bin/fmt/fmt.c | 4 ++-- usr.bin/rlogin/rlogin.c | 3 +-- usr.bin/talk/ctl.c | 4 ++-- usr.bin/whereis/whereis.c | 4 ++-- usr.bin/yacc/output.c | 2 +- usr.sbin/keyserv/crypt_server.c | 3 +-- 9 files changed, 15 insertions(+), 21 deletions(-) diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c index c02b0ec64a..76b2427535 100644 --- a/games/fortune/fortune/fortune.c +++ b/games/fortune/fortune/fortune.c @@ -33,8 +33,6 @@ * @(#)fortune.c 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/games/fortune/fortune/fortune.c,v 1.18.2.1 2001/07/02 00:35:27 dd Exp $ */ -/* $FreeBSD: src/games/fortune/fortune/fortune.c,v 1.18.2.1 2001/07/02 00:35:27 dd Exp $ */ -/* $DragonFly: src/games/fortune/fortune/fortune.c,v 1.6 2006/08/08 16:58:59 pavalos Exp $ */ #include #include @@ -951,9 +949,8 @@ get_fort(void) " skip \"%s\", %d%% (choice = %d)\n", fp->name, fp->percent, choice)); } - DPRINTF(1, (stderr, - "using \"%s\", %d%% (choice = %d)\n", - fp->name, fp->percent, choice)); + DPRINTF(1, (stderr, "using \"%s\", %d%% (choice = %d)\n", + fp->name, fp->percent, choice)); } if (fp->percent != NO_PROB) get_tbl(fp); diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c index 77e4615976..881b922e0b 100644 --- a/lib/libc/gen/ualarm.c +++ b/lib/libc/gen/ualarm.c @@ -31,7 +31,6 @@ * SUCH DAMAGE. * * @(#)ualarm.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libc/gen/ualarm.c,v 1.4 2005/11/13 00:07:42 swildner Exp $ */ #include @@ -57,6 +56,6 @@ ualarm(unsigned usecs, unsigned reload) if (setitimer(ITIMER_REAL, &new, &old) == 0) return (old.it_value.tv_sec * USPS + old.it_value.tv_usec); - /* else */ - return (-1); + + return (-1); } diff --git a/sbin/ip6fw/ip6fw.c b/sbin/ip6fw/ip6fw.c index 0d0ddf3e81..751aade7b3 100644 --- a/sbin/ip6fw/ip6fw.c +++ b/sbin/ip6fw/ip6fw.c @@ -1176,7 +1176,7 @@ ip6fw_main(int ac, char **av) do_force = !isatty(STDIN_FILENO); while ((ch = getopt(ac, av ,"afqtN")) != -1) - switch(ch) { + switch(ch) { case 'a': do_acct=1; break; @@ -1194,7 +1194,7 @@ ip6fw_main(int ac, char **av) break; default: show_usage(NULL); - } + } ac -= optind; if (*(av+=optind)==NULL) { diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c index 1ff93bf45e..32bf2517cb 100644 --- a/usr.bin/fmt/fmt.c +++ b/usr.bin/fmt/fmt.c @@ -256,7 +256,7 @@ main(int argc, char *argv[]) { /* 1. Grok parameters. */ while ((ch = getopt(argc, argv, "0123456789cd:hl:mnpst:w:")) != -1) - switch(ch) { + switch(ch) { case 'c': centerP = 1; format_troff = 1; @@ -316,7 +316,7 @@ main(int argc, char *argv[]) { " -w set maximum width to \n" " goal set target width to goal\n"); exit(ch=='h' ? 0 : EX_USAGE); - } + } argc -= optind; argv += optind; /* [ goal [ maximum ] ] */ diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c index a9f35503e0..a9cde4a771 100644 --- a/usr.bin/rlogin/rlogin.c +++ b/usr.bin/rlogin/rlogin.c @@ -40,7 +40,6 @@ * @(#) Copyright (c) 1983, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)rlogin.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/rlogin/rlogin.c,v 1.30 2002/04/28 11:16:43 markm Exp $ - * $DragonFly: src/usr.bin/rlogin/rlogin.c,v 1.7 2005/02/15 01:24:49 cpressey Exp $ */ /* @@ -317,7 +316,7 @@ main(int argc, char *argv[]) newargv[0] = argv[0]; newargv[1] = "-K"; for(i = 1; i < argc; ++i) - newargv[i + 1] = argv[i]; + newargv[i + 1] = argv[i]; newargv[argc + 1] = NULL; execv(_PATH_RLOGIN, newargv); } diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c index 3f667f141f..7f7b312a50 100644 --- a/usr.bin/talk/ctl.c +++ b/usr.bin/talk/ctl.c @@ -105,7 +105,7 @@ print_addr(struct sockaddr_in addr) printf("addr = %lx, port = %o, family = %o zero = ", (u_long)addr.sin_addr.s_addr, addr.sin_port, addr.sin_family); - for (i = 0; i<8;i++) - printf("%o ", (int)addr.sin_zero[i]); + for (i = 0; i < 8; i++) + printf("%o ", (int)addr.sin_zero[i]); putchar('\n'); } diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c index 51ebfb3957..35e8e5f471 100644 --- a/usr.bin/whereis/whereis.c +++ b/usr.bin/whereis/whereis.c @@ -164,7 +164,7 @@ scanopts(int argc, char **argv) default: usage(); } - breakout: +breakout: if (optind == argc) usage(); query = argv + optind; @@ -634,7 +634,7 @@ main(int argc, char **argv) pclose(p); free(cp); } - done_sources: +done_sources: if (opt_u && !unusual) continue; diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c index 3d8cf9102a..cf88d37ef1 100644 --- a/usr.bin/yacc/output.c +++ b/usr.bin/yacc/output.c @@ -296,7 +296,7 @@ token_actions(void) if (parser[i]) { for (j = 0; j < 2*ntokens; ++j) - actionrow[j] = 0; + actionrow[j] = 0; shiftcount = 0; reducecount = 0; diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c index 2f3398ab7c..6bd332c281 100644 --- a/usr.sbin/keyserv/crypt_server.c +++ b/usr.sbin/keyserv/crypt_server.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/keyserv/crypt_server.c,v 1.6.2.1 2001/07/19 04:21:20 kris Exp $ - * $DragonFly: src/usr.sbin/keyserv/crypt_server.c,v 1.6 2005/12/05 01:04:01 swildner Exp $ */ #include @@ -90,7 +89,7 @@ prepare_key(unsigned char *key_data_ptr, int key_data_len, arcfour_key *key) state = &key->state[0]; for(counter = 0; counter < 256; counter++) - state[counter] = counter; + state[counter] = counter; key->x = 0; key->y = 0; index1 = 0; -- 2.41.0