summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
Diffstat (limited to 'libbb')
-rw-r--r--libbb/dump.c6
-rw-r--r--libbb/full_write.c2
-rw-r--r--libbb/human_readable.c4
-rw-r--r--libbb/inet_common.c2
-rw-r--r--libbb/inode_hash.c4
-rw-r--r--libbb/login.c2
-rw-r--r--libbb/make_directory.c2
-rw-r--r--libbb/parse_config.c2
-rw-r--r--libbb/parse_mode.c10
-rw-r--r--libbb/progress.c6
-rw-r--r--libbb/speed_table.c4
-rw-r--r--libbb/update_passwd.c2
-rw-r--r--libbb/wfopen_input.c4
-rw-r--r--libbb/xatonum_template.c2
-rw-r--r--libbb/xgetcwd.c2
15 files changed, 27 insertions, 27 deletions
diff --git a/libbb/dump.c b/libbb/dump.c
index 4db3f06..1b1d03a 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -4,7 +4,7 @@
* based on code from util-linux v 2.11l
*
* Copyright (c) 1989
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*
@@ -208,7 +208,7 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
pr->bcnt = fu->bcnt;
} else if (sokay == USEPREC) {
pr->bcnt = prec;
- } else { /* NOTOKAY */
+ } else { /* NOTOKAY */
bb_error_msg_and_die("%%s requires a precision or a byte count");
}
} else if (*p1 == '_') {
@@ -467,7 +467,7 @@ static void bpad(PR *pr)
static const char conv_str[] ALIGN1 =
"\0\\0\0"
- "\007\\a\0" /* \a */
+ "\007\\a\0" /* \a */
"\b\\b\0"
"\f\\b\0"
"\n\\n\0"
diff --git a/libbb/full_write.c b/libbb/full_write.c
index a2abaee..777fbd9 100644
--- a/libbb/full_write.c
+++ b/libbb/full_write.c
@@ -30,7 +30,7 @@ ssize_t FAST_FUNC full_write(int fd, const void *buf, size_t len)
/* user can do another write to know the error code */
return total;
}
- return cc; /* write() returns -1 on failure. */
+ return cc; /* write() returns -1 on failure. */
}
total += cc;
diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index 50cbe41..8b22b0c 100644
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -53,8 +53,8 @@ const char* FAST_FUNC make_human_readable_str(unsigned long long val,
u = unit_chars;
if (display_unit) {
- val += display_unit/2; /* Deal with rounding */
- val /= display_unit; /* Don't combine with the line above! */
+ val += display_unit/2; /* Deal with rounding */
+ val /= display_unit; /* Don't combine with the line above! */
/* will just print it as ulonglong (below) */
} else {
while ((val >= 1024)
diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index e031ddf..6f585eb 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -218,4 +218,4 @@ char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
return xstrdup(name);
}
-#endif /* CONFIG_FEATURE_IPV6 */
+#endif /* CONFIG_FEATURE_IPV6 */
diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c
index 2aea08b..715535e 100644
--- a/libbb/inode_hash.c
+++ b/libbb/inode_hash.c
@@ -17,8 +17,8 @@ typedef struct ino_dev_hash_bucket_struct {
char name[1];
} ino_dev_hashtable_bucket_t;
-#define HASH_SIZE 311 /* Should be prime */
-#define hash_inode(i) ((i) % HASH_SIZE)
+#define HASH_SIZE 311 /* Should be prime */
+#define hash_inode(i) ((i) % HASH_SIZE)
/* array of [HASH_SIZE] elements */
static ino_dev_hashtable_bucket_t **ino_dev_hashtable;
diff --git a/libbb/login.c b/libbb/login.c
index aa2e171..8a82c6a 100644
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -30,7 +30,7 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
time(&t);
uname(&uts);
- puts("\r"); /* start a new line */
+ puts("\r"); /* start a new line */
fp = fopen_for_read(issue_file);
if (!fp)
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 1350e8b..72303e7 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -44,7 +44,7 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
while (1) {
c = '\0';
- if (flags & FILEUTILS_RECUR) { /* Get the parent */
+ if (flags & FILEUTILS_RECUR) { /* Get the parent */
/* Bypass leading non-'/'s and then subsequent '/'s */
while (*s) {
if (*s == '/') {
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 9dbfaf5..d471edb 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -45,7 +45,7 @@ int parse_main(int argc UNUSED_PARAM, char **argv)
Typical usage:
----- CUT -----
- char *t[3]; // tokens placeholder
+ char *t[3]; // tokens placeholder
parser_t *p = config_open(filename);
if (p) {
// parse line-by-line
diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c
index 8ea8916..5a4e1c5 100644
--- a/libbb/parse_mode.c
+++ b/libbb/parse_mode.c
@@ -57,8 +57,8 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
/* Note: we allow empty clauses, and hence empty modes.
* We treat an empty mode as no change to perms. */
- while (*s) { /* Process clauses. */
- if (*s == ',') { /* We allow empty clauses. */
+ while (*s) { /* Process clauses. */
+ if (*s == ',') { /* We allow empty clauses. */
++s;
continue;
}
@@ -77,7 +77,7 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
}
} while (*++p);
- do { /* Process action list. */
+ do { /* Process action list. */
if ((*s != '+') && (*s != '-')) {
if (*s != '=') {
return 0;
@@ -93,7 +93,7 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
op = *s++;
/* Check for permcopy. */
- p = who_chars + 1; /* Skip 'a' entry. */
+ p = who_chars + 1; /* Skip 'a' entry. */
do {
if (*p == *s) {
int i = 0;
@@ -128,7 +128,7 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
}
} while (*++p);
GOT_ACTION:
- if (permlist) { /* The permlist was nonempty. */
+ if (permlist) { /* The permlist was nonempty. */
mode_t tmp = wholist;
if (!wholist) {
mode_t u_mask = umask(0);
diff --git a/libbb/progress.c b/libbb/progress.c
index f532713..4c2763c 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -7,7 +7,7 @@
*/
/*-
* Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -18,8 +18,8 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
+ * 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change
+ * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
*
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
diff --git a/libbb/speed_table.c b/libbb/speed_table.c
index 6f95c54..45159f1 100644
--- a/libbb/speed_table.c
+++ b/libbb/speed_table.c
@@ -29,12 +29,12 @@ static const struct speed_map speeds[] = {
{B2400, 2400},
{B4800, 4800},
{B9600, 9600},
-#ifdef B19200
+#ifdef B19200
{B19200, 19200},
#elif defined(EXTA)
{EXTA, 19200},
#endif
-#ifdef B38400
+#ifdef B38400
{B38400, 38400/256 + 0x8000U},
#elif defined(EXTB)
{EXTB, 38400/256 + 0x8000U},
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index a2be0f1..dc50292 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -22,7 +22,7 @@ static void check_selinux_update_passwd(const char *username)
char *seuser;
if (getuid() != (uid_t)0 || is_selinux_enabled() == 0)
- return; /* No need to check */
+ return; /* No need to check */
if (getprevcon_raw(&context) < 0)
bb_perror_msg_and_die("getprevcon failed");
diff --git a/libbb/wfopen_input.c b/libbb/wfopen_input.c
index 422a58e..d8b1c4a 100644
--- a/libbb/wfopen_input.c
+++ b/libbb/wfopen_input.c
@@ -31,7 +31,7 @@ FILE* FAST_FUNC xfopen_stdin(const char *filename)
FILE *fp = fopen_or_warn_stdin(filename);
if (fp)
return fp;
- xfunc_die(); /* We already output an error message. */
+ xfunc_die(); /* We already output an error message. */
}
int FAST_FUNC open_or_warn_stdin(const char *filename)
@@ -52,5 +52,5 @@ int FAST_FUNC xopen_stdin(const char *filename)
int fd = open_or_warn_stdin(filename);
if (fd >= 0)
return fd;
- xfunc_die(); /* We already output an error message. */
+ xfunc_die(); /* We already output an error message. */
}
diff --git a/libbb/xatonum_template.c b/libbb/xatonum_template.c
index f67b507..029f662 100644
--- a/libbb/xatonum_template.c
+++ b/libbb/xatonum_template.c
@@ -41,7 +41,7 @@ unsigned type FAST_FUNC xstrtou(_range_sfx)(const char *numstr, int base,
if (errno || numstr == e)
goto inval; /* error / no digits / illegal trailing chars */
- errno = old_errno; /* Ok. So restore errno. */
+ errno = old_errno; /* Ok. So restore errno. */
/* Do optional suffix parsing. Allow 'empty' suffix tables.
* Note that we also allow nul suffixes with associated multipliers,
diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c
index 9736721..71720d3 100644
--- a/libbb/xgetcwd.c
+++ b/libbb/xgetcwd.c
@@ -24,7 +24,7 @@ xrealloc_getcwd_or_warn(char *cwd)
char *ret;
unsigned path_max;
- path_max = 128; /* 128 + 64 should be enough for 99% of cases */
+ path_max = 128; /* 128 + 64 should be enough for 99% of cases */
while (1) {
path_max += PATH_INCR;
generated by cgit v1.1 at 2024-11-05 21:12:22 +0000