svn commit: trunk/busybox: editors init libbb networking printutils etc...

vda at busybox.net vda at busybox.net
Mon Mar 24 02:18:04 UTC 2008


Author: vda
Date: 2008-03-23 19:18:03 -0700 (Sun, 23 Mar 2008)
New Revision: 21465

Log:
*: whitespace fixes, no code changes



Modified:
   trunk/busybox/editors/patch.c
   trunk/busybox/editors/vi.c
   trunk/busybox/init/init.c
   trunk/busybox/libbb/login.c
   trunk/busybox/libbb/safe_gethostname.c
   trunk/busybox/networking/ifenslave.c
   trunk/busybox/networking/inetd.c
   trunk/busybox/networking/sendmail.c
   trunk/busybox/printutils/lpd.c
   trunk/busybox/scripts/Makefile.host
   trunk/busybox/shell/msh.c
   trunk/busybox/util-linux/volume_id/fat.c
   trunk/busybox/util-linux/volume_id/unused_ufs.c


Changeset:
Modified: trunk/busybox/editors/patch.c
===================================================================
--- trunk/busybox/editors/patch.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/editors/patch.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -74,7 +74,7 @@
 	int patch_level;
 	int ret = 0;
 
-	xfunc_error_retval = 2;	
+	xfunc_error_retval = 2;
 	{
 		const char *p = "-1";
 		const char *i = "-"; /* compat */
@@ -114,7 +114,7 @@
 		if (!patch_line || strncmp(patch_line, "+++ ", 4) != 0)
 			bb_error_msg_and_die("invalid patch");
 		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 */
 		if (stat(new_filename, &saved_stat) != 0) {
 			char *line_ptr;

Modified: trunk/busybox/editors/vi.c
===================================================================
--- trunk/busybox/editors/vi.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/editors/vi.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -419,7 +419,7 @@
 			/* fall through */
 
 		default:
-		    	bb_show_usage();
+			bb_show_usage();
 			return 1;
 		}
 	}

Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/init/init.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -230,8 +230,8 @@
 			/* Give me _ANY_ open descriptor! */
 			fd = xopen("/", O_RDONLY); /* we don't believe this can fail */
 		}
-    		while ((unsigned)fd < 2)
-            		fd = dup(fd);
+		while ((unsigned)fd < 2)
+			fd = dup(fd);
 		if (fd > 2)
 			close(fd);
 	}

Modified: trunk/busybox/libbb/login.c
===================================================================
--- trunk/busybox/libbb/login.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/libbb/login.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -89,7 +89,7 @@
 void print_login_prompt(void)
 {
 	char *hostname = safe_gethostname();
-	
+
 	fputs(hostname, stdout);
 	fputs(LOGIN, stdout);
 	fflush(stdout);

Modified: trunk/busybox/libbb/safe_gethostname.c
===================================================================
--- trunk/busybox/libbb/safe_gethostname.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/libbb/safe_gethostname.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -45,7 +45,7 @@
 	 * name and an 8-byte nodename), but this is true on Linux. The same holds
 	 * for setdomainname(2) and the domainname field.
 	 */
-	
+
 	/* Uname can fail only if you pass a bad pointer to it. */
 	uname(&uts);
 

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

Modified: trunk/busybox/networking/inetd.c
===================================================================
--- trunk/busybox/networking/inetd.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/networking/inetd.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -366,7 +366,7 @@
 	lsa = xzalloc(LSA_LEN_SIZE + sz);
 	lsa->len = sz;
 	lsa->u.sa.sa_family = family;
-	return lsa;	
+	return lsa;
 }
 
 static void rearm_alarm(void)
@@ -1357,7 +1357,7 @@
 				/* peek at the packet and remember peer addr */
 				int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
 					&lsa->u.sa, &lsa->len);
