*: whitespace fixes, no code changes

This commit is contained in:
Denis Vlasenko 2008-03-24 02:18:03 +00:00
parent 42cc304e90
commit c693840fe8
13 changed files with 53 additions and 53 deletions

View File

@ -74,7 +74,7 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
int patch_level; int patch_level;
int ret = 0; int ret = 0;
xfunc_error_retval = 2; xfunc_error_retval = 2;
{ {
const char *p = "-1"; const char *p = "-1";
const char *i = "-"; /* compat */ const char *i = "-"; /* compat */
@ -114,7 +114,7 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
if (!patch_line || strncmp(patch_line, "+++ ", 4) != 0) if (!patch_line || strncmp(patch_line, "+++ ", 4) != 0)
bb_error_msg_and_die("invalid patch"); bb_error_msg_and_die("invalid patch");
new_filename = extract_filename_and_free_line(patch_line, patch_level); new_filename = extract_filename_and_free_line(patch_line, patch_level);
/* Get access rights from the file to be patched, -1 file does not exist */ /* Get access rights from the file to be patched, -1 file does not exist */
if (stat(new_filename, &saved_stat) != 0) { if (stat(new_filename, &saved_stat) != 0) {
char *line_ptr; char *line_ptr;

View File

@ -419,7 +419,7 @@ int vi_main(int argc, char **argv)
/* fall through */ /* fall through */
default: default:
bb_show_usage(); bb_show_usage();
return 1; return 1;
} }
} }

View File

@ -230,8 +230,8 @@ static void console_init(void)
/* Give me _ANY_ open descriptor! */ /* Give me _ANY_ open descriptor! */
fd = xopen("/", O_RDONLY); /* we don't believe this can fail */ fd = xopen("/", O_RDONLY); /* we don't believe this can fail */
} }
while ((unsigned)fd < 2) while ((unsigned)fd < 2)
fd = dup(fd); fd = dup(fd);
if (fd > 2) if (fd > 2)
close(fd); close(fd);
} }

View File

@ -89,7 +89,7 @@ void print_login_issue(const char *issue_file, const char *tty)
void print_login_prompt(void) void print_login_prompt(void)
{ {
char *hostname = safe_gethostname(); char *hostname = safe_gethostname();
fputs(hostname, stdout); fputs(hostname, stdout);
fputs(LOGIN, stdout); fputs(LOGIN, stdout);
fflush(stdout); fflush(stdout);

View File

@ -45,7 +45,7 @@ char *safe_gethostname(void)
* name and an 8-byte nodename), but this is true on Linux. The same holds * name and an 8-byte nodename), but this is true on Linux. The same holds
* for setdomainname(2) and the domainname field. * for setdomainname(2) and the domainname field.
*/ */
/* Uname can fail only if you pass a bad pointer to it. */ /* Uname can fail only if you pass a bad pointer to it. */
uname(&uts); uname(&uts);

View File

@ -5,19 +5,19 @@
* *
* ifenslave.c: Configure network interfaces for parallel routing. * ifenslave.c: Configure network interfaces for parallel routing.
* *
* This program controls the Linux implementation of running multiple * This program controls the Linux implementation of running multiple
* network interfaces in parallel. * network interfaces in parallel.
* *
* Author: Donald Becker <becker@cesdis.gsfc.nasa.gov> * Author: Donald Becker <becker@cesdis.gsfc.nasa.gov>
* Copyright 1994-1996 Donald Becker * Copyright 1994-1996 Donald Becker
* *
* This program is free software; you can redistribute it * This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General Public * and/or modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation. * License as published by the Free Software Foundation.
* *
* The author may be reached as becker@CESDIS.gsfc.nasa.gov, or C/O * The author may be reached as becker@CESDIS.gsfc.nasa.gov, or C/O
* Center of Excellence in Space Data and Information Sciences * Center of Excellence in Space Data and Information Sciences
* Code 930.5, Goddard Space Flight Center, Greenbelt MD 20771 * Code 930.5, Goddard Space Flight Center, Greenbelt MD 20771
* *
* Changes : * Changes :
* - 2000/10/02 Willy Tarreau <willy at meta-x.org> : * - 2000/10/02 Willy Tarreau <willy at meta-x.org> :
@ -79,23 +79,23 @@
* current version is 1.0.0 as a base line. * current version is 1.0.0 as a base line.
* *
* - 2003/05/22 - Jay Vosburgh <fubar at us dot ibm dot com> * - 2003/05/22 - Jay Vosburgh <fubar at us dot ibm dot com>
* - ifenslave -c was broken; it's now fixed * - ifenslave -c was broken; it's now fixed
* - Fixed problem with routes vanishing from master during enslave * - Fixed problem with routes vanishing from master during enslave
* processing. * processing.
* *
* - 2003/05/27 - Amir Noam <amir.noam at intel dot com> * - 2003/05/27 - Amir Noam <amir.noam at intel dot com>
* - Fix backward compatibility issues: * - Fix backward compatibility issues:
* For drivers not using ABI versions, slave was set down while * For drivers not using ABI versions, slave was set down while
* it should be left up before enslaving. * it should be left up before enslaving.
* Also, master was not set down and the default set_mac_address() * Also, master was not set down and the default set_mac_address()
* would fail and generate an error message in the system log. * would fail and generate an error message in the system log.
* - For opt_c: slave should not be set to the master's setting * - For opt_c: slave should not be set to the master's setting
* while it is running. It was already set during enslave. To * while it is running. It was already set during enslave. To
* simplify things, it is now handeled separately. * simplify things, it is now handeled separately.
* *
* - 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com> * - 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
* - Code cleanup and style changes * - Code cleanup and style changes
* set version to 1.1.0 * set version to 1.1.0
*/ */
#include "libbb.h" #include "libbb.h"

