Merge branch 'fc/styles'

C coding style fixes.

* fc/styles:
block-sha1/sha1.c: have SP around arithmetic operators
base85.c: have SP around arithmetic operators
archive.c: have SP around arithmetic operators
alloc.c: have SP around arithmetic operators
abspath.c: have SP around arithmetic operators
alias: have SP around arithmetic operators
C: have space around && and || operators

diff --git a/abspath.c b/abspath.c
index 64adbe2a1b5e5679fb0dc772452b4aca1865ee4c..e390994abff32054452e878484e79c249474389f 100644 (file)
--- a/abspath.c
+++ b/abspath.c
@@ -110,7 +110,7 @@ static const char *real_path_internal(const char *path, int die_on_error)
                                else
                                        goto error_out;
                        }
-                       if (len && !is_dir_sep(buf[len-1]))
+                       if (len && !is_dir_sep(buf[len - 1]))
                                buf[len++] = '/';
                        strcpy(buf + len, last_elem);
                        free(last_elem);
@@ -201,7 +201,7 @@ const char *absolute_path(const char *path)
                if (!cwd)
                        die_errno("Cannot determine the current working directory");
                len = strlen(cwd);
-               fmt = (len > 0 && is_dir_sep(cwd[len-1])) ? "%s%s" : "%s/%s";
+               fmt = (len > 0 && is_dir_sep(cwd[len - 1])) ? "%s%s" : "%s/%s";
                if (snprintf(buf, PATH_MAX, fmt, cwd, path) >= PATH_MAX)
                        die("Too long path: %.*s", 60, path);
        }

diff --git a/alias.c b/alias.c
index eb9f08b912b2089d434926fc6083ac5ab90c73bc..9938f03c255029ee8f5b10623e5e7bb65f2d7921 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -5,7 +5,7 @@ static char *alias_val;
 
 static int alias_lookup_cb(const char *k, const char *v, void *cb)
 {
-       if (!prefixcmp(k, "alias.") && !strcmp(k+6, alias_key)) {
+       if (!prefixcmp(k, "alias.") && !strcmp(k + 6, alias_key)) {
                if (!v)
                        return config_error_nonbool(k);
                alias_val = xstrdup(v);
@@ -34,7 +34,7 @@ int split_cmdline(char *cmdline, const char ***argv)
        int src, dst, count = 0, size = 16;
        char quoted = 0;
 
-       *argv = xmalloc(sizeof(char *) * size);
+       *argv = xmalloc(sizeof(**argv) * size);
 
        /* split alias_string */
        (*argv)[count++] = cmdline;
@@ -45,7 +45,7 @@ int split_cmdline(char *cmdline, const char ***argv)
                        while (cmdline[++src]
                                        && isspace(cmdline[src]))
                                ; /* skip */
-                       ALLOC_GROW(*argv, count+1, size);
+                       ALLOC_GROW(*argv, count + 1, size);
                        (*argv)[count++] = cmdline + dst;
                } else if (!quoted && (c == '\'' || c == '"')) {
                        quoted = c;
@@ -76,12 +76,13 @@ int split_cmdline(char *cmdline, const char ***argv)
                return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
        }
 
-       ALLOC_GROW(*argv, count+1, size);
+       ALLOC_GROW(*argv, count + 1, size);
        (*argv)[count] = NULL;
 
        return count;
 }
 
-const char *split_cmdline_strerror(int split_cmdline_errno) {
-       return split_cmdline_errors[-split_cmdline_errno-1];
+const char *split_cmdline_strerror(int split_cmdline_errno)
+{
+       return split_cmdline_errors[-split_cmdline_errno - 1];
 }

diff --git a/alloc.c b/alloc.c
index aeae55c976802264d714282218e58a858a9c68b5..f3ee745695643c00f175288a9592ab073dd589b0 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -58,7 +58,7 @@ static void report(const char *name, unsigned int count, size_t size)
 }
 
 #define REPORT(name)   \
-    report(#name, name##_allocs, name##_allocs*sizeof(struct name) >> 10)
+    report(#name, name##_allocs, name##_allocs * sizeof(struct name) >> 10)
 
 void alloc_report(void)
 {

diff --git a/archive.c b/archive.c
index 99fadc88d04ea077e5e5d6e6c065f7c54a4eddaf..346f3b2f1ab0d522638475b729274d992d5b82d5 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -440,7 +440,7 @@ static int match_extension(const char *filename, const char *ext)
         * prefix is non-empty (k.e., we don't match .tar.gz with no actual
         * filename).
         */
-       if (prefixlen < 2 || filename[prefixlen-1] != '.')
+       if (prefixlen < 2 || filename[prefixlen - 1] != '.')
                return 0;
        return !strcmp(filename + prefixlen, ext);
 }

diff --git a/base85.c b/base85.c
index 781b5754f0e533008694e71ac7cfe2e52b2d0ac6..5ca601ee14fd2ab3b78577aa22a5db778bc7fbe0 100644 (file)
--- a/base85.c
+++ b/base85.c
@@ -41,7 +41,7 @@ int decode_85(char *dst, const char *buffer, int len)
 {
        prep_base85();
 
-       say2("decode 85 <%.*s>", len/4*5, buffer);
+       say2("decode 85 <%.*s>", len / 4 * 5, buffer);
        while (len) {
                unsigned acc = 0;
                int de, cnt = 4;

diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index a8d4bf9301d25de60c02718b9d446edf5c665184..e1a1eb609754a745da956a6994d23aec3c4c9c05 100644 (file)
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
@@ -274,10 +274,10 @@ void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx)
        padlen[1] = htonl((uint32_t)(ctx->size << 3));
 
        i = ctx->size & 63;
-       blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i)));
+       blk_SHA1_Update(ctx, pad, 1 + (63 & (55 - i)));
        blk_SHA1_Update(ctx, padlen, 8);
 
        /* Output hash */
        for (i = 0; i < 5; i++)
-               put_be32(hashout + i*4, ctx->H[i]);
+               put_be32(hashout + i * 4, ctx->H[i]);
 }

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 0f5d7fe23f5b1e15e24e93daed68ece7542cf104..0d7ef847a70581214fb88c3a981581670f7decbe 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -178,7 +178,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 
        if (1 < opts.index_only + opts.update)
                die("-u and -i at the same time makes no sense");