-                    		if (r < 0)
+				if (r < 0)
 					goto do_exit1;
 				/* make this socket "connected" to peer addr:
 				 * only packets from this peer will be recv'ed,

Modified: trunk/busybox/networking/sendmail.c
===================================================================
--- trunk/busybox/networking/sendmail.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/networking/sendmail.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -408,7 +408,7 @@
 
 		// make a random string -- it will delimit message parts
 		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
 		printf(
@@ -457,7 +457,7 @@
 		printf("\r\n--%s--\r\n" "\r\n", boundary);
 
 		// leave "put message" mode
- 		smtp_check(".", 250);
+		smtp_check(".", 250);
 		// ... and say goodbye
 		smtp_check("QUIT", 221);
 
@@ -482,7 +482,7 @@
 
 		// cache postprocess program
 		*fargs = *argv;
-		
+
 		// authenticate
 		if (!(opts & OPT_U)) {
 			//opts |= OPT_U;

Modified: trunk/busybox/printutils/lpd.c
===================================================================
--- trunk/busybox/printutils/lpd.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/printutils/lpd.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -18,13 +18,13 @@
  * and should have the following structure:
  *
  * SPOOLDIR/
- * 	<queue1>
- * 	...
- * 	<queueN>
+ *      <queue1>
+ *      ...
+ *      <queueN>
  *
  * <queueX> can be of two types:
- * 	A. a printer character device or an ordinary file a link to such;
- * 	B. a directory.
+ *      A. a printer character device or an ordinary file a link to such;
+ *      B. a directory.
  *
  * 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.
@@ -38,11 +38,11 @@
  * lpd only sanitizes them (by removing most non-alphanumerics).
  *
  * 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
- * 	variables whose values were passed in control file; when parsing is complete, lpd deletes
- * 	control file.
- * 	2. it spawns specified helper application. It is then the helper application who is responsible
- * 	for both actual printing and deleting processed data file.
+ *      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
+ *      control file.
+ *      2. it spawns specified helper application. It is then the helper application who is responsible
+ *      for both actual printing and deleting processed data file.
  *
  * A good lpr passes control files which when parsed provide the following variables:
  * $H = host which issues the job

Modified: trunk/busybox/scripts/Makefile.host
===================================================================
--- trunk/busybox/scripts/Makefile.host	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/scripts/Makefile.host	2008-03-24 02:18:03 UTC (rev 21465)
@@ -99,7 +99,7 @@
 # host-csingle -> Executable
 quiet_cmd_host-csingle 	= HOSTCC  $@
       cmd_host-csingle	= $(HOSTCC) $(hostc_flags) -o $@ $< \
-	  	$(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
 $(host-csingle): %: %.c FORCE
 	$(call if_changed_dep,host-csingle)
 

Modified: trunk/busybox/shell/msh.c
===================================================================
--- trunk/busybox/shell/msh.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/shell/msh.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -159,7 +159,7 @@
 /*
  * 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

Modified: trunk/busybox/util-linux/volume_id/fat.c
===================================================================
--- trunk/busybox/util-linux/volume_id/fat.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/util-linux/volume_id/fat.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -181,7 +181,7 @@
 	if (vs->heads == 0)
 		return -1;
 
-	/* cluster size check*/	
+	/* cluster size check */
 	if (vs->sectors_per_cluster == 0 ||
 	    (vs->sectors_per_cluster & (vs->sectors_per_cluster-1)))
 		return -1;

Modified: trunk/busybox/util-linux/volume_id/unused_ufs.c
===================================================================
--- trunk/busybox/util-linux/volume_id/unused_ufs.c	2008-03-24 02:05:58 UTC (rev 21464)
+++ trunk/busybox/util-linux/volume_id/unused_ufs.c	2008-03-24 02:18:03 UTC (rev 21465)
@@ -32,13 +32,13 @@
 	uint32_t	fs_time;
 	uint32_t	fs_size;
 	uint32_t	fs_dsize;
-	uint32_t	fs_ncg;	
+	uint32_t	fs_ncg;
 	uint32_t	fs_bsize;
 	uint32_t	fs_fsize;
 	uint32_t	fs_frag;
 	uint32_t	fs_minfree;
 	uint32_t	fs_rotdelay;
-	uint32_t	fs_rps;	
+	uint32_t	fs_rps;
 	uint32_t	fs_bmask;
 	uint32_t	fs_fmask;
 	uint32_t	fs_bshift;
@@ -63,7 +63,7 @@
 	uint32_t	fs_cgsize;
 	uint32_t	fs_ntrak;
 	uint32_t	fs_nsect;
-	uint32_t	fs_spc;	
+	uint32_t	fs_spc;
 	uint32_t	fs_ncyl;
 	uint32_t	fs_cpg;
 	uint32_t	fs_ipg;
@@ -95,7 +95,7 @@
 			uint32_t	fs_cgrotor;
 			uint32_t	fs_ocsp[28];
 			uint32_t	fs_contigdirs;
-			uint32_t	fs_csp;	
+			uint32_t	fs_csp;
 			uint32_t	fs_maxcluster;
 			uint32_t	fs_active;
 			int32_t		fs_old_cpc;
@@ -172,7 +172,7 @@
 
 	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);
 		if (ufs == NULL)
 			return -1;




More information about the busybox-cvs mailing list