diff options
author | Eric Andersen | 2004-03-15 08:29:22 +0000 |
---|---|---|
committer | Eric Andersen | 2004-03-15 08:29:22 +0000 |
commit | c7bda1ce659294d6e22c06e087f6f265983c7578 (patch) | |
tree | 4c6d2217f4d8306c59cf1096f8664e1cfd167213 /miscutils | |
parent | 8854004b41065b3d081af7f3df13a100b0c8bfbe (diff) | |
download | busybox-c7bda1ce659294d6e22c06e087f6f265983c7578.zip busybox-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.gz |
Remove trailing whitespace. Update copyright to include 2004.
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/Config.in | 12 | ||||
-rw-r--r-- | miscutils/Makefile | 2 | ||||
-rw-r--r-- | miscutils/Makefile.in | 2 | ||||
-rw-r--r-- | miscutils/adjtimex.c | 4 | ||||
-rw-r--r-- | miscutils/dc.c | 6 | ||||
-rw-r--r-- | miscutils/hdparm.c | 6 | ||||
-rw-r--r-- | miscutils/last.c | 6 | ||||
-rw-r--r-- | miscutils/makedevs.c | 4 | ||||
-rw-r--r-- | miscutils/mt.c | 2 | ||||
-rw-r--r-- | miscutils/rx.c | 14 | ||||
-rw-r--r-- | miscutils/strings.c | 2 | ||||
-rw-r--r-- | miscutils/time.c | 2 | ||||
-rw-r--r-- | miscutils/watchdog.c | 2 |
13 files changed, 32 insertions, 32 deletions
diff --git a/miscutils/Config.in b/miscutils/Config.in index c5327c2..7e18c16 100644 --- a/miscutils/Config.in +++ b/miscutils/Config.in @@ -86,11 +86,11 @@ config CONFIG_HDPARM default n help Get/Set hard drive parameters. Primarily intended for ATA - drives. Adds about 13k (or around 30k if you enable the + drives. Adds about 13k (or around 30k if you enable the CONFIG_FEATURE_HDPARM_GET_IDENTITY option).... config CONFIG_FEATURE_HDPARM_GET_IDENTITY - bool " Support obtaining detailed information directly from drives" + bool " Support obtaining detailed information directly from drives" default y depends on CONFIG_HDPARM help @@ -99,7 +99,7 @@ config CONFIG_FEATURE_HDPARM_GET_IDENTITY feature set. Enabling this option will add about 16k... config CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF - bool " Register an IDE interface (DANGEROUS)" + bool " Register an IDE interface (DANGEROUS)" default n depends on CONFIG_HDPARM help @@ -107,7 +107,7 @@ config CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF This is dangerous stuff, so you should probably say N. config CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF - bool " Un-register an IDE interface (DANGEROUS)" + bool " Un-register an IDE interface (DANGEROUS)" default n depends on CONFIG_HDPARM help @@ -115,7 +115,7 @@ config CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF This is dangerous stuff, so you should probably say N. config CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET - bool " perform device reset (DANGEROUS)" + bool " perform device reset (DANGEROUS)" default n depends on CONFIG_HDPARM help @@ -123,7 +123,7 @@ config CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET This is dangerous stuff, so you should probably say N. config CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF - bool " tristate device for hotswap (DANGEROUS)" + bool " tristate device for hotswap (DANGEROUS)" default n depends on CONFIG_HDPARM help diff --git a/miscutils/Makefile b/miscutils/Makefile index 374ce68..4bae724 100644 --- a/miscutils/Makefile +++ b/miscutils/Makefile @@ -1,6 +1,6 @@ # Makefile for busybox # -# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> +# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in index fea9b89..89e3208 100644 --- a/miscutils/Makefile.in +++ b/miscutils/Makefile.in @@ -1,6 +1,6 @@ # Makefile for busybox # -# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> +# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c index e941f6b..110c026 100644 --- a/miscutils/adjtimex.c +++ b/miscutils/adjtimex.c @@ -76,7 +76,7 @@ static char *ret_code_descript[] = { #else void usage(char *prog) { - fprintf(stderr, + fprintf(stderr, "Usage: %s [ -q ] [ -o offset ] [ -f frequency ] [ -p timeconstant ] [ -t tick ]\n", prog); } @@ -126,7 +126,7 @@ int main(int argc, char ** argv) ret = adjtimex(&txc); if (ret < 0) perror("adjtimex"); - + if (!quiet && ret>=0) { printf( " mode: %d\n" diff --git a/miscutils/dc.c b/miscutils/dc.c index f574ae4..0ac658d 100644 --- a/miscutils/dc.c +++ b/miscutils/dc.c @@ -87,7 +87,7 @@ static void not(void) static void set_output_base(void) { - base=(unsigned char)pop(); + base=(unsigned char)pop(); if ((base != 10) && (base != 16)) { fprintf(stderr, "Error: base = %d is not supported.\n", base); base=10; @@ -96,7 +96,7 @@ static void set_output_base(void) static void print_base(double print) { - if (base == 16) + if (base == 16) printf("%x\n", (unsigned int)print); else printf("%g\n", print); @@ -178,7 +178,7 @@ static void stack_machine(const char *argument) } /* return pointer to next token in buffer and set *buffer to one char - * past the end of the above mentioned token + * past the end of the above mentioned token */ static char *get_token(char **buffer) { diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 5c91b52..eaa61c1 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c @@ -606,7 +606,7 @@ static uint8_t mode_loop(uint16_t mode_sup, uint16_t mode_sel, int cc, uint8_t * static void print_ascii(uint16_t *p, uint8_t length) { uint8_t ii; char cl; - + /* find first non-space & print it */ for(ii = 0; ii< length; ii++) { @@ -1080,7 +1080,7 @@ static void identify (uint16_t *id_supplied, const char *devname) if_printf(((dev == ATAPI_DEV) && (eqpt != CDROM) && (val[CAPAB_0] & DMA_IL_SUP)), "\t Interleaved DMA support\n"); - if((val[WHATS_VALID] & OK_W64_70) && + if((val[WHATS_VALID] & OK_W64_70) && (val[DMA_TIME_MIN] || val[DMA_TIME_NORM])) { printf("\t Cycle time:"); @@ -1241,7 +1241,7 @@ static int do_ctimings, do_timings = 0; static unsigned long set_readahead= 0, get_readahead= 0, bbreadahead= 0; static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; -static unsigned long set_mult = 0, get_mult = 0, mult = 0; +static unsigned long set_mult = 0, get_mult = 0, mult = 0; #ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA static unsigned long set_dma = 0, get_dma = 0, dma = 0; #endif diff --git a/miscutils/last.c b/miscutils/last.c index e7f9eb5..86613bf 100644 --- a/miscutils/last.c +++ b/miscutils/last.c @@ -2,7 +2,7 @@ /* * last implementation for busybox * - * Copyright (C) 2003 Erik Andersen <andersen@codepoet.org> + * Copyright (C) 2003-2004 by Erik Andersen <andersen@codepoet.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -68,10 +68,10 @@ extern int last_main(int argc, char **argv) else if (strncmp(ut.ut_user, "runlevel", 7) == 0) ut.ut_type = RUN_LVL; } else { - if (!ut.ut_name[0] || strcmp(ut.ut_name, "LOGIN") == 0 || + if (!ut.ut_name[0] || strcmp(ut.ut_name, "LOGIN") == 0 || ut.ut_name[0] == 0) { - /* Don't bother. This means we can't find how long + /* Don't bother. This means we can't find how long * someone was logged in for. Oh well. */ continue; } diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index 308d651..45498bb 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c @@ -1,9 +1,9 @@ /* vi: set sw=4 ts=4: */ /* * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com> - * + * * makedevs - * Make ranges of device files quickly. + * Make ranges of device files quickly. * known bugs: can't deal with alpha ranges */ diff --git a/miscutils/mt.c b/miscutils/mt.c index e799545..b0cdacc 100644 --- a/miscutils/mt.c +++ b/miscutils/mt.c @@ -57,7 +57,7 @@ extern int mt_main(int argc, char **argv) struct mtop op; struct mtpos position; int fd, mode; - + if (argc < 2) { bb_show_usage(); } diff --git a/miscutils/rx.c b/miscutils/rx.c index 2b16f2e..8edc887 100644 --- a/miscutils/rx.c +++ b/miscutils/rx.c @@ -1,14 +1,14 @@ /*------------------------------------------------------------------------- * Filename: xmodem.c - * Version: $Id: rx.c,v 1.1 2003/12/20 07:30:35 bug1 Exp $ + * Version: $Id: rx.c,v 1.2 2004/03/15 08:28:46 andersen Exp $ * Copyright: Copyright (C) 2001, Hewlett-Packard Company * Author: Christopher Hoover <ch@hpl.hp.com> - * Description: xmodem functionality for uploading of kernels + * Description: xmodem functionality for uploading of kernels * and the like * Created at: Thu Dec 20 01:58:08 PST 2001 *-----------------------------------------------------------------------*/ /* - * xmodem.c: xmodem functionality for uploading of kernels and + * xmodem.c: xmodem functionality for uploading of kernels and * the like * * Copyright (C) 2001 Hewlett-Packard Laboratories @@ -69,7 +69,7 @@ Cf: #define TIMEOUT_LONG 10 #define MAXERRORS 10 -static inline void write_byte(int fd, char cc) { +static inline void write_byte(int fd, char cc) { write(fd, &cc, 1); } @@ -80,7 +80,7 @@ static inline void write_flush(int fd) { static inline void read_flush(int fd) { tcflush(fd, TCIFLUSH); } - + static int read_byte(int fd, unsigned int timeout) { char buf[1]; int n; @@ -312,12 +312,12 @@ int rx_main(int argc, char **argv) if (tcgetattr(ttyfd, &tty) < 0) bb_error_msg_and_die("%s: tcgetattr failed: %m\n", argv[0]); - + orig_tty = tty; cfmakeraw(&tty); tcsetattr(ttyfd, TCSAFLUSH, &tty); - + memset(&act, 0, sizeof(act)); act.sa_handler = sigalrm_handler; sigaction(SIGALRM, &act, 0); diff --git a/miscutils/strings.c b/miscutils/strings.c index 4778cfb..5dcd876 100644 --- a/miscutils/strings.c +++ b/miscutils/strings.c @@ -136,7 +136,7 @@ pipe: * documentation and/or other materials provided with the distribution. * * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change - * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> + * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> * * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/miscutils/time.c b/miscutils/time.c index 7aaa12e..ca896a1 100644 --- a/miscutils/time.c +++ b/miscutils/time.c @@ -17,7 +17,7 @@ 02111-1307, USA. */ /* Originally written by David Keppel <pardo@cs.washington.edu>. - Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>. + Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>. Heavily modified for busybox by Erik Andersen <andersen@codepoet.org> */ diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c index b1167dc..276fade 100644 --- a/miscutils/watchdog.c +++ b/miscutils/watchdog.c @@ -67,7 +67,7 @@ extern int watchdog_main(int argc, char **argv) fd = bb_xopen(argv[argc - 1], O_WRONLY); while (1) { - /* + /* * Make sure we clear the counter before sleeping, as the counter value * is undefined at this point -- PFM */ |