diff options
author | timr <timr@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-01-25 00:08:53 +0000 |
---|---|---|
committer | timr <timr@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-01-25 00:08:53 +0000 |
commit | fd8222f9b9db2a783b17ec9c59cf3fc22a4e4586 (patch) | |
tree | 5f329b7d0c7f20ecced0dc7581a9ba6dc720d965 /libbb | |
parent | 45d75f9ecc8f2b582407059da7d414f990ced68a (diff) | |
download | busybox-w32-fd8222f9b9db2a783b17ec9c59cf3fc22a4e4586.tar.gz busybox-w32-fd8222f9b9db2a783b17ec9c59cf3fc22a4e4586.tar.bz2 busybox-w32-fd8222f9b9db2a783b17ec9c59cf3fc22a4e4586.zip |
just whitespace
git-svn-id: svn://busybox.net/trunk/busybox@13584 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/compare_string_array.c | 2 | ||||
-rw-r--r-- | libbb/copy_file.c | 2 | ||||
-rw-r--r-- | libbb/copyfd.c | 4 | ||||
-rw-r--r-- | libbb/correct_password.c | 2 | ||||
-rw-r--r-- | libbb/dump.c | 2 | ||||
-rw-r--r-- | libbb/hash_fd.c | 6 | ||||
-rw-r--r-- | libbb/inet_common.c | 4 | ||||
-rw-r--r-- | libbb/loop.c | 6 | ||||
-rw-r--r-- | libbb/printf.c | 2 | ||||
-rw-r--r-- | libbb/process_escape_sequence.c | 2 | ||||
-rw-r--r-- | libbb/run_shell.c | 6 | ||||
-rw-r--r-- | libbb/setup_environment.c | 4 | ||||
-rw-r--r-- | libbb/xgetlarg.c | 2 | ||||
-rw-r--r-- | libbb/xgetularg.c | 2 | ||||
-rw-r--r-- | libbb/xreadlink.c | 2 |
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 @@ | |||
17 | #include <string.h> | 17 | #include <string.h> |
18 | 18 | ||
19 | /* returns the array number of the string */ | 19 | /* returns the array number of the string */ |
20 | extern int | 20 | extern int |
21 | compare_string_array(const char * const string_array[], const char *key) | 21 | compare_string_array(const char * const string_array[], const char *key) |
22 | { | 22 | { |
23 | int i; | 23 | 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) | |||
119 | status = -1; | 119 | status = -1; |
120 | } | 120 | } |
121 | } else if (S_ISREG(source_stat.st_mode) || (flags & FILEUTILS_DEREFERENCE)) | 121 | } else if (S_ISREG(source_stat.st_mode) || (flags & FILEUTILS_DEREFERENCE)) |
122 | { | 122 | { |
123 | int src_fd; | 123 | int src_fd; |
124 | int dst_fd; | 124 | int dst_fd; |
125 | #ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS | 125 | #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) | |||
32 | while (!size || total < size) | 32 | while (!size || total < size) |
33 | { | 33 | { |
34 | ssize_t wrote, xread; | 34 | ssize_t wrote, xread; |
35 | 35 | ||
36 | xread = safe_read(src_fd, buffer, | 36 | xread = safe_read(src_fd, buffer, |
37 | (!size || size - total > BUFSIZ) ? BUFSIZ : size - total); | 37 | (!size || size - total > BUFSIZ) ? BUFSIZ : size - total); |
38 | 38 | ||
@@ -53,7 +53,7 @@ static ssize_t bb_full_fd_action(int src_fd, int dst_fd, size_t size) | |||
53 | break; | 53 | break; |
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
57 | out: | 57 | out: |
58 | RELEASE_CONFIG_BUFFER(buffer); | 58 | RELEASE_CONFIG_BUFFER(buffer); |
59 | 59 | ||
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 ) | |||
61 | } | 61 | } |
62 | else | 62 | else |
63 | #endif | 63 | #endif |
64 | correct = pw-> pw_passwd; | 64 | correct = pw-> pw_passwd; |
65 | 65 | ||
66 | if ( correct == 0 || correct[0] == '\0' ) | 66 | if ( correct == 0 || correct[0] == '\0' ) |
67 | return 1; | 67 | 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) | |||
695 | 695 | ||
696 | /* start new linked list of format units */ | 696 | /* start new linked list of format units */ |
697 | /* NOSTRICT */ | 697 | /* NOSTRICT */ |
698 | tfs = (FS *) xcalloc(1,sizeof(FS)); /*DBU:[dave@cray.com] start out NULL */ | 698 | tfs = (FS *) xcalloc(1,sizeof(FS)); /*DBU:[dave@cray.com] start out NULL */ |
699 | if (!bb_dump_fshead) { | 699 | if (!bb_dump_fshead) { |
700 | bb_dump_fshead = tfs; | 700 | bb_dump_fshead = tfs; |
701 | } else { | 701 | } 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) | |||
212 | ctx->wbuf[cnt++] = 0; | 212 | ctx->wbuf[cnt++] = 0; |
213 | 213 | ||
214 | /* assemble the eight byte counter in the buffer in big-endian */ | 214 | /* assemble the eight byte counter in the buffer in big-endian */ |
215 | /* format */ | 215 | /* format */ |
216 | 216 | ||
217 | ctx->wbuf[14] = swap_b32((ctx->count[1] << 3) | (ctx->count[0] >> 29)); | 217 | ctx->wbuf[14] = swap_b32((ctx->count[1] << 3) | (ctx->count[0] >> 29)); |
218 | ctx->wbuf[15] = swap_b32(ctx->count[0] << 3); | 218 | 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 | |||
492 | 492 | ||
493 | # define OP(a, b, c, d, s, T) \ | 493 | # define OP(a, b, c, d, s, T) \ |
494 | do \ | 494 | do \ |
495 | { \ | 495 | { \ |
496 | a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \ | 496 | a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \ |
497 | ++words; \ | 497 | ++words; \ |
498 | CYCLIC (a, s); \ | 498 | CYCLIC (a, s); \ |
499 | a += b; \ | 499 | a += b; \ |
500 | } \ | 500 | } \ |
501 | while (0) | 501 | while (0) |
502 | 502 | ||
503 | /* It is unfortunate that C does not provide an operator for | 503 | /* 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) | |||
206 | 206 | ||
207 | #ifndef IN6_IS_ADDR_UNSPECIFIED | 207 | #ifndef IN6_IS_ADDR_UNSPECIFIED |
208 | # define IN6_IS_ADDR_UNSPECIFIED(a) \ | 208 | # define IN6_IS_ADDR_UNSPECIFIED(a) \ |
209 | (((__u32 *) (a))[0] == 0 && ((__u32 *) (a))[1] == 0 && \ | 209 | (((__u32 *) (a))[0] == 0 && ((__u32 *) (a))[1] == 0 && \ |
210 | ((__u32 *) (a))[2] == 0 && ((__u32 *) (a))[3] == 0) | 210 | ((__u32 *) (a))[2] == 0 && ((__u32 *) (a))[3] == 0) |
211 | #endif | 211 | #endif |
212 | 212 | ||
213 | 213 | ||
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) | |||
56 | int fd; | 56 | int fd; |
57 | bb_loop_info loopinfo; | 57 | bb_loop_info loopinfo; |
58 | char *dev=0; | 58 | char *dev=0; |
59 | 59 | ||
60 | if ((fd = open(device, O_RDONLY)) < 0) return 0; | 60 | if ((fd = open(device, O_RDONLY)) < 0) return 0; |
61 | if (!ioctl(fd, BB_LOOP_GET_STATUS, &loopinfo)) | 61 | if (!ioctl(fd, BB_LOOP_GET_STATUS, &loopinfo)) |
62 | dev=bb_xasprintf("%ld %s", (long) loopinfo.lo_offset, | 62 | dev=bb_xasprintf("%ld %s", (long) loopinfo.lo_offset, |
@@ -64,7 +64,7 @@ char *query_loop(const char *device) | |||
64 | close(fd); | 64 | close(fd); |
65 | 65 | ||
66 | return dev; | 66 | return dev; |
67 | } | 67 | } |
68 | 68 | ||
69 | 69 | ||
70 | int del_loop(const char *device) | 70 | int del_loop(const char *device) |
@@ -74,7 +74,7 @@ int del_loop(const char *device) | |||
74 | if ((fd = open(device, O_RDONLY)) < 0) return 1; | 74 | if ((fd = open(device, O_RDONLY)) < 0) return 1; |
75 | rc=ioctl(fd, LOOP_CLR_FD, 0); | 75 | rc=ioctl(fd, LOOP_CLR_FD, 0); |
76 | close(fd); | 76 | close(fd); |
77 | 77 | ||
78 | return rc; | 78 | return rc; |
79 | } | 79 | } |
80 | 80 | ||
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 @@ | |||
65 | /* Using either the original stdio implementation (from dev86) or | 65 | /* Using either the original stdio implementation (from dev86) or |
66 | * my original stdio rewrite. Macros were: | 66 | * my original stdio rewrite. Macros were: |
67 | * #define ferror(fp) (((fp)->mode&__MODE_ERR) != 0) | 67 | * #define ferror(fp) (((fp)->mode&__MODE_ERR) != 0) |
68 | * #define feof(fp) (((fp)->mode&__MODE_EOF) != 0) | 68 | * #define feof(fp) (((fp)->mode&__MODE_EOF) != 0) |
69 | * #define clearerr(fp) ((fp)->mode &= ~(__MODE_EOF|__MODE_ERR),0) | 69 | * #define clearerr(fp) ((fp)->mode &= ~(__MODE_EOF|__MODE_ERR),0) |
70 | */ | 70 | */ |
71 | #define SET_FERROR_UNLOCKED(S) ((S)->mode |= __MODE_ERR) | 71 | #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) | |||
70 | if (d >= base) { | 70 | if (d >= base) { |
71 | #ifdef WANT_HEX_ESCAPES | 71 | #ifdef WANT_HEX_ESCAPES |
72 | if ((base == 16) && (!--num_digits)) { | 72 | if ((base == 16) && (!--num_digits)) { |
73 | /* return '\\'; */ | 73 | /* return '\\'; */ |
74 | --q; | 74 | --q; |
75 | } | 75 | } |
76 | #endif | 76 | #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; | |||
46 | void | 46 | void |
47 | renew_current_security_context(void) | 47 | renew_current_security_context(void) |
48 | { | 48 | { |
49 | if (current_sid) | 49 | if (current_sid) |
50 | freecon(current_sid); /* Release old context */ | 50 | freecon(current_sid); /* Release old context */ |
51 | 51 | ||
52 | getcon(¤t_sid); /* update */ | 52 | getcon(¤t_sid); /* update */ |
@@ -56,7 +56,7 @@ renew_current_security_context(void) | |||
56 | void | 56 | void |
57 | set_current_security_context(security_context_t sid) | 57 | set_current_security_context(security_context_t sid) |
58 | { | 58 | { |
59 | if (current_sid) | 59 | if (current_sid) |
60 | freecon(current_sid); /* Release old context */ | 60 | freecon(current_sid); /* Release old context */ |
61 | 61 | ||
62 | current_sid=sid; | 62 | current_sid=sid; |
@@ -84,7 +84,7 @@ void run_shell ( const char *shell, int loginshell, const char *command, const c | |||
84 | 84 | ||
85 | args [0] = bb_get_last_path_component ( bb_xstrdup ( shell )); | 85 | args [0] = bb_get_last_path_component ( bb_xstrdup ( shell )); |
86 | 86 | ||
87 | if ( loginshell ) | 87 | if ( loginshell ) |
88 | args [0] = bb_xasprintf ("-%s", args [0]); | 88 | args [0] = bb_xasprintf ("-%s", args [0]); |
89 | 89 | ||
90 | if ( command ) { | 90 | 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 | |||
58 | * to change to that directory. There is no "default" home | 58 | * to change to that directory. There is no "default" home |
59 | * directory. | 59 | * directory. |
60 | * Some systems default to HOME=/ | 60 | * Some systems default to HOME=/ |
61 | */ | 61 | */ |
62 | if ( chdir ( pw-> pw_dir )) { | 62 | if ( chdir ( pw-> pw_dir )) { |
63 | if ( chdir ( "/" )) { | 63 | if ( chdir ( "/" )) { |
64 | syslog ( LOG_WARNING, "unable to cd to %s' for user %s'\n", pw-> pw_dir, pw-> pw_name ); | 64 | 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 | |||
81 | } | 81 | } |
82 | else if ( changeenv ) { | 82 | else if ( changeenv ) { |
83 | /* Set HOME, SHELL, and if not becoming a super-user, | 83 | /* Set HOME, SHELL, and if not becoming a super-user, |
84 | USER and LOGNAME. */ | 84 | USER and LOGNAME. */ |
85 | xsetenv ( "HOME", pw-> pw_dir ); | 85 | xsetenv ( "HOME", pw-> pw_dir ); |
86 | xsetenv ( "SHELL", shell ); | 86 | xsetenv ( "SHELL", shell ); |
87 | if ( pw-> pw_uid ) { | 87 | 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) | |||
22 | assert(arg!=NULL); | 22 | assert(arg!=NULL); |
23 | 23 | ||
24 | /* Don't allow leading whitespace. | 24 | /* Don't allow leading whitespace. |
25 | * Wrap isspace in () to make sure we call the | 25 | * Wrap isspace in () to make sure we call the |
26 | * function rather than the macro. */ | 26 | * function rather than the macro. */ |
27 | if ((isspace)(*arg)) { | 27 | if ((isspace)(*arg)) { |
28 | bb_show_usage(); | 28 | 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, | |||
75 | ++e; | 75 | ++e; |
76 | r *= suffixes->mult; | 76 | r *= suffixes->mult; |
77 | break; | 77 | break; |
78 | } | 78 | } |
79 | ++suffixes; | 79 | ++suffixes; |
80 | } | 80 | } |
81 | } | 81 | } |
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 @@ | |||
14 | #include "libbb.h" | 14 | #include "libbb.h" |
15 | 15 | ||
16 | extern char *xreadlink(const char *path) | 16 | extern char *xreadlink(const char *path) |
17 | { | 17 | { |
18 | static const int GROWBY = 80; /* how large we will grow strings by */ | 18 | static const int GROWBY = 80; /* how large we will grow strings by */ |
19 | 19 | ||
20 | char *buf = NULL; | 20 | char *buf = NULL; |