diff options
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 e427f60..b87d1dd 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) }; static const char P_array[] ALIGN1 = { # if MD5_SIZE_VS_SPEED > 1 - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */ # endif - 1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, /* 2 */ - 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, /* 3 */ - 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9 /* 4 */ + 1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, /* 2 */ + 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, /* 3 */ + 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9 /* 4 */ }; #endif uint32_t *words = (void*) ctx->wbuffer; diff --git a/libbb/pw_encrypt_sha.c b/libbb/pw_encrypt_sha.c index 070e0d4..e46848b 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) //TODO: replace with something like // bb_uuencode(cp, src, length, bb_uuenc_tbl_XXXbase64); #define b64_from_24bit(B2, B1, B0, N) \ -do { \ - unsigned w = ((B2) << 16) | ((B1) << 8) | (B0); \ - resptr = to64(resptr, w, N); \ +do { \ + unsigned w = ((B2) << 16) | ((B1) << 8) | (B0); \ + resptr = to64(resptr, w, N); \ } while (0) if (is_sha512 == '5') { unsigned i = 0; diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c index 3818d32..89dc5bd 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) p = s = start; do { if (*p == '/') { - if (*s == '/') { /* skip duplicate (or initial) slash */ + if (*s == '/') { /* skip duplicate (or initial) slash */ continue; } if (*s == '.') { - if (s[1] == '/' || !s[1]) { /* remove extra '.' */ + if (s[1] == '/' || !s[1]) { /* remove extra '.' */ continue; } if ((s[1] == '.') && (s[2] == '/' || !s[2])) { ++s; if (p > start) { - while (*--p != '/') /* omit previous dir */ + while (*--p != '/') /* omit previous dir */ continue; } continue; @@ -35,8 +35,8 @@ char* FAST_FUNC bb_simplify_abs_path_inplace(char *start) *++p = *s; } while (*++s); - if ((p == start) || (*p != '/')) { /* not a trailing slash */ - ++p; /* so keep last character */ + if ((p == start) || (*p != '/')) { /* not a trailing slash */ + ++p; /* so keep last character */ } *p = '\0'; return p; |