aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2006-09-05 09:36:19 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2006-09-05 09:36:19 +0000
commitd25a2645f5273e70616abe73e6ac1adda5016532 (patch)
treebf50209ee814a956a4a9e3b85c3642f585978e5b
parent02add9e53a248d6b1b0b62e1fdf126362d67f1bc (diff)
downloadbusybox-d25a2645f5273e70616abe73e6ac1adda5016532.tar.gz
busybox-d25a2645f5273e70616abe73e6ac1adda5016532.tar.bz2
xfunc: fix: && -> &. Also nuked two double semicolons...
-rw-r--r--console-tools/setlogcons.c2
-rw-r--r--libbb/xfuncs.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c
index 6667eb622..9d1ef5492 100644
--- a/console-tools/setlogcons.c
+++ b/console-tools/setlogcons.c
@@ -25,7 +25,7 @@ extern int setlogcons_main(int argc, char **argv)
arg.subarg = atoi(argv[1]);
if (ioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg))
- bb_perror_msg_and_die("TIOCLINUX");;
+ bb_perror_msg_and_die("TIOCLINUX");
return 0;
}
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 116cff459..850721e3e 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -108,7 +108,7 @@ FILE *xfopen(const char *path, const char *mode)
/* Die if we can't open an existing file and return an fd. */
int xopen(const char *pathname, int flags)
{
- if (ENABLE_DEBUG && (flags && O_CREAT))
+ if (ENABLE_DEBUG && (flags & O_CREAT))
bb_error_msg_and_die("xopen() with O_CREAT\n");
return xopen3(pathname, flags, 0777);
@@ -349,7 +349,7 @@ off_t fdlength(int fd)
do {
char temp;
- pos = bottom + (top - bottom) / 2;;
+ pos = bottom + (top - bottom) / 2;
/* If we can read from the current location, it's bigger. */