From 3b08d9d932eef09403074d5af31e10d8011e840b Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 21 Mar 2016 15:19:30 +0100 Subject: testprogs: K&R formatting cosmetics --- libavutil/md5.c | 57 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 21 deletions(-) (limited to 'libavutil/md5.c') diff --git a/libavutil/md5.c b/libavutil/md5.c index f2e9061829..79224ed7b2 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -31,12 +31,13 @@ */ #include + #include "bswap.h" #include "intreadwrite.h" -#include "md5.h" #include "mem.h" +#include "md5.h" -typedef struct AVMD5{ +typedef struct AVMD5 { uint64_t len; uint8_t block[64]; uint32_t ABCD[4]; @@ -76,16 +77,21 @@ static const uint32_t T[64] = { // T[i]= fabs(sin(i+1)<<32) 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, }; -#define CORE(i, a, b, c, d) do { \ - t = S[i >> 4][i & 3]; \ +#define CORE(i, a, b, c, d) \ + do { \ + t = S[i >> 4][i & 3]; \ a += T[i]; \ \ if (i < 32) { \ - if (i < 16) a += (d ^ (b & (c ^ d))) + X[ i & 15]; \ - else a += (c ^ (d & (c ^ b))) + X[(1 + 5*i) & 15]; \ + if (i < 16) \ + a += (d ^ (b & (c ^ d))) + X[i & 15]; \ + else \ + a += (c ^ (d & (c ^ b))) + X[(1 + 5 * i) & 15]; \ } else { \ - if (i < 48) a += (b ^ c ^ d) + X[(5 + 3*i) & 15]; \ - else a += (c ^ (b | ~d)) + X[( 7*i) & 15]; \ + if (i < 48) \ + a += (b ^ c ^ d) + X[(5 + 3 * i) & 15]; \ + else \ + a += (c ^ (b | ~d)) + X[(7 * i) & 15]; \ } \ a = b + (a << t | a >> (32 - t)); \ } while (0) @@ -115,10 +121,13 @@ static void body(uint32_t ABCD[4], uint32_t X[16]) } #else #define CORE2(i) \ - CORE( i, a,b,c,d); CORE((i+1),d,a,b,c); \ - CORE((i+2),c,d,a,b); CORE((i+3),b,c,d,a) -#define CORE4(i) CORE2(i); CORE2((i+4)); CORE2((i+8)); CORE2((i+12)) - CORE4(0); CORE4(16); CORE4(32); CORE4(48); + CORE(i, a, b, c, d); CORE((i + 1), d, a, b, c); \ + CORE((i + 2), c, d, a, b); CORE((i + 3), b, c, d, a) +#define CORE4(i) CORE2(i); CORE2((i + 4)); CORE2((i + 8)); CORE2((i + 12)) + CORE4(0); + CORE4(16); + CORE4(32); + CORE4(48); #endif ABCD[0] += d; @@ -141,7 +150,7 @@ void av_md5_update(AVMD5 *ctx, const uint8_t *src, const int len) { int i, j; - j = ctx->len & 63; + j = ctx->len & 63; ctx->len += len; for (i = 0; i < len; i++) { @@ -162,10 +171,10 @@ void av_md5_final(AVMD5 *ctx, uint8_t *dst) while ((ctx->len & 63) != 56) av_md5_update(ctx, "", 1); - av_md5_update(ctx, (uint8_t *)&finalcount, 8); + av_md5_update(ctx, (uint8_t *) &finalcount, 8); for (i = 0; i < 4; i++) - AV_WL32(dst + 4*i, ctx->ABCD[3 - i]); + AV_WL32(dst + 4 * i, ctx->ABCD[3 - i]); } void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len) @@ -188,20 +197,26 @@ static void print_md5(uint8_t *md5) printf("\n"); } -int main(void){ +int main(void) +{ uint8_t md5val[16]; int i; uint8_t in[1000]; for (i = 0; i < 1000; i++) in[i] = i * i; - av_md5_sum(md5val, in, 1000); print_md5(md5val); - av_md5_sum(md5val, in, 63); print_md5(md5val); - av_md5_sum(md5val, in, 64); print_md5(md5val); - av_md5_sum(md5val, in, 65); print_md5(md5val); + av_md5_sum(md5val, in, 1000); + print_md5(md5val); + av_md5_sum(md5val, in, 63); + print_md5(md5val); + av_md5_sum(md5val, in, 64); + print_md5(md5val); + av_md5_sum(md5val, in, 65); + print_md5(md5val); for (i = 0; i < 1000; i++) in[i] = i % 127; - av_md5_sum(md5val, in, 999); print_md5(md5val); + av_md5_sum(md5val, in, 999); + print_md5(md5val); return 0; } -- cgit v1.2.3