fbset: fix buglet where we were using wrong pointer
readahead: stop using stdio.h *: style fixes
This commit is contained in:
@@ -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. */
|
||||
|
@@ -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;
|
||||
|
@@ -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++;
|
||||
|
Reference in New Issue
Block a user