svn commit: trunk/busybox: console-tools libbb

[vda at busybox.net]

Author: vda
Date: 2006-09-05 02:36:19 -0700 (Tue, 05 Sep 2006)
New Revision: 16052

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



Modified:
   trunk/busybox/console-tools/setlogcons.c
   trunk/busybox/libbb/xfuncs.c


Changeset:
Modified: trunk/busybox/console-tools/setlogcons.c
===================================================================
--- trunk/busybox/console-tools/setlogcons.c	2006-09-05 03:22:19 UTC (rev 16051)
+++ trunk/busybox/console-tools/setlogcons.c	2006-09-05 09:36:19 UTC (rev 16052)
@@ -25,7 +25,7 @@
 		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;
 }

Modified: trunk/busybox/libbb/xfuncs.c
===================================================================
--- trunk/busybox/libbb/xfuncs.c	2006-09-05 03:22:19 UTC (rev 16051)
+++ trunk/busybox/libbb/xfuncs.c	2006-09-05 09:36:19 UTC (rev 16052)
@@ -108,7 +108,7 @@
 /* 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 @@
 	do {
 		char temp;
 
-		pos = bottom + (top - bottom) / 2;;
+		pos = bottom + (top - bottom) / 2;
 
 		/* If we can read from the current location, it's bigger. */