emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-05 09:36:19 +00:00
parent 02add9e53a
commit d25a2645f5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console-tools/setlogcons.c
View File

@ -25,7 +25,7 @@ extern int setlogcons_main(int argc, char **argv)
arg.subarg = atoi(argv[1]); arg.subarg = atoi(argv[1]);
if (ioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg)) if (ioctl(xopen(VC_1, O_RDONLY), TIOCLINUX, &arg))
bb_perror_msg_and_die("TIOCLINUX");; bb_perror_msg_and_die("TIOCLINUX");
return 0; return 0;
} }

4
libbb/xfuncs.c
View File

@ -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. */ /* Die if we can't open an existing file and return an fd. */
int xopen(const char *pathname, int flags) 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"); bb_error_msg_and_die("xopen() with O_CREAT\n");
return xopen3(pathname, flags, 0777); return xopen3(pathname, flags, 0777);
@ -349,7 +349,7 @@ off_t fdlength(int fd)
do { do {
char temp; char temp;
pos = bottom + (top - bottom) / 2;; pos = bottom + (top - bottom) / 2;
/* If we can read from the current location, it's bigger. */ /* If we can read from the current location, it's bigger. */