2005-04-11 20:05:13

by Jesper Juhl

[permalink] [raw]
Subject: [PATCH 2/2] cifs: md4 cleanup - long lines and spaces


Remove blank line, break long lines and line up two lines.

Patch is also available here:
http://www.linuxtux.org/~juhl/kernel_patches/fs_cifs_md4-lines-and-spaces.patch


Signed-off-by: Jesper Juhl <[email protected]>


--- linux-2.6.12-rc2-mm2/fs/cifs/md4.c.with_patch1 2005-04-09 10:07:28.000000000 +0200
+++ linux-2.6.12-rc2-mm2/fs/cifs/md4.c 2005-04-09 10:12:41.000000000 +0200
@@ -47,8 +47,10 @@ static __u32 lshift(__u32 x, int s)
}

#define ROUND1(a,b,c,d,k,s) (*a) = lshift((*a) + F(*b,*c,*d) + X[k], s)
-#define ROUND2(a,b,c,d,k,s) (*a) = lshift((*a) + G(*b,*c,*d) + X[k] + (__u32)0x5A827999,s)
-#define ROUND3(a,b,c,d,k,s) (*a) = lshift((*a) + H(*b,*c,*d) + X[k] + (__u32)0x6ED9EBA1,s)
+#define ROUND2(a,b,c,d,k,s) (*a) = lshift((*a) + G(*b,*c,*d) + X[k] \
+ + (__u32)0x5A827999,s)
+#define ROUND3(a,b,c,d,k,s) (*a) = lshift((*a) + H(*b,*c,*d) + X[k] \
+ + (__u32)0x6ED9EBA1,s)

/* this applies md4 to 64 byte chunks */
static void mdfour64(__u32 *M, __u32 *A, __u32 *B, __u32 *C, __u32 *D)
@@ -57,7 +59,6 @@ static void mdfour64(__u32 *M, __u32 *A,
__u32 AA, BB, CC, DD;
__u32 X[16];

-
for (j = 0; j < 16; j++)
X[j] = M[j];

@@ -137,7 +138,7 @@ static void copy64(__u32 *M, unsigned ch

for (i = 0; i < 16; i++)
M[i] = (in[i * 4 + 3] << 24) | (in[i * 4 + 2] << 16) |
- (in[i * 4 + 1] << 8) | (in[i * 4 + 0] << 0);
+ (in[i * 4 + 1] << 8) | (in[i * 4 + 0] << 0);
}

static void copy4(unsigned char *out, __u32 x)