diff options
| author | Denis Vlasenko | 2007-11-06 03:05:54 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-11-06 03:05:54 +0000 |
| commit | 6bef3d1d2216234454875052220ca0f477a820b4 (patch) | |
| tree | 717060345370b781d3d1cde7ab4dd29304a066e8 /libbb | |
| parent | 1bec1b980e3cf5ad604fb0c2038a3ab83d9ab5f5 (diff) | |
| download | busybox-6bef3d1d2216234454875052220ca0f477a820b4.zip busybox-6bef3d1d2216234454875052220ca0f477a820b4.tar.gz | |
fbset: fix buglet where we were using wrong pointer
readahead: stop using stdio.h
*: style fixes
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/device_open.c | 8 | ||||
| -rw-r--r-- | libbb/dump.c | 6 | ||||
| -rw-r--r-- | libbb/obscure.c | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/libbb/device_open.c b/libbb/device_open.c index 2b35ad8..6907e98 100644 --- a/libbb/device_open.c +++ b/libbb/device_open.c @@ -12,15 +12,17 @@ /* try to open up the specified device */ int device_open(const char *device, int mode) { - int m, f, fd = -1; + int m, f, fd; m = mode | O_NONBLOCK; /* Retry up to 5 times */ /* TODO: explain why it can't be considered insane */ - for (f = 0; f < 5; f++) - if ((fd = open(device, m, 0600)) >= 0) + for (f = 0; f < 5; f++) { + fd = open(device, m, 0600); + if (fd >= 0) break; + } if (fd < 0) return fd; /* Reset original flags. */ diff --git a/libbb/dump.c b/libbb/dump.c index 829050d..71e35c6 100644 --- a/libbb/dump.c +++ b/libbb/dump.c @@ -59,7 +59,8 @@ int bb_dump_size(FS * fs) prec = atoi(fmt); while (isdigit(*++fmt)); } - if (!(p = strchr(size_conv_str + 12, *fmt))) { + p = strchr(size_conv_str + 12, *fmt); + if (!p) { if (*fmt == 's') { bcnt += prec; } else if (*fmt == '_') { @@ -162,7 +163,8 @@ static void rewrite(FS * fs) DO_INT_CONV: { const char *e; - if (!(e = strchr(lcc, *p1))) { + e = strchr(lcc, *p1); + if (!e) { goto DO_BAD_CONV_CHAR; } pr->flags = F_INT; diff --git a/libbb/obscure.c b/libbb/obscure.c index 2599095..5cc9062 100644 --- a/libbb/obscure.c +++ b/libbb/obscure.c @@ -130,7 +130,8 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc c = 0; p = new_p; while (1) { - if ((p = strchr(p, new_p[i])) == NULL) { + p = strchr(p, new_p[i]); + if (p == NULL) { break; } c++; |