diff options
| -rw-r--r-- | archival/gzip.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/get_header_cpio.c | 2 | ||||
| -rw-r--r-- | coreutils/chown.c | 2 | ||||
| -rw-r--r-- | coreutils/install.c | 2 | ||||
| -rw-r--r-- | editors/awk.c | 2 | ||||
| -rw-r--r-- | include/libbb.h | 4 | ||||
| -rw-r--r-- | networking/telnetd.c | 2 | ||||
| -rw-r--r-- | procps/kill.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/lxdialog/menubox.c | 4 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 2 | ||||
| -rw-r--r-- | util-linux/fsck_minix.c | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/archival/gzip.c b/archival/gzip.c index b6705425e..2b520b3e7 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -1008,7 +1008,7 @@ static void compress_block(ct_data * ltree, ct_data * dtree); # define SEND_CODE(c, tree) \ { \ if (verbose > 1) bb_error_msg("\ncd %3d ",(c)); \ - send_bits(tree[c].Code, tree[c].Len); \ + send_bits(tree[c].Code, tree[c].Len); \ } #endif diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c index e0272003c..6fd134018 100644 --- a/archival/libunarchive/get_header_cpio.c +++ b/archival/libunarchive/get_header_cpio.c @@ -103,7 +103,7 @@ char get_header_cpio(archive_handle_t *archive_handle) /* Always round up */ printf("%d blocks\n", (int) (archive_handle->offset % 512 ? archive_handle->offset / 512 + 1 : - archive_handle->offset / 512 + archive_handle->offset / 512 )); if (saved_hardlinks) { /* Bummer - we still have unresolved hardlinks */ hardlinks_t *tmp = saved_hardlinks; diff --git a/coreutils/chown.c b/coreutils/chown.c index da6b6abdd..09cf73f04 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c @@ -72,7 +72,7 @@ int chown_main(int argc, char **argv) *groupName = ':'; /* replace '.' with ':' */ /* First, try parsing "user[:[group]]" */ - if (!groupName) { /* "user" */ + if (!groupName) { /* "user" */ ugid.uid = get_ug_id(*argv, xuname2uid); } else if (groupName == *argv) { /* ":group" */ ugid.gid = get_ug_id(groupName + 1, xgroup2gid); diff --git a/coreutils/install.c b/coreutils/install.c index aa7e8bf2b..c899158aa 100644 --- a/coreutils/install.c +++ b/coreutils/install.c @@ -86,7 +86,7 @@ int install_main(int argc, char **argv) break; } } - if ((flags & (OPT_OWNER|OPT_GROUP)) + if ((flags & (OPT_OWNER|OPT_GROUP)) && lchown(*argv, uid, gid) == -1 ) { bb_perror_msg("cannot change ownership of %s", *argv); diff --git a/editors/awk.c b/editors/awk.c index 9ed2781be..d6dcd9578 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -2648,7 +2648,7 @@ int awk_main(int argc, char **argv) char *vnames = (char *)vNames; /* cheat */ char *vvalues = (char *)vValues; - /* Undo busybox.c, or else strtod may eat ','! This breaks parsing: + /* Undo busybox.c, or else strtod may eat ','! This breaks parsing: * $1,$2 == '$1,' '$2', NOT '$1' ',' '$2' */ if (ENABLE_LOCALE_SUPPORT) setlocale(LC_NUMERIC, "C"); diff --git a/include/libbb.h b/include/libbb.h index 72261b760..4060498b8 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -423,8 +423,8 @@ extern long xgroup2gid(const char *name); extern unsigned long get_ug_id(const char *s, long (*xname2id)(const char *)); /* from chpst. Does not die, returns 0 on failure */ struct bb_uidgid_t { - uid_t uid; - gid_t gid; + uid_t uid; + gid_t gid; }; extern int get_uidgid(struct bb_uidgid_t*, const char*, int numeric_ok); /* what is this? */ diff --git a/networking/telnetd.c b/networking/telnetd.c index ff83c93da..51bd0c012 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c @@ -335,7 +335,7 @@ free_session(struct tsession *ts) free(ts); /* scan all sessions and find new maxfd */ - ts = sessions; + ts = sessions; maxfd = 0; while (ts) { if (maxfd < ts->ptyfd) diff --git a/procps/kill.c b/procps/kill.c index 18121f06f..5b167326f 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -94,7 +94,7 @@ do_it_now: pid = getpid(); sid = getsid(pid); /* Now kill all processes except our session */ - while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) { + while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) { if (p->sid != sid && p->pid != pid && p->pid != 1) kill(p->pid, signo); } diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c index 078e55a2e..1fd501b39 100644 --- a/scripts/kconfig/lxdialog/menubox.c +++ b/scripts/kconfig/lxdialog/menubox.c @@ -179,8 +179,8 @@ static void do_scroll(WINDOW *win, int *scroll, int n) * Display a menu for choosing among a number of options */ int dialog_menu(const char *title, const char *prompt, int height, int width, - int menu_height, const char *current, int item_no, - const char *const *items) + int menu_height, const char *current, int item_no, + const char *const *items) { int i, j, x, y, box_x, box_y; int key = 0, button = 0, scroll = 0, choice = 0; diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 405282796..716e41f5f 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -201,7 +201,7 @@ static void log_to_shmem(const char *msg, int len) /* Circular Buffer Algorithm: * -------------------------- - * tail == position where to store next syslog message. + * tail == position where to store next syslog message. * head == position of next message to retrieve ("print"). * if head == tail, there is no "unprinted" messages left. * head is typically advanced by separate "reader" program, diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index e2341ced1..4e9365116 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -155,7 +155,7 @@ static char super_block_buffer[BLOCK_SIZE]; /* gcc likes this more (code is smaller) than macro variant */ static ATTRIBUTE_ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n) { - return (size + n-1) / n; + return (size + n-1) / n; } #if ENABLE_FEATURE_MINIX2 |