View File

@ -366,7 +366,7 @@ static len_and_sockaddr *xzalloc_lsa(int family)
lsa = xzalloc(LSA_LEN_SIZE + sz); lsa = xzalloc(LSA_LEN_SIZE + sz);
lsa->len = sz; lsa->len = sz;
lsa->u.sa.sa_family = family; lsa->u.sa.sa_family = family;
return lsa; return lsa;
} }
static void rearm_alarm(void) static void rearm_alarm(void)
@ -1357,7 +1357,7 @@ int inetd_main(int argc ATTRIBUTE_UNUSED, char **argv)
/* peek at the packet and remember peer addr */ /* peek at the packet and remember peer addr */
int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT, int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
&lsa->u.sa, &lsa->len); &lsa->u.sa, &lsa->len);
if (r < 0) if (r < 0)
goto do_exit1; goto do_exit1;
/* make this socket "connected" to peer addr: /* make this socket "connected" to peer addr:
* only packets from this peer will be recv'ed, * only packets from this peer will be recv'ed,

View File

@ -408,7 +408,7 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
// make a random string -- it will delimit message parts // make a random string -- it will delimit message parts
srand(monotonic_us()); srand(monotonic_us());
boundary = xasprintf("%d-%d-%d", rand(), rand(), rand()); boundary = xasprintf("%d-%d-%d", rand(), rand(), rand());
// put common headers and body start // put common headers and body start
printf( printf(
@ -457,7 +457,7 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
printf("\r\n--%s--\r\n" "\r\n", boundary); printf("\r\n--%s--\r\n" "\r\n", boundary);
// leave "put message" mode // leave "put message" mode
smtp_check(".", 250); smtp_check(".", 250);
// ... and say goodbye // ... and say goodbye
smtp_check("QUIT", 221); smtp_check("QUIT", 221);
@ -482,7 +482,7 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
// cache postprocess program // cache postprocess program
*fargs = *argv; *fargs = *argv;
// authenticate // authenticate
if (!(opts & OPT_U)) { if (!(opts & OPT_U)) {
//opts |= OPT_U; //opts |= OPT_U;

View File

@ -18,13 +18,13 @@
* and should have the following structure: * and should have the following structure:
* *
* SPOOLDIR/ * SPOOLDIR/
* <queue1> * <queue1>
* ... * ...
* <queueN> * <queueN>
* *
* <queueX> can be of two types: * <queueX> can be of two types:
* A. a printer character device or an ordinary file a link to such; * A. a printer character device or an ordinary file a link to such;
* B. a directory. * B. a directory.
* *
* In case A lpd just dumps the data it receives from client (lpr) to the * In case A lpd just dumps the data it receives from client (lpr) to the
* end of queue file/device. This is non-spooling mode. * end of queue file/device. This is non-spooling mode.
@ -38,11 +38,11 @@
* lpd only sanitizes them (by removing most non-alphanumerics). * lpd only sanitizes them (by removing most non-alphanumerics).
* *
* If HELPER-PROG (with optional arguments) is specified then lpd continues to process client data: * If HELPER-PROG (with optional arguments) is specified then lpd continues to process client data:
* 1. it reads and parses control file (cfA...). The parse process results in setting environment * 1. it reads and parses control file (cfA...). The parse process results in setting environment
* variables whose values were passed in control file; when parsing is complete, lpd deletes * variables whose values were passed in control file; when parsing is complete, lpd deletes
* control file. * control file.
* 2. it spawns specified helper application. It is then the helper application who is responsible * 2. it spawns specified helper application. It is then the helper application who is responsible
* for both actual printing and deleting processed data file. * for both actual printing and deleting processed data file.
* *
* A good lpr passes control files which when parsed provide the following variables: * A good lpr passes control files which when parsed provide the following variables:
* $H = host which issues the job * $H = host which issues the job

View File

@ -99,7 +99,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags)
# host-csingle -> Executable # host-csingle -> Executable
quiet_cmd_host-csingle = HOSTCC $@ quiet_cmd_host-csingle = HOSTCC $@
cmd_host-csingle = $(HOSTCC) $(hostc_flags) -o $@ $< \ cmd_host-csingle = $(HOSTCC) $(hostc_flags) -o $@ $< \
$(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
$(host-csingle): %: %.c FORCE $(host-csingle): %: %.c FORCE
$(call if_changed_dep,host-csingle) $(call if_changed_dep,host-csingle)

View File

@ -159,7 +159,7 @@ static int mshdbg_rc = 0;
/* /*
* library and system definitions * library and system definitions
*/ */
typedef void xint; /* base type of jmp_buf, for not broken compilers */ typedef void xint; /* base type of jmp_buf, for not broken compilers */
/* /*
* shell components * shell components

View File

@ -181,7 +181,7 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t off)
if (vs->heads == 0) if (vs->heads == 0)
return -1; return -1;
/* cluster size check*/ /* cluster size check */
if (vs->sectors_per_cluster == 0 || if (vs->sectors_per_cluster == 0 ||
(vs->sectors_per_cluster & (vs->sectors_per_cluster-1))) (vs->sectors_per_cluster & (vs->sectors_per_cluster-1)))
return -1; return -1;

