svn commit: trunk/busybox: editors init libbb networking networking etc...
vda at busybox.net
vda at busybox.net
Sat Mar 24 15:40:16 UTC 2007
Author: vda
Date: 2007-03-24 08:40:16 -0700 (Sat, 24 Mar 2007)
New Revision: 18228
Log:
random style fixes (extra spaces deleted)
Modified:
trunk/busybox/editors/vi.c
trunk/busybox/init/init.c
trunk/busybox/libbb/bb_pwd.c
trunk/busybox/libbb/human_readable.c
trunk/busybox/networking/telnet.c
trunk/busybox/networking/udhcp/arpping.c
trunk/busybox/procps/free.c
trunk/busybox/shell/hush.c
trunk/busybox/shell/lash.c
trunk/busybox/util-linux/fdisk_sgi.c
trunk/busybox/util-linux/hwclock.c
Changeset:
Modified: trunk/busybox/editors/vi.c
===================================================================
--- trunk/busybox/editors/vi.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/editors/vi.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -3393,7 +3393,7 @@
editing = 0;
}
}
- } else if (strncasecmp(p, "file", cnt) == 0 ) {
+ } else if (strncasecmp(p, "file", cnt) == 0) {
last_status_cksum = 0; // force status update
} else if (sscanf(p, "%d", &j) > 0) {
dot = find_line(j); // go to line # j
Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/init/init.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -880,8 +880,7 @@
/* remove unused entrys */
for (a = init_action_list; a; a = tmp) {
tmp = a->next;
- if (a->action & (ONCE | SYSINIT | WAIT ) &&
- a->pid == 0 ) {
+ if ((a->action & (ONCE | SYSINIT | WAIT)) && a->pid == 0) {
delete_init_action(a);
}
}
Modified: trunk/busybox/libbb/bb_pwd.c
===================================================================
--- trunk/busybox/libbb/bb_pwd.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/libbb/bb_pwd.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -28,7 +28,7 @@
/* internal function for bb_getpwuid and bb_getgrgid */
static char* bb_getug(char *buffer, char *idname, long id, int bufsize, char prefix)
{
- if (bufsize > 0 ) {
+ if (bufsize > 0) {
assert(buffer != NULL);
if (idname) {
return safe_strncpy(buffer, idname, bufsize);
Modified: trunk/busybox/libbb/human_readable.c
===================================================================
--- trunk/busybox/libbb/human_readable.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/libbb/human_readable.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -72,8 +72,8 @@
}
#if 0
/* Sample code to omit decimal point and tenths digit. */
- if ( /* no_tenths */ 1 ) {
- if ( frac >= 5 ) {
+ if (/* no_tenths */ 1) {
+ if (frac >= 5) {
++val;
}
f = "%llu%*c" /* fmt_no_tenths */ ;
Modified: trunk/busybox/networking/telnet.c
===================================================================
--- trunk/busybox/networking/telnet.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/networking/telnet.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -188,7 +188,7 @@
else if (*p == 0x0d)
outbuf[j++] = 0x00;
}
- if (j > 0 )
+ if (j > 0)
write(G.netfd, outbuf, j);
}
Modified: trunk/busybox/networking/udhcp/arpping.c
===================================================================
--- trunk/busybox/networking/udhcp/arpping.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/networking/udhcp/arpping.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -94,9 +94,11 @@
tm.tv_sec = timeout;
if (select(s + 1, &fdset, (fd_set *) NULL, (fd_set *) NULL, &tm) < 0) {
bb_perror_msg("error on ARPING request");
- if (errno != EINTR) rv = 0;
+ if (errno != EINTR)
+ rv = 0;
} else if (FD_ISSET(s, &fdset)) {
- if (recv(s, &arp, sizeof(arp), 0) < 0 ) rv = 0;
+ if (recv(s, &arp, sizeof(arp), 0) < 0)
+ rv = 0;
if (arp.operation == htons(ARPOP_REPLY) &&
memcmp(arp.tHaddr, mac, 6) == 0 &&
*((uint32_t *) arp.sInaddr) == yiaddr) {
Modified: trunk/busybox/procps/free.c
===================================================================
--- trunk/busybox/procps/free.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/procps/free.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -18,10 +18,10 @@
sysinfo(&info);
/* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
- if (info.mem_unit==0) {
+ if (info.mem_unit == 0) {
info.mem_unit=1;
}
- if ( info.mem_unit == 1 ) {
+ if (info.mem_unit == 1) {
info.mem_unit=1024;
/* TODO: Make all this stuff not overflow when mem >= 4 Gib */
@@ -46,7 +46,7 @@
info.bufferram*=info.mem_unit;
}
- if (argc > 1 && **(argv + 1) == '-')
+ if (argc > 1 && *argv[1] == '-')
bb_show_usage();
printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free",
@@ -66,4 +66,3 @@
#endif
return EXIT_SUCCESS;
}
-
Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/shell/hush.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -1095,7 +1095,7 @@
* if this is one of those cases.
*/
for (x = bltins; x->cmd; x++) {
- if (strcmp(child->argv[0], x->cmd) == 0 ) {
+ if (strcmp(child->argv[0], x->cmd) == 0) {
debug_printf("builtin exec %s\n", child->argv[0]);
rcode = x->function(child);
fflush(stdout);
@@ -1369,7 +1369,7 @@
return last_return_code;
}
for (x = bltins; x->cmd; x++) {
- if (strcmp(child->argv[i], x->cmd) == 0 ) {
+ if (strcmp(child->argv[i], x->cmd) == 0) {
int squirrel[] = { -1, -1, -1 };
int rcode;
if (x->function == builtin_exec && child->argv[i+1] == NULL) {
Modified: trunk/busybox/shell/lash.c
===================================================================
--- trunk/busybox/shell/lash.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/shell/lash.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -1138,7 +1138,7 @@
* if this is one of those cases.
*/
for (x = bltins; x->cmd; x++) {
- if (strcmp(child->argv[0], x->cmd) == 0 ) {
+ if (strcmp(child->argv[0], x->cmd) == 0) {
_exit(x->function(child));
}
}
@@ -1262,7 +1262,7 @@
}
for (x = bltins; x->cmd; x++) {
- if (strcmp(child->argv[0], x->cmd) == 0 ) {
+ if (strcmp(child->argv[0], x->cmd) == 0) {
int rcode;
int squirrel[] = {-1, -1, -1};
setup_redirects(child, squirrel);
Modified: trunk/busybox/util-linux/fdisk_sgi.c
===================================================================
--- trunk/busybox/util-linux/fdisk_sgi.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/util-linux/fdisk_sgi.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -613,7 +613,7 @@
static void
sgi_change_sysid(int i, int sys)
{
- if (sgi_get_num_sectors(i) == 0 ) { /* caught already before, ... */
+ if (sgi_get_num_sectors(i) == 0) { /* caught already before, ... */
printf("Sorry you may change the Tag of non-empty partitions\n");
return;
}
Modified: trunk/busybox/util-linux/hwclock.c
===================================================================
--- trunk/busybox/util-linux/hwclock.c 2007-03-24 15:38:49 UTC (rev 18227)
+++ trunk/busybox/util-linux/hwclock.c 2007-03-24 15:40:16 UTC (rev 18228)
@@ -61,7 +61,7 @@
int rtc = xopen_rtc(O_RDONLY);
memset(&tm, 0, sizeof(struct tm));
- if (ioctl(rtc, RTC_RD_TIME, &tm) < 0 )
+ if (ioctl(rtc, RTC_RD_TIME, &tm) < 0)
bb_perror_msg_and_die("cannot read time from RTC");
tm.tm_isdst = -1; /* not known */
@@ -165,7 +165,7 @@
buffer[len] = 0;
- if (strncmp(buffer, "UTC", 3) == 0 ) {
+ if (strncmp(buffer, "UTC", 3) == 0) {
utc = 1;
break;
}
More information about the busybox-cvs
mailing list