From: Denis Vlasenko Date: Tue, 22 Apr 2008 00:16:29 +0000 (-0000) Subject: whitespace fixes. no code changes X-Git-Tag: android-x86-2.2~1773 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1f228985b27602f94ff973d50e276220887df6a3;p=android-x86%2Fexternal-busybox.git whitespace fixes. no code changes --- diff --git a/console-tools/openvt.c b/console-tools/openvt.c index 3bb0a9210..c4746dfd3 100644 --- a/console-tools/openvt.c +++ b/console-tools/openvt.c @@ -60,7 +60,7 @@ static int get_vt_fd(void) /* Do we, by chance, already have it? */ for (fd = 0; fd < 3; fd++) if (!not_vt_fd(fd)) - return fd; + return fd; /* _only_ O_NONBLOCK: ask for neither read not write perms */ fd = open(DEV_CONSOLE, O_NONBLOCK); if (fd >= 0 && !not_vt_fd(fd)) @@ -73,7 +73,7 @@ static int find_free_vtno(void) int vtno; int fd = get_vt_fd(); - errno = 0; + errno = 0; /*xfunc_error_retval = 3; - do we need compat? */ if (ioctl(fd, VT_OPENQRY, &vtno) != 0 || vtno <= 0) bb_perror_msg_and_die("can't find open VT"); @@ -138,7 +138,7 @@ int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv) close(0); /*setsid(); - BAD IDEA: after we exit, child is SIGHUPed... */ xopen(vtname, O_RDWR); - xioctl(0, VT_GETSTATE, &vtstat); + xioctl(0, VT_GETSTATE, &vtstat); if (flags & OPT_s) { xioctl(0, VT_ACTIVATE, (void*)(ptrdiff_t)vtno); diff --git a/coreutils/mv.c b/coreutils/mv.c index 613d4ac46..5611ecd01 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -109,7 +109,7 @@ int mv_main(int argc, char **argv) goto RET_1; } } - /* FILEUTILS_RECUR also prevents nasties like + /* FILEUTILS_RECUR also prevents nasties like * "read from device and write contents to dst" * instead of "create same device node" */ copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS; diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 7a0d1166f..4e816bd19 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c @@ -142,18 +142,18 @@ static void do_procinit(void) procdir = xopendir("/proc"); pid = 0; - while(1) { - errno = 0; /* clear any previous error */ - entry = readdir(procdir); + while(1) { + errno = 0; /* clear any previous error */ + entry = readdir(procdir); // TODO: check for exact errno(s) which mean that we got stale entry - if (errno) /* Stale entry, process has died after opendir */ - continue; - if (!entry) /* EOF, no more entries */ - break; - pid = bb_strtou(entry->d_name, NULL, 10); - if (errno) /* NaN */ - continue; - check(pid); + if (errno) /* Stale entry, process has died after opendir */ + continue; + if (!entry) /* EOF, no more entries */ + break; + pid = bb_strtou(entry->d_name, NULL, 10); + if (errno) /* NaN */ + continue; + check(pid); } closedir(procdir); if (!pid) diff --git a/include/applets.h b/include/applets.h index af5359784..27c3a1b6f 100644 --- a/include/applets.h +++ b/include/applets.h @@ -231,7 +231,7 @@ USE_LSATTR(APPLET(lsattr, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_UNLZMA(APPLET_ODDNAME(lzmacat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_NEVER, lzmacat)) USE_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_NEVER)) -USE_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUID_NEVER)) +USE_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_NEVER, md5sum)) USE_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_NEVER)) diff --git a/include/usage.h b/include/usage.h index 01acda16d..acc72d158 100644 --- a/include/usage.h +++ b/include/usage.h @@ -521,7 +521,7 @@ #define cpio_trivial_usage \ "-[dim" USE_FEATURE_CPIO_O("o") "tuv][F cpiofile]" \ - USE_FEATURE_CPIO_O( "[H newc]" ) + USE_FEATURE_CPIO_O( "[H newc]" ) #define cpio_full_usage "\n\n" \ "Extract or list files from a cpio archive" \ USE_FEATURE_CPIO_O( ", or create a cpio archive" ) \ diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c index a288b3ca5..626cefb28 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c @@ -9,11 +9,11 @@ * - use kernel option 'vga=xxx' or otherwise enable framebuffer device. * - put somewhere fbsplash.cfg file and an image in .ppm format. * - run applet: $ setsid fbsplash [params] & - * -c: hide cursor - * -d /dev/fbN: framebuffer device (if not /dev/fb0) - * -s path_to_image_file (can be "-" for stdin) - * -i path_to_cfg_file - * -f path_to_fifo (can be "-" for stdin) + * -c: hide cursor + * -d /dev/fbN: framebuffer device (if not /dev/fb0) + * -s path_to_image_file (can be "-" for stdin) + * -i path_to_cfg_file + * -f path_to_fifo (can be "-" for stdin) * - if you want to run it only in presence of a kernel parameter * (for example fbsplash=on), use: * grep -q "fbsplash=on" >= 2; // 6-bit green nblue >>= 3; // 5-bit blue thispix = nblue + (ngreen << 5) + (nred << (5+6)); - + cnt1 = ny2pos - ny1pos; nypos = ny1pos; do { @@ -156,7 +156,7 @@ static void fb_drawfullrectangle(int nx1pos, int ny1pos, int nx2pos, int ny2pos, do { *ptr++ = thispix; } while (--cnt2 >= 0); - + nypos++; } while (--cnt1 >= 0); } @@ -342,7 +342,7 @@ static void init(const char *cfg_filename) case 7: G.bdebug_messages = val; if (G.bdebug_messages) - G.logfile_fd = xfopen("/tmp/fbsplash.log", "w"); + G.logfile_fd = xfopen("/tmp/fbsplash.log", "w"); break; #endif err: diff --git a/miscutils/man.c b/miscutils/man.c index bf13ab527..278e5a336 100644 --- a/miscutils/man.c +++ b/miscutils/man.c @@ -82,7 +82,7 @@ int man_main(int argc ATTRIBUTE_UNUSED, char **argv) sec_list = xstrdup("1:2:3:4:5:6:7:8:9"); alloc_mp = 10; - man_path_list = xmalloc(10 * sizeof(man_path_list[0])); + man_path_list = xmalloc(10 * sizeof(man_path_list[0])); count_mp = 0; man_path_list[0] = xstrdup(getenv("MANPATH")); if (man_path_list[0]) @@ -137,8 +137,8 @@ int man_main(int argc ATTRIBUTE_UNUSED, char **argv) char *man_filename = xasprintf("%.*s/man%.*s/%s.%.*s" ".bz2", path_len, cur_path, - sect_len, cur_sect, - *argv, + sect_len, cur_sect, + *argv, sect_len, cur_sect); int found = show_manpage(pager, man_filename); free(man_filename); diff --git a/util-linux/Config.in b/util-linux/Config.in index 8b5bf751c..c30091a7a 100644 --- a/util-linux/Config.in +++ b/util-linux/Config.in @@ -532,7 +532,7 @@ config FEATURE_VOLUMEID_SYSV ### depends on VOLUMEID ### help ### TODO -### +### ### config FEATURE_VOLUMEID_MSDOS ### bool "msdos filesystem" ### default n diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 9d77f6a1f..9d37b6c90 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c @@ -171,7 +171,7 @@ static void make_device(char *path, int delete) s = val; while (*s && *s++ == '%') n++; - + p = alias = xzalloc(strlen(val) + n * strlen(device_name)); s = val + 1; while (*s) {