aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
Diffstat (limited to 'libbb')
-rw-r--r--libbb/compare_string_array.c2
-rw-r--r--libbb/copy_file.c2
-rw-r--r--libbb/copyfd.c4
-rw-r--r--libbb/correct_password.c2
-rw-r--r--libbb/dump.c2
-rw-r--r--libbb/hash_fd.c6
-rw-r--r--libbb/inet_common.c4
-rw-r--r--libbb/loop.c6
-rw-r--r--libbb/printf.c2
-rw-r--r--libbb/process_escape_sequence.c2
-rw-r--r--libbb/run_shell.c6
-rw-r--r--libbb/setup_environment.c4
-rw-r--r--libbb/xgetlarg.c2
-rw-r--r--libbb/xgetularg.c2
-rw-r--r--libbb/xreadlink.c2
15 files changed, 24 insertions, 24 deletions
diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index fc077b309..e4191e35a 100644
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -17,7 +17,7 @@
#include <string.h>
/* returns the array number of the string */
-extern int
+extern int
compare_string_array(const char * const string_array[], const char *key)
{
int i;
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 991fa8f5b..0763b4586 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -119,7 +119,7 @@ int copy_file(const char *source, const char *dest, int flags)
status = -1;
}
} else if (S_ISREG(source_stat.st_mode) || (flags & FILEUTILS_DEREFERENCE))
- {
+ {
int src_fd;
int dst_fd;
#ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS
diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index 0b850884b..fcae8d3f7 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -32,7 +32,7 @@ static ssize_t bb_full_fd_action(int src_fd, int dst_fd, size_t size)
while (!size || total < size)
{
ssize_t wrote, xread;
-
+
xread = safe_read(src_fd, buffer,
(!size || size - total > BUFSIZ) ? BUFSIZ : size - total);
@@ -53,7 +53,7 @@ static ssize_t bb_full_fd_action(int src_fd, int dst_fd, size_t size)
break;
}
}
-
+
out:
RELEASE_CONFIG_BUFFER(buffer);
diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index 039379ae1..bb9e7d3cc 100644
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -61,7 +61,7 @@ int correct_password ( const struct passwd *pw )
}
else
#endif
- correct = pw-> pw_passwd;
+ correct = pw-> pw_passwd;
if ( correct == 0 || correct[0] == '\0' )
return 1;
diff --git a/libbb/dump.c b/libbb/dump.c
index 98f004ff6..7d923083a 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -695,7 +695,7 @@ void bb_dump_add(const char *fmt)
/* start new linked list of format units */
/* NOSTRICT */
- tfs = (FS *) xcalloc(1,sizeof(FS)); /*DBU:[dave@cray.com] start out NULL */
+ tfs = (FS *) xcalloc(1,sizeof(FS)); /*DBU:[dave@cray.com] start out NULL */
if (!bb_dump_fshead) {
bb_dump_fshead = tfs;
} else {
diff --git a/libbb/hash_fd.c b/libbb/hash_fd.c
index 3445a25a0..39825b378 100644
--- a/libbb/hash_fd.c
+++ b/libbb/hash_fd.c
@@ -212,7 +212,7 @@ static void sha1_end(unsigned char hval[], struct sha1_ctx_t *ctx)
ctx->wbuf[cnt++] = 0;
/* assemble the eight byte counter in the buffer in big-endian */
- /* format */
+ /* format */
ctx->wbuf[14] = swap_b32((ctx->count[1] << 3) | (ctx->count[0] >> 29));
ctx->wbuf[15] = swap_b32(ctx->count[0] << 3);
@@ -492,12 +492,12 @@ static void md5_hash_block(const void *buffer, size_t len, struct md5_ctx_t *ctx
# define OP(a, b, c, d, s, T) \
do \
- { \
+ { \
a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
++words; \
CYCLIC (a, s); \
a += b; \
- } \
+ } \
while (0)
/* It is unfortunate that C does not provide an operator for
diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index 321322d1f..3ff819742 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -206,8 +206,8 @@ int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
#ifndef IN6_IS_ADDR_UNSPECIFIED
# define IN6_IS_ADDR_UNSPECIFIED(a) \
- (((__u32 *) (a))[0] == 0 && ((__u32 *) (a))[1] == 0 && \
- ((__u32 *) (a))[2] == 0 && ((__u32 *) (a))[3] == 0)
+ (((__u32 *) (a))[0] == 0 && ((__u32 *) (a))[1] == 0 && \
+ ((__u32 *) (a))[2] == 0 && ((__u32 *) (a))[3] == 0)
#endif
diff --git a/libbb/loop.c b/libbb/loop.c
index 6c3144a77..09b2beaa7 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -56,7 +56,7 @@ char *query_loop(const char *device)
int fd;
bb_loop_info loopinfo;
char *dev=0;
-
+
if ((fd = open(device, O_RDONLY)) < 0) return 0;
if (!ioctl(fd, BB_LOOP_GET_STATUS, &loopinfo))
dev=bb_xasprintf("%ld %s", (long) loopinfo.lo_offset,
@@ -64,7 +64,7 @@ char *query_loop(const char *device)
close(fd);
return dev;
-}
+}
int del_loop(const char *device)
@@ -74,7 +74,7 @@ int del_loop(const char *device)
if ((fd = open(device, O_RDONLY)) < 0) return 1;
rc=ioctl(fd, LOOP_CLR_FD, 0);
close(fd);
-
+
return rc;
}
diff --git a/libbb/printf.c b/libbb/printf.c
index 4451273ef..2cba31792 100644
--- a/libbb/printf.c
+++ b/libbb/printf.c
@@ -65,7 +65,7 @@
/* Using either the original stdio implementation (from dev86) or
* my original stdio rewrite. Macros were:
* #define ferror(fp) (((fp)->mode&__MODE_ERR) != 0)
- * #define feof(fp) (((fp)->mode&__MODE_EOF) != 0)
+ * #define feof(fp) (((fp)->mode&__MODE_EOF) != 0)
* #define clearerr(fp) ((fp)->mode &= ~(__MODE_EOF|__MODE_ERR),0)
*/
#define SET_FERROR_UNLOCKED(S) ((S)->mode |= __MODE_ERR)
diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index 28b1e3697..1b7b6d190 100644
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -70,7 +70,7 @@ char bb_process_escape_sequence(const char **ptr)
if (d >= base) {
#ifdef WANT_HEX_ESCAPES
if ((base == 16) && (!--num_digits)) {
-/* return '\\'; */
+/* return '\\'; */
--q;
}
#endif
diff --git a/libbb/run_shell.c b/libbb/run_shell.c
index 6d084eead..d5dc37b54 100644
--- a/libbb/run_shell.c
+++ b/libbb/run_shell.c
@@ -46,7 +46,7 @@ static security_context_t current_sid=NULL;
void
renew_current_security_context(void)
{
- if (current_sid)
+ if (current_sid)
freecon(current_sid); /* Release old context */
getcon(&current_sid); /* update */
@@ -56,7 +56,7 @@ renew_current_security_context(void)
void
set_current_security_context(security_context_t sid)
{
- if (current_sid)
+ if (current_sid)
freecon(current_sid); /* Release old context */
current_sid=sid;
@@ -84,7 +84,7 @@ void run_shell ( const char *shell, int loginshell, const char *command, const c
args [0] = bb_get_last_path_component ( bb_xstrdup ( shell ));
- if ( loginshell )
+ if ( loginshell )
args [0] = bb_xasprintf ("-%s", args [0]);
if ( command ) {
diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index aeb285a53..dfab786d9 100644
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -58,7 +58,7 @@ void setup_environment ( const char *shell, int loginshell, int changeenv, const
* to change to that directory. There is no "default" home
* directory.
* Some systems default to HOME=/
- */
+ */
if ( chdir ( pw-> pw_dir )) {
if ( chdir ( "/" )) {
syslog ( LOG_WARNING, "unable to cd to %s' for user %s'\n", pw-> pw_dir, pw-> pw_name );
@@ -81,7 +81,7 @@ void setup_environment ( const char *shell, int loginshell, int changeenv, const
}
else if ( changeenv ) {
/* Set HOME, SHELL, and if not becoming a super-user,
- USER and LOGNAME. */
+ USER and LOGNAME. */
xsetenv ( "HOME", pw-> pw_dir );
xsetenv ( "SHELL", shell );
if ( pw-> pw_uid ) {
diff --git a/libbb/xgetlarg.c b/libbb/xgetlarg.c
index f24492bee..f332bb37e 100644
--- a/libbb/xgetlarg.c
+++ b/libbb/xgetlarg.c
@@ -22,7 +22,7 @@ extern long bb_xgetlarg(const char *arg, int base, long lower, long upper)
assert(arg!=NULL);
/* Don't allow leading whitespace.
- * Wrap isspace in () to make sure we call the
+ * Wrap isspace in () to make sure we call the
* function rather than the macro. */
if ((isspace)(*arg)) {
bb_show_usage();
diff --git a/libbb/xgetularg.c b/libbb/xgetularg.c
index e90085446..8d793f3d1 100644
--- a/libbb/xgetularg.c
+++ b/libbb/xgetularg.c
@@ -75,7 +75,7 @@ unsigned long bb_xgetularg_bnd_sfx(const char *arg, int base,
++e;
r *= suffixes->mult;
break;
- }
+ }
++suffixes;
}
}
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index 49823fa7f..b3e3eda2b 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -14,7 +14,7 @@
#include "libbb.h"
extern char *xreadlink(const char *path)
-{
+{
static const int GROWBY = 80; /* how large we will grow strings by */
char *buf = NULL;