-       if ((opts.update||opts.index_only) && !opts.merge)
+       if ((opts.update || opts.index_only) && !opts.merge)
                die("%s is meaningless without -m, --reset, or --prefix",
                    opts.update ? "-u" : "-i");
        if ((opts.dir && !opts.update))

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 4fc16166374b86927e605ccbfe341aebe0e3240f..0745e2d05330d21152f2aff720d0de338270aa6d 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -322,7 +322,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
                revs.commit_format = CMIT_FMT_RAW;
 
        if ((!revs.commits &&
-            (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
+            (!(revs.tag_objects || revs.tree_objects || revs.blob_objects) &&
              !revs.pending.nr)) ||
            revs.diff)
                usage(rev_list_usage);

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index f48195942123692c95ad8e5585f853ad54a3dbe4..71286b4fae4792dce73ab1533204e803e2a61334 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -47,7 +47,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
        git_config(git_default_config, NULL);
        argc = parse_options(argc, argv, prefix, options,
                             git_symbolic_ref_usage, 0);
-       if (msg &&!*msg)
+       if (msg && !*msg)
                die("Refusing to perform update with empty message");
 
        if (delete) {

diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index b2c5d465acd2bd37c1d316353eae544e564fc334..06f30887080bc293994ed470ff9b313ae048dcfb 100644 (file)
--- a/compat/regex/regcomp.c
+++ b/compat/regex/regcomp.c
@@ -339,7 +339,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
              p = buf;
              *p++ = dfa->nodes[node].opr.c;
              while (++node < dfa->nodes_len
-                    && dfa->nodes[node].type == CHARACTER
+                    && dfa->nodes[node].type == CHARACTER
                     && dfa->nodes[node].mb_partial)
                *p++ = dfa->nodes[node].opr.c;
              memset (&state, '\0', sizeof (state));

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 4d8645867e7d0103d49882877a7e4a8abacd24ea..4266ada23f3c37c1989c7fa4283b423d16c0891b 100644 (file)
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -108,7 +108,7 @@ static long def_ff(const char *rec, long len, char *buf, long sz, void *priv)
 {
        if (len > 0 &&
                        (isalpha((unsigned char)*rec) || /* identifier? */
-                        *rec == '_' || /* also identifier? */
+                        *rec == '_' || /* also identifier? */
                         *rec == '$')) { /* identifiers from VMS and other esoterico */
                if (len > sz)
                        len = sz;