From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Tue, 5 Sep 2006 09:36:19 +0000 (-0000)
Subject: xfunc: fix: && -> &. Also nuked two double semicolons...
X-Git-Tag: 1_4_0~749
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d25a2645f5273e70616abe73e6ac1adda5016532;p=oweals%2Fbusybox.git

xfunc: fix: && -> &. Also nuked two double semicolons...
---

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. */