svn commit: trunk/busybox: libbb miscutils networking procps
vda at busybox.net
vda at busybox.net
Mon Jan 7 16:13:15 UTC 2008
Author: vda
Date: 2008-01-07 08:13:14 -0800 (Mon, 07 Jan 2008)
New Revision: 20808
Log:
ps: fix build breakage from vda's recent commit
*: whitespace fixes
Modified:
trunk/busybox/libbb/compare_string_array.c
trunk/busybox/libbb/lineedit.c
trunk/busybox/libbb/xfuncs.c
trunk/busybox/miscutils/hdparm.c
trunk/busybox/networking/nameif.c
trunk/busybox/networking/ping.c
trunk/busybox/networking/wget.c
trunk/busybox/procps/pgrep.c
trunk/busybox/procps/ps.c
Changeset:
Modified: trunk/busybox/libbb/compare_string_array.c
===================================================================
--- trunk/busybox/libbb/compare_string_array.c 2008-01-07 15:58:02 UTC (rev 20807)
+++ trunk/busybox/libbb/compare_string_array.c 2008-01-07 16:13:14 UTC (rev 20808)
@@ -70,9 +70,9 @@
const char *nth_string(const char *strings, int n)
{
- while (n) {
- n--;
- strings += strlen(strings) + 1;
- }
- return strings;
+ while (n) {
+ n--;
+ strings += strlen(strings) + 1;
+ }
+ return strings;
}
Modified: trunk/busybox/libbb/lineedit.c
===================================================================
--- trunk/busybox/libbb/lineedit.c 2008-01-07 15:58:02 UTC (rev 20807)
+++ trunk/busybox/libbb/lineedit.c 2008-01-07 16:13:14 UTC (rev 20808)
@@ -65,7 +65,7 @@
enum {
/* We use int16_t for positions, need to limit line len */
MAX_LINELEN = CONFIG_FEATURE_EDITING_MAX_LEN < 0x7ff0
- ? CONFIG_FEATURE_EDITING_MAX_LEN
+ ? CONFIG_FEATURE_EDITING_MAX_LEN
: 0x7ff0
};
Modified: trunk/busybox/libbb/xfuncs.c
===================================================================
--- trunk/busybox/libbb/xfuncs.c 2008-01-07 15:58:02 UTC (rev 20807)
+++ trunk/busybox/libbb/xfuncs.c 2008-01-07 16:13:14 UTC (rev 20808)
@@ -166,7 +166,7 @@
int close_on_exec_on(int fd)
{
- return fcntl(fd, F_SETFD, FD_CLOEXEC);
+ return fcntl(fd, F_SETFD, FD_CLOEXEC);
}
int ndelay_off(int fd)
Modified: trunk/busybox/miscutils/hdparm.c
===================================================================
--- trunk/busybox/miscutils/hdparm.c 2008-01-07 15:58:02 UTC (rev 20807)
+++ trunk/busybox/miscutils/hdparm.c 2008-01-07 16:13:14 UTC (rev 20808)
@@ -1155,10 +1155,10 @@
#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
static const char cfg_str[] ALIGN1 =
- """\0" "HardSect""\0" "SoftSect""\0" "NotMFM""\0"
- "HdSw>15uSec""\0" "SpinMotCtl""\0" "Fixed""\0" "Removeable""\0"
- "DTR<=5Mbs""\0" "DTR>5Mbs""\0" "DTR>10Mbs""\0" "RotSpdTol>.5%""\0"
- "dStbOff""\0" "TrkOff""\0" "FmtGapReq""\0" "nonMagnetic"
+ """\0" "HardSect""\0" "SoftSect""\0" "NotMFM""\0"
+ "HdSw>15uSec""\0" "SpinMotCtl""\0" "Fixed""\0" "Removeable""\0"
+ "DTR<=5Mbs""\0" "DTR>5Mbs""\0" "DTR>10Mbs""\0" "RotSpdTol>.5%""\0"
+ "dStbOff""\0" "TrkOff""\0" "FmtGapReq""\0" "nonMagnetic"
;
static const char BuffType[] ALIGN1 =
Modified: trunk/busybox/networking/nameif.c
===================================================================
--- trunk/busybox/networking/nameif.c 2008-01-07 15:58:02 UTC (rev 20807)
+++ trunk/busybox/networking/nameif.c 2008-01-07 16:13:14 UTC (rev 20808)
@@ -55,7 +55,7 @@
char version[32]; /* driver version string */
char fw_version[32]; /* firmware version string, if applicable */
char bus_info[ETHTOOL_BUSINFO_LEN]; /* Bus info for this IF. */
- /* For PCI devices, use pci_dev->slot_name. */
+ /* For PCI devices, use pci_dev->slot_name. */
char reserved1[32];
char reserved2[16];
uint32_t n_stats; /* number of u64's from ETHTOOL_GSTATS */
Modified: trunk/busybox/networking/ping.c
===================================================================
--- trunk/busybox/networking/ping.c 2008-01-07 15:58:02 UTC (rev 20807)
+++ trunk/busybox/networking/ping.c 2008-01-07 16:13:14 UTC (rev 20808)
@@ -277,8 +277,8 @@
#define rcvd_tbl (G.rcvd_tbl )
void BUG_ping_globals_too_big(void);
#define INIT_G() do { \
- if (sizeof(G) > COMMON_BUFSIZE) \
- BUG_ping_globals_too_big(); \
+ if (sizeof(G) > COMMON_BUFSIZE) \
+ BUG_ping_globals_too_big(); \
pingsock = -1; \
tmin = UINT_MAX; \
} while (0)
Modified: trunk/busybox/networking/wget.c
===================================================================
--- trunk/busybox/networking/wget.c 2008-01-07 15:58:02 UTC (rev 20807)
+++ trunk/busybox/networking/wget.c 2008-01-07 16:13:14 UTC (rev 20808)
@@ -36,7 +36,7 @@
};
#define G (*(struct globals*)&bb_common_bufsiz1)
struct BUG_G_too_big {
- char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+ char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
};
#define content_len (G.content_len )
#define beg_range (G.beg_range )
Modified: trunk/busybox/procps/pgrep.c
===================================================================
--- trunk/busybox/procps/pgrep.c 2008-01-07 15:58:02 UTC (rev 20807)
+++ trunk/busybox/procps/pgrep.c 2008-01-07 16:13:14 UTC (rev 20808)
@@ -116,7 +116,7 @@
cmd = proc->comm;
/* NB: OPT_INVERT is always 0 or 1 */
if ((regexec(&re_buffer, cmd, 1, re_match, 0) == 0 /* match found */
- && (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == strlen(cmd)))) ^ OPT_INVERT
+ && (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == strlen(cmd)))) ^ OPT_INVERT
) {
matched_pid = proc->pid;
if (OPT_LAST) {
Modified: trunk/busybox/procps/ps.c
===================================================================
--- trunk/busybox/procps/ps.c 2008-01-07 15:58:02 UTC (rev 20807)
+++ trunk/busybox/procps/ps.c 2008-01-07 16:13:14 UTC (rev 20808)
@@ -66,60 +66,60 @@
/* for ELF executables, notes are pushed before environment and args */
static ptrdiff_t find_elf_note(ptrdiff_t findme)
{
- ptrdiff_t *ep = (ptrdiff_t *) environ;
+ ptrdiff_t *ep = (ptrdiff_t *) environ;
- while (*ep++);
- while (*ep) {
- if (ep[0] == findme) {
- return ep[1];
- }
- ep += 2;
- }
- return -1;
+ while (*ep++);
+ while (*ep) {
+ if (ep[0] == findme) {
+ return ep[1];
+ }
+ ep += 2;
+ }
+ return -1;
}
#if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS
static unsigned get_HZ_by_waiting(void)
{
- struct timeval tv1, tv2;
- unsigned t1, t2, r, hz;
- unsigned cnt = cnt; /* for compiler */
- int diff;
+ struct timeval tv1, tv2;
+ unsigned t1, t2, r, hz;
+ unsigned cnt = cnt; /* for compiler */
+ int diff;
- r = 0;
+ r = 0;
- /* Wait for times() to reach new tick */
- t1 = times(NULL);
- do {
- t2 = times(NULL);
- } while (t2 == t1);
- gettimeofday(&tv2, NULL);
+ /* Wait for times() to reach new tick */
+ t1 = times(NULL);
+ do {
+ t2 = times(NULL);
+ } while (t2 == t1);
+ gettimeofday(&tv2, NULL);
- do {
- t1 = t2;
- tv1.tv_usec = tv2.tv_usec;
+ do {
+ t1 = t2;
+ tv1.tv_usec = tv2.tv_usec;
- /* Wait exactly one times() tick */
- do {
- t2 = times(NULL);
- } while (t2 == t1);
- gettimeofday(&tv2, NULL);
+ /* Wait exactly one times() tick */
+ do {
+ t2 = times(NULL);
+ } while (t2 == t1);
+ gettimeofday(&tv2, NULL);
- /* Calculate ticks per sec, rounding up to even */
- diff = tv2.tv_usec - tv1.tv_usec;
- if (diff <= 0) diff += 1000000;
- hz = 1000000u / (unsigned)diff;
- hz = (hz+1) & ~1;
+ /* Calculate ticks per sec, rounding up to even */
+ diff = tv2.tv_usec - tv1.tv_usec;
+ if (diff <= 0) diff += 1000000;
+ hz = 1000000u / (unsigned)diff;
+ hz = (hz+1) & ~1;
/* Count how many same hz values we saw */
- if (r != hz) {
- r = hz;
- cnt = 0;
- }
- cnt++;
- } while (cnt < 3); /* exit if saw 3 same values */
+ if (r != hz) {
+ r = hz;
+ cnt = 0;
+ }
+ cnt++;
+ } while (cnt < 3); /* exit if saw 3 same values */
- return r;
+ return r;
}
#else
static inline unsigned get_HZ_by_waiting(void)
@@ -190,7 +190,7 @@
char buf5[5];
/* see http://en.wikipedia.org/wiki/Tera */
- smart_ulltoa4( (u, buf5, " mgtpezy");
+ smart_ulltoa4(u, buf5, " mgtpezy");
buf5[5] = '\0';
sprintf(buf, "%.*s", size, buf5);
}
More information about the busybox-cvs
mailing list