uncrustify: Add sp_after_comma

diff --git a/ccache.c b/ccache.c
index 7bd7788e82bb656be41a51f415a3bd49a165d74b..ffda471a83a69dc815e0e6e9863ab05adac982ac 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -2535,7 +2535,7 @@ cc_process_args(struct args *args, struct args **preprocessor_args,
        }
 
        /* cope with -o /dev/null */
-       if (!str_eq(output_obj,"/dev/null")
+       if (!str_eq(output_obj, "/dev/null")
            && stat(output_obj, &st) == 0
            && !S_ISREG(st.st_mode)) {
                cc_log("Not a regular file: %s", output_obj);

diff --git a/mdfour.c b/mdfour.c
index 43b5bb61b72a516bb07b66cbdc36b188b10bf11e..73736ba939f6aa15245a4393f1c99a30a01bea3c 100644 (file)
--- a/mdfour.c
+++ b/mdfour.c
@@ -24,54 +24,55 @@ static struct mdfour *m;
 
 #define MASK32 (0xffffffff)
 
-#define F(X,Y,Z) ((((X)&(Y)) | ((~(X))&(Z))))
-#define G(X,Y,Z) ((((X)&(Y)) | ((X)&(Z)) | ((Y)&(Z))))
-#define H(X,Y,Z) (((X)^(Y)^(Z)))
-#define lshift(x,s) (((((x)<<(s))&MASK32) | (((x)>>(32-(s)))&MASK32)))
-
-#define ROUND1(a,b,c,d,k,s) a = lshift((a + F(b,c,d) + M[k])&MASK32, s)
-#define ROUND2(a,b,c,d,k,s) a = lshift((a + G(b,c, \
-                                              d) + M[k] + 0x5A827999)&MASK32,s)
-#define ROUND3(a,b,c,d,k,s) a = lshift((a + H(b,c, \
-                                              d) + M[k] + 0x6ED9EBA1)&MASK32,s)
+#define F(X, Y, Z) ((((X)&(Y)) | ((~(X))&(Z))))
+#define G(X, Y, Z) ((((X)&(Y)) | ((X)&(Z)) | ((Y)&(Z))))
+#define H(X, Y, Z) (((X)^(Y)^(Z)))
+#define lshift(x, s) (((((x)<<(s))&MASK32) | (((x)>>(32-(s)))&MASK32)))
+
+#define ROUND1(a, b, c, d, k, s) \
+  a = lshift((a + F(b, c, d) + M[k])&MASK32, s)
+#define ROUND2(a, b, c, d, k, s) \
+  a = lshift((a + G(b, c, d) + M[k] + 0x5A827999)&MASK32, s)
+#define ROUND3(a, b, c, d, k, s) \
+  a = lshift((a + H(b, c, d) + M[k] + 0x6ED9EBA1)&MASK32, s)
 
 /* this applies md4 to 64 byte chunks */
 static void
 mdfour64(uint32_t *M)
 {
        uint32_t AA, BB, CC, DD;
-       uint32_t A,B,C,D;
+       uint32_t A, B, C, D;
 
        A = m->A; B = m->B; C = m->C; D = m->D;
        AA = A; BB = B; CC = C; DD = D;
 
-       ROUND1(A,B,C,D,  0,  3);  ROUND1(D,A,B,C,  1,  7);
-       ROUND1(C,D,A,B,  2, 11);  ROUND1(B,C,D,A,  3, 19);
-       ROUND1(A,B,C,D,  4,  3);  ROUND1(D,A,B,C,  5,  7);
-       ROUND1(C,D,A,B,  6, 11);  ROUND1(B,C,D,A,  7, 19);
-       ROUND1(A,B,C,D,  8,  3);  ROUND1(D,A,B,C,  9,  7);
-       ROUND1(C,D,A,B, 10, 11);  ROUND1(B,C,D,A, 11, 19);
-       ROUND1(A,B,C,D, 12,  3);  ROUND1(D,A,B,C, 13,  7);
-       ROUND1(C,D,A,B, 14, 11);  ROUND1(B,C,D,A, 15, 19);
-
-
-       ROUND2(A,B,C,D,  0,  3);  ROUND2(D,A,B,C,  4,  5);
-       ROUND2(C,D,A,B,  8,  9);  ROUND2(B,C,D,A, 12, 13);
-       ROUND2(A,B,C,D,  1,  3);  ROUND2(D,A,B,C,  5,  5);
-       ROUND2(C,D,A,B,  9,  9);  ROUND2(B,C,D,A, 13, 13);
-       ROUND2(A,B,C,D,  2,  3);  ROUND2(D,A,B,C,  6,  5);
-       ROUND2(C,D,A,B, 10,  9);  ROUND2(B,C,D,A, 14, 13);
-       ROUND2(A,B,C,D,  3,  3);  ROUND2(D,A,B,C,  7,  5);
-       ROUND2(C,D,A,B, 11,  9);  ROUND2(B,C,D,A, 15, 13);
-
-       ROUND3(A,B,C,D,  0,  3);  ROUND3(D,A,B,C,  8,  9);
-       ROUND3(C,D,A,B,  4, 11);  ROUND3(B,C,D,A, 12, 15);
-       ROUND3(A,B,C,D,  2,  3);  ROUND3(D,A,B,C, 10,  9);
-       ROUND3(C,D,A,B,  6, 11);  ROUND3(B,C,D,A, 14, 15);
-       ROUND3(A,B,C,D,  1,  3);  ROUND3(D,A,B,C,  9,  9);
-       ROUND3(C,D,A,B,  5, 11);  ROUND3(B,C,D,A, 13, 15);
-       ROUND3(A,B,C,D,  3,  3);  ROUND3(D,A,B,C, 11,  9);
-       ROUND3(C,D,A,B,  7, 11);  ROUND3(B,C,D,A, 15, 15);
+       ROUND1(A, B, C, D,  0,  3);  ROUND1(D, A, B, C,  1,  7);
+       ROUND1(C, D, A, B,  2, 11);  ROUND1(B, C, D, A,  3, 19);
+       ROUND1(A, B, C, D,  4,  3);  ROUND1(D, A, B, C,  5,  7);
+       ROUND1(C, D, A, B,  6, 11);  ROUND1(B, C, D, A,  7, 19);
+       ROUND1(A, B, C, D,  8,  3);  ROUND1(D, A, B, C,  9,  7);
+       ROUND1(C, D, A, B, 10, 11);  ROUND1(B, C, D, A, 11, 19);
+       ROUND1(A, B, C, D, 12,  3);  ROUND1(D, A, B, C, 13,  7);
+       ROUND1(C, D, A, B, 14, 11);  ROUND1(B, C, D, A, 15, 19);
+
+
+       ROUND2(A, B, C, D,  0,  3);  ROUND2(D, A, B, C,  4,  5);
+       ROUND2(C, D, A, B,  8,  9);  ROUND2(B, C, D, A, 12, 13);
+       ROUND2(A, B, C, D,  1,  3);  ROUND2(D, A, B, C,  5,  5);
+       ROUND2(C, D, A, B,  9,  9);  ROUND2(B, C, D, A, 13, 13);
+       ROUND2(A, B, C, D,  2,  3);  ROUND2(D, A, B, C,  6,  5);
+       ROUND2(C, D, A, B, 10,  9);  ROUND2(B, C, D, A, 14, 13);
+       ROUND2(A, B, C, D,  3,  3);  ROUND2(D, A, B, C,  7,  5);
+       ROUND2(C, D, A, B, 11,  9);  ROUND2(B, C, D, A, 15, 13);
+
+       ROUND3(A, B, C, D,  0,  3);  ROUND3(D, A, B, C,  8,  9);
+       ROUND3(C, D, A, B,  4, 11);  ROUND3(B, C, D, A, 12, 15);
+       ROUND3(A, B, C, D,  2,  3);  ROUND3(D, A, B, C, 10,  9);
+       ROUND3(C, D, A, B,  6, 11);  ROUND3(B, C, D, A, 14, 15);
+       ROUND3(A, B, C, D,  1,  3);  ROUND3(D, A, B, C,  9,  9);
+       ROUND3(C, D, A, B,  5, 11);  ROUND3(B, C, D, A, 13, 15);
+       ROUND3(A, B, C, D,  3,  3);  ROUND3(D, A, B, C, 11,  9);
+       ROUND3(C, D, A, B,  7, 11);  ROUND3(B, C, D, A, 15, 15);
 
        A += AA; B += BB;
        C += CC; D += DD;

diff --git a/test/util.c b/test/util.c
index 14a858fd1ca3090ebc6d9301030faf7567dc41ab..adfecaf3b7541ee17af976704843bfa170854bf4 100644 (file)
--- a/test/util.c
+++ b/test/util.c
@@ -20,7 +20,7 @@
 #include "test/util.h"
 
 #ifdef _WIN32
-#    define lstat(a,b) stat(a,b)
+#    define lstat(a, b) stat(a, b)
 #endif
 
 bool

diff --git a/uncrustify.cfg b/uncrustify.cfg
index 62769336f439bbde3b2ca92a358cadcbf2262cf9..50f0ee3ed5e2d1d2f0dcedc781dc0d97fc6d8898 100644 (file)
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -371,7 +371,7 @@ sp_before_squares                        = remove   # ignore/add/remove/force
 sp_inside_square                         = remove   # ignore/add/remove/force
 
 # Add or remove space after ','
-sp_after_comma                           = ignore   # ignore/add/remove/force
+sp_after_comma                           = add      # ignore/add/remove/force
 
 # Add or remove space before ','
 sp_before_comma                          = remove   # ignore/add/remove/force