From 8e858e2700651a0e973169b579622cd3dcd0defd Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 7 Mar 2007 09:35:43 +0000 Subject: [PATCH] clean up accumulated whitespace damage --- coreutils/od_bloaty.c | 6 +++--- editors/sed.c | 2 +- editors/vi.c | 2 +- include/libbb.h | 2 +- include/usage.h | 6 +++--- libbb/create_icmp_socket.c | 2 +- libbb/getopt32.c | 6 +++--- libbb/read.c | 2 +- libbb/xfuncs.c | 2 +- loginutils/adduser.c | 2 +- miscutils/less.c | 4 ++-- networking/httpd.c | 7 ++++--- networking/ifupdown.c | 2 +- networking/udhcp/domain_codec.c | 2 +- selinux/selinuxenabled.c | 2 +- shell/ash.c | 2 +- shell/ash_test/printenv.c | 2 +- shell/msh.c | 2 +- util-linux/fdisk_sgi.c | 6 +++--- 19 files changed, 31 insertions(+), 30 deletions(-) diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index c69470a14..74765f842 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c @@ -542,7 +542,7 @@ check_and_close(void) fmt = SIGNED_DECIMAL; size = INT or LONG; (whichever integral_type_size[4] resolves to) print_function = print_int; (assuming size == INT) - fmt_string = "%011d%c"; + fmt_string = "%011d%c"; } S_ORIG is solely for reporting errors. It should be the full format string argument. */ @@ -823,7 +823,7 @@ skip(off_t n_skip) n_bytes_read = fread(buf, 1, n_bytes_to_read, in_stream); n_skip -= n_bytes_read; if (n_bytes_read != n_bytes_to_read) - break; /* EOF on this file or error */ + break; /* EOF on this file or error */ } } if (n_skip == 0) @@ -1334,7 +1334,7 @@ int od_main(int argc, char **argv) /* If the --traditional option is used, there may be from * 0 to 3 remaining command line arguments; handle each case * separately. - * od [file] [[+]offset[.][b] [[+]label[.][b]]] + * od [file] [[+]offset[.][b] [[+]label[.][b]]] * The offset and pseudo_start have the same syntax. * * FIXME: POSIX 1003.1-2001 with XSI requires support for the diff --git a/editors/sed.c b/editors/sed.c index b8f00c0c9..c434eee1b 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -896,7 +896,7 @@ restart: /* or does this line matches our last address regex */ || (sed_cmd->end_match && old_matched && (regexec(sed_cmd->end_match, - pattern_space, 0, NULL, 0) == 0)) + pattern_space, 0, NULL, 0) == 0)) ); } diff --git a/editors/vi.c b/editors/vi.c index 45a80517d..6898e61a4 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -84,7 +84,7 @@ enum { S_TO_WS = 2, // used in skip_thing() for moving "dot" S_OVER_WS = 3, // used in skip_thing() for moving "dot" S_END_PUNCT = 4, // used in skip_thing() for moving "dot" - S_END_ALNUM = 5 // used in skip_thing() for moving "dot" + S_END_ALNUM = 5, // used in skip_thing() for moving "dot" }; typedef unsigned char Byte; diff --git a/include/libbb.h b/include/libbb.h index 809d8446a..9aa060691 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -575,7 +575,7 @@ int bb_execvp(const char *file, char *const argv[]); cmd, __VA_ARGS__) #else #define BB_EXECVP(prog,cmd) execvp(prog,cmd) -#define BB_EXECLP(prog,cmd,...) execlp(prog,cmd, __VA_ARGS__) +#define BB_EXECLP(prog,cmd,...) execlp(prog,cmd, __VA_ARGS__) #endif USE_DESKTOP(long long) int uncompress(int fd_in, int fd_out); diff --git a/include/usage.h b/include/usage.h index 04dddd7c3..5073c9b8a 100644 --- a/include/usage.h +++ b/include/usage.h @@ -60,7 +60,7 @@ "[-vn] [-H type] [-i if] -a [hostname]\n" \ "[-v] [-i if] -d hostname [pub]\n" \ "[-v] [-H type] [-i if] -s hostname hw_addr [temp]\n" \ - "[-v] [-H type] [-i if] -s hostname hw_addr [netmask nm] pub\n" \ + "[-v] [-H type] [-i if] -s hostname hw_addr [netmask nm] pub\n" \ "[-v] [-H type] [-i if] -Ds hostname ifa [netmask nm] pub\n" #define arp_full_usage \ "Manipulate the system ARP cache" \ @@ -269,7 +269,7 @@ "Change the process state and run specified program" \ "\n\nOptions:\n" \ " -u user[:grp] Set uid and gid\n" \ - " -U user[:grp] Set environment variables UID and GID\n" \ + " -U user[:grp] Set environment variables UID and GID\n" \ " -e dir Set environment variables as specified by files\n" \ " in the directory: file=1st_line_of_file\n" \ " -/ dir Chroot to dir\n" \ @@ -1776,7 +1776,7 @@ #define ls_trivial_usage \ "[-1Aa" USE_FEATURE_LS_TIMESTAMPS("c") "Cd" \ - USE_FEATURE_LS_TIMESTAMPS("e") USE_FEATURE_LS_FILETYPES("F") "iln" \ + USE_FEATURE_LS_TIMESTAMPS("e") USE_FEATURE_LS_FILETYPES("F") "iln" \ USE_FEATURE_LS_FILETYPES("p") USE_FEATURE_LS_FOLLOWLINKS("L") \ USE_FEATURE_LS_RECURSIVE("R") USE_FEATURE_LS_SORTFILES("rS") "s" \ USE_FEATURE_AUTOWIDTH("T") USE_FEATURE_LS_TIMESTAMPS("tu") \ diff --git a/libbb/create_icmp_socket.c b/libbb/create_icmp_socket.c index 666454888..dbd4769f6 100644 --- a/libbb/create_icmp_socket.c +++ b/libbb/create_icmp_socket.c @@ -22,7 +22,7 @@ int create_icmp_socket(void) * proto->p_proto to have the correct value for "icmp" */ sock = socket(AF_INET, SOCK_RAW, (proto ? proto->p_proto : 1)); /* 1 == ICMP */ - if (sock < 0) { + if (sock < 0) { if (errno == EPERM) bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket); diff --git a/libbb/getopt32.c b/libbb/getopt32.c index f93438df0..9f5fd60bd 100644 --- a/libbb/getopt32.c +++ b/libbb/getopt32.c @@ -79,9 +79,9 @@ const struct option *applet_long_options (see getopt(3)) static const struct option applet_long_options[] = { - //name,has_arg,flag,val - { "verbose", 0, 0, 'v' }, - { 0, 0, 0, 0 } + //name,has_arg,flag,val + { "verbose", 0, 0, 'v' }, + { 0, 0, 0, 0 } }; applet_long_options = applet_long_options; diff --git a/libbb/read.c b/libbb/read.c index 861828da1..c05b26b50 100644 --- a/libbb/read.c +++ b/libbb/read.c @@ -129,7 +129,7 @@ void *xmalloc_open_read_close(const char *filename, size_t *sizep) buf = xmalloc(size + 1); size = read_close(fd, buf, size); if ((ssize_t)size < 0) - bb_perror_msg_and_die("'%s'", filename); + bb_perror_msg_and_die("'%s'", filename); xrealloc(buf, size + 1); buf[size] = '\0'; if (sizep) *sizep = size; diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index f6444bbc6..2cc6a8299 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -522,7 +522,7 @@ void bb_sanitize_stdio_maybe_daemonize(int daemonize) bb_perror_msg_and_die("fork"); if (pid) /* parent */ exit(0); - /* child */ + /* child */ /* if daemonizing, make sure we detach from stdio */ setsid(); dup2(fd, 0); diff --git a/loginutils/adduser.c b/loginutils/adduser.c index b6d0c62ea..e0cdd1ced 100644 --- a/loginutils/adduser.c +++ b/loginutils/adduser.c @@ -101,7 +101,7 @@ static int adduser(struct passwd *p, unsigned long flags) bb_error_msg_and_die("illegal uid or no uids left"); case 3: bb_error_msg_and_die("%s: group name already in use", p->pw_name); - } + } /* add to passwd */ if (putpwent(p, file) == -1) { diff --git a/miscutils/less.c b/miscutils/less.c index 1be5d3520..3db7c9cdb 100644 --- a/miscutils/less.c +++ b/miscutils/less.c @@ -883,13 +883,13 @@ static void number_process(int first_digit) break; case 'g': case '<': case 'G': case '>': cur_fline = num + max_displayed_line; - read_lines(); + read_lines(); buffer_line(num - 1); break; case 'p': case '%': num = num * (max_fline / 100); /* + max_fline / 2; */ cur_fline = num + max_displayed_line; - read_lines(); + read_lines(); buffer_line(num); break; #if ENABLE_FEATURE_LESS_REGEXP diff --git a/networking/httpd.c b/networking/httpd.c index cb8ab763f..ee408eb14 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -873,8 +873,9 @@ static int sendHeaders(HttpResponseNum responseNum) #if ENABLE_FEATURE_HTTPD_BASIC_AUTH if (responseNum == HTTP_UNAUTHORIZED) { - len += sprintf(buf+len, "WWW-Authenticate: Basic realm=\"%s\"\r\n", - config->realm); + len += sprintf(buf+len, + "WWW-Authenticate: Basic realm=\"%s\"\r\n", + config->realm); } #endif if (responseNum == HTTP_MOVED_TEMPORARILY) { @@ -2000,7 +2001,7 @@ int httpd_main(int argc, char *argv[]) if (opt & OPT_SETUID) { if (ugid.gid != (gid_t)-1) { if (setgroups(1, &ugid.gid) == -1) - bb_perror_msg_and_die("setgroups"); + bb_perror_msg_and_die("setgroups"); xsetgid(ugid.gid); } xsetuid(ugid.uid); diff --git a/networking/ifupdown.c b/networking/ifupdown.c index c7cb85350..8e750feaf 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -421,7 +421,7 @@ static int static_up(struct interface_defn_t *ifd, execfn *exec) result += execute("ifconfig %iface% %address% netmask %netmask%" "[[ broadcast %broadcast%]][[ pointopoint %pointopoint%]] ", ifd, exec); - result += execute("[[route add default gw %gateway% %iface%]]", ifd, exec); + result += execute("[[route add default gw %gateway% %iface%]]", ifd, exec); return ((result == 3) ? 3 : 0); #endif } diff --git a/networking/udhcp/domain_codec.c b/networking/udhcp/domain_codec.c index 6e16ddedc..239ae5b5c 100644 --- a/networking/udhcp/domain_codec.c +++ b/networking/udhcp/domain_codec.c @@ -200,6 +200,6 @@ uint8_t *dname_enc(const uint8_t *cstr, int clen, const char *src, int *retlen) *retlen = d - dname + 1; return dname; -} +} #endif /* ENABLE_FEATURE_RFC3397 */ diff --git a/selinux/selinuxenabled.c b/selinux/selinuxenabled.c index 400995af0..c93ba706f 100644 --- a/selinux/selinuxenabled.c +++ b/selinux/selinuxenabled.c @@ -1,6 +1,6 @@ /* * selinuxenabled - * + * * Based on libselinux 1.33.1 * Port to BusyBox Hiroshi Shinji * diff --git a/shell/ash.c b/shell/ash.c index f32c31180..bfa4a8c6d 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -11197,7 +11197,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path) goto builtin_success; } else if (builtinloc <= 0) { goto builtin_success; - } + } } /* We have to search path. */ diff --git a/shell/ash_test/printenv.c b/shell/ash_test/printenv.c index 07ea2a9f0..06df21fdc 100644 --- a/shell/ash_test/printenv.c +++ b/shell/ash_test/printenv.c @@ -30,7 +30,7 @@ extern char **environ; int -main (argc, argv) +main (argc, argv) int argc; char **argv; { diff --git a/shell/msh.c b/shell/msh.c index 968f073cd..58c498b61 100644 --- a/shell/msh.c +++ b/shell/msh.c @@ -3723,7 +3723,7 @@ static char *evalstr(char *cp, int f) if (wb == NULL || wb->w_nword == 0 || (cp = wb->w_words[0]) == NULL ) { -// TODO: I suspect that +// TODO: I suspect that // char *evalstr(char *cp, int f) is actually // const char *evalstr(const char *cp, int f)! cp = (char*)""; diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c index bb354d8d9..937ac883b 100644 --- a/util-linux/fdisk_sgi.c +++ b/util-linux/fdisk_sgi.c @@ -356,9 +356,9 @@ sgi_set_swappartition(int i) static int sgi_check_bootfile(const char* aFile) { - if (strlen(aFile) < 3) /* "/a\n" is minimum */ { - printf(_("\nInvalid Bootfile!\n" - "\tThe bootfile must be an absolute non-zero pathname,\n" + if (strlen(aFile) < 3) /* "/a\n" is minimum */ { + printf(_("\nInvalid Bootfile!\n" + "\tThe bootfile must be an absolute non-zero pathname,\n" "\te.g. \"/unix\" or \"/unix.save\".\n")); return 0; } else {