View File

@ -32,13 +32,13 @@ struct ufs_super_block {
uint32_t fs_time; uint32_t fs_time;
uint32_t fs_size; uint32_t fs_size;
uint32_t fs_dsize; uint32_t fs_dsize;
uint32_t fs_ncg; uint32_t fs_ncg;
uint32_t fs_bsize; uint32_t fs_bsize;
uint32_t fs_fsize; uint32_t fs_fsize;
uint32_t fs_frag; uint32_t fs_frag;
uint32_t fs_minfree; uint32_t fs_minfree;
uint32_t fs_rotdelay; uint32_t fs_rotdelay;
uint32_t fs_rps; uint32_t fs_rps;
uint32_t fs_bmask; uint32_t fs_bmask;
uint32_t fs_fmask; uint32_t fs_fmask;
uint32_t fs_bshift; uint32_t fs_bshift;
@ -63,7 +63,7 @@ struct ufs_super_block {
uint32_t fs_cgsize; uint32_t fs_cgsize;
uint32_t fs_ntrak; uint32_t fs_ntrak;
uint32_t fs_nsect; uint32_t fs_nsect;
uint32_t fs_spc; uint32_t fs_spc;
uint32_t fs_ncyl; uint32_t fs_ncyl;
uint32_t fs_cpg; uint32_t fs_cpg;
uint32_t fs_ipg; uint32_t fs_ipg;
@ -95,7 +95,7 @@ struct ufs_super_block {
uint32_t fs_cgrotor; uint32_t fs_cgrotor;
uint32_t fs_ocsp[28]; uint32_t fs_ocsp[28];
uint32_t fs_contigdirs; uint32_t fs_contigdirs;
uint32_t fs_csp; uint32_t fs_csp;
uint32_t fs_maxcluster; uint32_t fs_maxcluster;
uint32_t fs_active; uint32_t fs_active;
int32_t fs_old_cpc; int32_t fs_old_cpc;
@ -172,7 +172,7 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off)
dbg("probing at offset 0x%llx", (unsigned long long) off); dbg("probing at offset 0x%llx", (unsigned long long) off);
for (i = 0; i < ARRAY_SIZE(offsets); i++) { for (i = 0; i < ARRAY_SIZE(offsets); i++) {
ufs = volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800); ufs = volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800);
if (ufs == NULL) if (ufs == NULL)
return -1; return -1;