diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-29 11:46:52 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-29 11:46:52 +0200 |
commit | fb132e47370378474c68ad22c1c0cb2ccee178de (patch) | |
tree | 4f78d0fdd1c2fa2341c7d9bb17f9d98d099a238c /libbb | |
parent | 66cb7bed33da605674c3d24734466b8e8a60e337 (diff) | |
download | busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.gz busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.bz2 busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.zip |
whitespace cleanup
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/hash_md5_sha.c | 8 | ||||
-rw-r--r-- | libbb/pw_encrypt_sha.c | 6 | ||||
-rw-r--r-- | libbb/simplify_path.c | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c index e427f6080..b87d1dde8 100644 --- a/libbb/hash_md5_sha.c +++ b/libbb/hash_md5_sha.c | |||
@@ -158,11 +158,11 @@ static void FAST_FUNC md5_process_block64(md5_ctx_t *ctx) | |||
158 | }; | 158 | }; |
159 | static const char P_array[] ALIGN1 = { | 159 | static const char P_array[] ALIGN1 = { |
160 | # if MD5_SIZE_VS_SPEED > 1 | 160 | # if MD5_SIZE_VS_SPEED > 1 |
161 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */ | 161 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */ |
162 | # endif | 162 | # endif |
163 | 1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, /* 2 */ | 163 | 1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, /* 2 */ |
164 | 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, /* 3 */ | 164 | 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, /* 3 */ |
165 | 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9 /* 4 */ | 165 | 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9 /* 4 */ |
166 | }; | 166 | }; |
167 | #endif | 167 | #endif |
168 | uint32_t *words = (void*) ctx->wbuffer; | 168 | uint32_t *words = (void*) ctx->wbuffer; |
diff --git a/libbb/pw_encrypt_sha.c b/libbb/pw_encrypt_sha.c index 070e0d442..e46848b71 100644 --- a/libbb/pw_encrypt_sha.c +++ b/libbb/pw_encrypt_sha.c | |||
@@ -196,9 +196,9 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data) | |||
196 | //TODO: replace with something like | 196 | //TODO: replace with something like |
197 | // bb_uuencode(cp, src, length, bb_uuenc_tbl_XXXbase64); | 197 | // bb_uuencode(cp, src, length, bb_uuenc_tbl_XXXbase64); |
198 | #define b64_from_24bit(B2, B1, B0, N) \ | 198 | #define b64_from_24bit(B2, B1, B0, N) \ |
199 | do { \ | 199 | do { \ |
200 | unsigned w = ((B2) << 16) | ((B1) << 8) | (B0); \ | 200 | unsigned w = ((B2) << 16) | ((B1) << 8) | (B0); \ |
201 | resptr = to64(resptr, w, N); \ | 201 | resptr = to64(resptr, w, N); \ |
202 | } while (0) | 202 | } while (0) |
203 | if (is_sha512 == '5') { | 203 | if (is_sha512 == '5') { |
204 | unsigned i = 0; | 204 | unsigned i = 0; |
diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c index 3818d32be..89dc5bdf2 100644 --- a/libbb/simplify_path.c +++ b/libbb/simplify_path.c | |||
@@ -15,17 +15,17 @@ char* FAST_FUNC bb_simplify_abs_path_inplace(char *start) | |||
15 | p = s = start; | 15 | p = s = start; |
16 | do { | 16 | do { |
17 | if (*p == '/') { | 17 | if (*p == '/') { |
18 | if (*s == '/') { /* skip duplicate (or initial) slash */ | 18 | if (*s == '/') { /* skip duplicate (or initial) slash */ |
19 | continue; | 19 | continue; |
20 | } | 20 | } |
21 | if (*s == '.') { | 21 | if (*s == '.') { |
22 | if (s[1] == '/' || !s[1]) { /* remove extra '.' */ | 22 | if (s[1] == '/' || !s[1]) { /* remove extra '.' */ |
23 | continue; | 23 | continue; |
24 | } | 24 | } |
25 | if ((s[1] == '.') && (s[2] == '/' || !s[2])) { | 25 | if ((s[1] == '.') && (s[2] == '/' || !s[2])) { |
26 | ++s; | 26 | ++s; |
27 | if (p > start) { | 27 | if (p > start) { |
28 | while (*--p != '/') /* omit previous dir */ | 28 | while (*--p != '/') /* omit previous dir */ |
29 | continue; | 29 | continue; |
30 | } | 30 | } |
31 | continue; | 31 | continue; |
@@ -35,8 +35,8 @@ char* FAST_FUNC bb_simplify_abs_path_inplace(char *start) | |||
35 | *++p = *s; | 35 | *++p = *s; |
36 | } while (*++s); | 36 | } while (*++s); |
37 | 37 | ||
38 | if ((p == start) || (*p != '/')) { /* not a trailing slash */ | 38 | if ((p == start) || (*p != '/')) { /* not a trailing slash */ |
39 | ++p; /* so keep last character */ | 39 | ++p; /* so keep last character */ |
40 | } | 40 | } |
41 | *p = '\0'; | 41 | *p = '\0'; |
42 | return p; | 42 | return p; |