Fix a bunch of pointer declarations (codestyle)

Essentially; s/type* /type */ as per the coding guidelines.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/alias.c b/alias.c
index ccb1108c94436035d0da8b1d6f08f859b68294a3..e687fe54c1ce2a435e8f0d7806db231c06f998eb 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -27,7 +27,7 @@ int split_cmdline(char *cmdline, const char ***argv)
        int src, dst, count = 0, size = 16;
        char quoted = 0;
 
        int src, dst, count = 0, size = 16;
        char quoted = 0;
 

-       *argv = xmalloc(sizeof(char*) * size);
+       *argv = xmalloc(sizeof(char *) * size);

 
        /* split alias_string */
        (*argv)[count++] = cmdline;
 
        /* split alias_string */
        (*argv)[count++] = cmdline;


@@ -40,7 +40,7 @@ int split_cmdline(char *cmdline, const char ***argv)
                                ; /* skip */
                        if (count >= size) {
                                size += 16;
                                ; /* skip */
                        if (count >= size) {
                                size += 16;

-                               *argv = xrealloc(*argv, sizeof(char*) * size);
+                               *argv = xrealloc(*argv, sizeof(char *) * size);

                        }
                        (*argv)[count++] = cmdline + dst;
                } else if (!quoted && (c == '\'' || c == '"')) {
                        }
                        (*argv)[count++] = cmdline + dst;
                } else if (!quoted && (c == '\'' || c == '"')) {

diff --git a/alloc.c b/alloc.c
index 216c23a6f854c614d38c743cd7687a37f304161b..6ef6753d180afad29bc335854150c824b9de8a18 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -57,7 +57,7 @@ DEFINE_ALLOCATOR(object, union any_object)
 #define SZ_FMT "%zu"
 #endif
 
 #define SZ_FMT "%zu"
 #endif
 

-static void report(const char* name, unsigned int count, size_t size)
+static void report(const char *name, unsigned int count, size_t size)

 {
     fprintf(stderr, "%10s: %8u (" SZ_FMT " kB)\n", name, count, size);
 }
 {
     fprintf(stderr, "%10s: %8u (" SZ_FMT " kB)\n", name, count, size);
 }

diff --git a/attr.c b/attr.c
index f1ca4f58599c14c98473f3638a3d0d6eed2aafaa..98eb636f13d314c20e18e646c074e2511b3c891c 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -224,7 +224,7 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
                if (is_macro)
                        res->u.attr = git_attr(name, namelen);
                else {
                if (is_macro)
                        res->u.attr = git_attr(name, namelen);
                else {

-                       res->u.pattern = (char*)&(res->state[num_attr]);
+                       res->u.pattern = (char *)&(res->state[num_attr]);

                        memcpy(res->u.pattern, name, namelen);
                        res->u.pattern[namelen] = 0;
                }
                        memcpy(res->u.pattern, name, namelen);
                        res->u.pattern[namelen] = 0;
                }


@@ -275,7 +275,7 @@ static void free_attr_elem(struct attr_stack *e)
                            setto == ATTR__UNKNOWN)
                                ;
                        else
                            setto == ATTR__UNKNOWN)
                                ;
                        else

-                               free((char*) setto);
+                               free((char *) setto);

                }
                free(a);
        }
                }
                free(a);
        }

diff --git a/builtin-blame.c b/builtin-blame.c
index 83141fc84e22ad4852f255fa1ad453cc125a3255..cf74a926149668b7e67544aecd46a0e05d4f59d9 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -873,7 +873,7 @@ static void find_copy_in_blob(struct scoreboard *sb,
         * Prepare mmfile that contains only the lines in ent.
         */
        cp = nth_line(sb, ent->lno);
         * Prepare mmfile that contains only the lines in ent.
         */
        cp = nth_line(sb, ent->lno);

-       file_o.ptr = (char*) cp;
+       file_o.ptr = (char *) cp;

        cnt = ent->num_lines;
 
        while (cnt && cp < sb->final_buf + sb->final_buf_size) {
        cnt = ent->num_lines;
 
        while (cnt && cp < sb->final_buf + sb->final_buf_size) {


@@ -1704,7 +1704,7 @@ static int prepare_lines(struct scoreboard *sb)
        while (len--) {
                if (bol) {
                        sb->lineno = xrealloc(sb->lineno,
        while (len--) {
                if (bol) {
                        sb->lineno = xrealloc(sb->lineno,

-                                             sizeof(int* ) * (num + 1));
+                                             sizeof(int *) * (num + 1));

                        sb->lineno[num] = buf - sb->final_buf;
                        bol = 0;
                }
                        sb->lineno[num] = buf - sb->final_buf;
                        bol = 0;
                }


@@ -1714,7 +1714,7 @@ static int prepare_lines(struct scoreboard *sb)
                }
        }
        sb->lineno = xrealloc(sb->lineno,
                }
        }
        sb->lineno = xrealloc(sb->lineno,

-                             sizeof(int* ) * (num + incomplete + 1));
+                             sizeof(int *) * (num + incomplete + 1));

        sb->lineno[num + incomplete] = buf - sb->final_buf;
        sb->num_lines = num + incomplete;
        return sb->num_lines;
        sb->lineno[num + incomplete] = buf - sb->final_buf;
        sb->num_lines = num + incomplete;
        return sb->num_lines;


@@ -1889,7 +1889,7 @@ static const char *parse_loc(const char *spec,
                return spec;
 
        /* it could be a regexp of form /.../ */
                return spec;
 
        /* it could be a regexp of form /.../ */

-       for (term = (char*) spec + 1; *term && *term != '/'; term++) {
+       for (term = (char *) spec + 1; *term && *term != '/'; term++) {

                if (*term == '\\')
                        term++;
        }
                if (*term == '\\')
                        term++;
        }

diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c
index 0d534bc023a1a3367bdf19f6450ce17e627959f0..afe35e246c5ab2b262683308def787c6abce2a83 100644 (file)
--- a/builtin-checkout-index.c
+++ b/builtin-checkout-index.c
@@ -124,7 +124,7 @@ static int checkout_file(const char *name, int prefix_length)
 static void checkout_all(const char *prefix, int prefix_length)
 {
        int i, errs = 0;
 static void checkout_all(const char *prefix, int prefix_length)
 {
        int i, errs = 0;

-       struct cache_entry* last_ce = NULL;
+       struct cache_entry *last_ce = NULL;

 
        for (i = 0; i < active_nr ; i++) {
                struct cache_entry *ce = active_cache[i];
 
        for (i = 0; i < active_nr ; i++) {
                struct cache_entry *ce = active_cache[i];


@@ -278,7 +278,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
                p = prefix_path(prefix, prefix_length, arg);
                checkout_file(p, prefix_length);
                if (p < arg || p > arg + strlen(arg))
                p = prefix_path(prefix, prefix_length, arg);
                checkout_file(p, prefix_length);
                if (p < arg || p > arg + strlen(arg))

-                       free((char*)p);
+                       free((char *)p);

        }
 
        if (read_from_stdin) {
        }
 
        if (read_from_stdin) {

diff --git a/builtin-describe.c b/builtin-describe.c
index 3a007ed1cafcab82f466d355b63e416b06eb8864..63c6a19da5b38bc7c00c624c080ba0afbb10ff8a 100644 (file)
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -334,7 +334,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
                die("--long is incompatible with --abbrev=0");
 
        if (contains) {
                die("--long is incompatible with --abbrev=0");
 
        if (contains) {

-               const char **args = xmalloc((7 + argc) * sizeof(char*));
+               const char **args = xmalloc((7 + argc) * sizeof(char *));

                int i = 0;
                args[i++] = "name-rev";
                args[i++] = "--name-only";
                int i = 0;
                args[i++] = "name-rev";
                args[i++] = "--name-only";


@@ -349,7 +349,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
                                args[i++] = s;
                        }
                }
                                args[i++] = s;
                        }
                }

-               memcpy(args + i, argv, argc * sizeof(char*));
+               memcpy(args + i, argv, argc * sizeof(char *));

                args[i + argc] = NULL;
                return cmd_name_rev(i + argc, args, prefix);
        }
                args[i + argc] = NULL;
                return cmd_name_rev(i + argc, args, prefix);
        }

diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c
index 5d134be47c85019dd66aed742eb845f6245cbf4d..cbe5f206f5baab9868bc70028262aee611fba3f9 100644 (file)
--- a/builtin-fetch-pack.c
+++ b/builtin-fetch-pack.c
@@ -111,7 +111,7 @@ static void mark_common(struct commit *commit,
   Get the next rev to send, ignoring the common.
 */
 
   Get the next rev to send, ignoring the common.
 */
 

-static const unsigned char* get_rev(void)
+static const unsigned char *get_rev(void)

 {
        struct commit *commit = NULL;
 
 {
        struct commit *commit = NULL;
 

diff --git a/builtin-help.c b/builtin-help.c
index e7fbe9af633d23fa55b14751190e6dd5d9e5d762..67dda3e6e63c9130a6f1e1c94cb35e519d765a95 100644 (file)
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -114,7 +114,7 @@ static int check_emacsclient_version(void)
        return 0;
 }
 
        return 0;
 }
 

-static void exec_woman_emacs(const char* path, const char *page)
+static void exec_woman_emacs(const char *path, const char *page)

 {
        if (!check_emacsclient_version()) {
                /* This works only with emacsclient version >= 22. */
 {
        if (!check_emacsclient_version()) {
                /* This works only with emacsclient version >= 22. */


@@ -128,7 +128,7 @@ static void exec_woman_emacs(const char* path, const char *page)
        }
 }
 
        }
 }
 

-static void exec_man_konqueror(const char* path, const char *page)
+static void exec_man_konqueror(const char *path, const char *page)

 {
        const char *display = getenv("DISPLAY");
        if (display && *display) {
 {
        const char *display = getenv("DISPLAY");
        if (display && *display) {


@@ -156,7 +156,7 @@ static void exec_man_konqueror(const char* path, const char *page)
        }
 }
 
        }
 }
 

-static void exec_man_man(const char* path, const char *page)
+static void exec_man_man(const char *path, const char *page)

 {
        if (!path)
                path = "man";
 {
        if (!path)
                path = "man";

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 1fde893cfa9f6318ae1e9958b2f61159b01c7c6a..92beaaf4b3ca5520a9af27bde7f15dda46d80197 100644 (file)
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -292,7 +292,7 @@ static void update_one(const char *path, const char *prefix, int prefix_length)
        report("add '%s'", path);
  free_return:
        if (p < path || p > path + strlen(path))
        report("add '%s'", path);
  free_return:
        if (p < path || p > path + strlen(path))

-               free((char*)p);
+               free((char *)p);

 }
 
 static void read_index_info(int line_termination)
 }
 
 static void read_index_info(int line_termination)


@@ -509,7 +509,7 @@ static int do_unresolve(int ac, const char **av,
                const char *p = prefix_path(prefix, prefix_length, arg);
                err |= unresolve_one(p);
                if (p < arg || p > arg + strlen(arg))
                const char *p = prefix_path(prefix, prefix_length, arg);
                err |= unresolve_one(p);
                if (p < arg || p > arg + strlen(arg))

-                       free((char*)p);
+                       free((char *)p);

        }
        return err;
 }
        }
        return err;
 }


@@ -712,7 +712,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                if (set_executable_bit)
                        chmod_path(set_executable_bit, p);
                if (p < path || p > path + strlen(path))
                if (set_executable_bit)
                        chmod_path(set_executable_bit, p);
                if (p < path || p > path + strlen(path))

-                       free((char*)p);
+                       free((char *)p);

        }
        if (read_from_stdin) {
                struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
        }
        if (read_from_stdin) {
                struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;

diff --git a/cache.h b/cache.h
index d0d48b4c88b8f359be7c271dbe7ef8f816999960..b8503ad91c3b13ccaf87a6f596d13918f7ae114b 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -846,7 +846,7 @@ extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
 
 extern void pack_report(void);
 extern int open_pack_index(struct packed_git *);
 
 extern void pack_report(void);
 extern int open_pack_index(struct packed_git *);

-extern unsigned char* use_pack(struct packed_git *, struct pack_window **, off_t, unsigned int *);
+extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned int *);

 extern void close_pack_windows(struct packed_git *);
 extern void unuse_pack(struct pack_window **);
 extern void free_pack_by_name(const char *);
 extern void close_pack_windows(struct packed_git *);
 extern void unuse_pack(struct pack_window **);
 extern void free_pack_by_name(const char *);

diff --git a/combine-diff.c b/combine-diff.c
index d210656861dcd6568e1228f39dff042ab374a584..60d03676bbd0dba7be79c7098d7cae553962ca98 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -24,7 +24,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
                        path = q->queue[i]->two->path;
                        len = strlen(path);
                        p = xmalloc(combine_diff_path_size(num_parent, len));
                        path = q->queue[i]->two->path;
                        len = strlen(path);
                        p = xmalloc(combine_diff_path_size(num_parent, len));

-                       p->path = (char*) &(p->parent[num_parent]);
+                       p->path = (char *) &(p->parent[num_parent]);

                        memcpy(p->path, path, len);
                        p->path[len] = 0;
                        p->len = len;
                        memcpy(p->path, path, len);
                        p->path[len] = 0;
                        p->len = len;


@@ -1063,7 +1063,7 @@ void diff_tree_combined_merge(const unsigned char *sha1,
        for (parents = commit->parents, num_parent = 0;
             parents;
             parents = parents->next, num_parent++)
        for (parents = commit->parents, num_parent = 0;
             parents;
             parents = parents->next, num_parent++)

-               hashcpy((unsigned char*)(parent + num_parent),
+               hashcpy((unsigned char *)(parent + num_parent),

                        parents->item->object.sha1);
        diff_tree_combined(sha1, parent, num_parent, dense, rev);
 }
                        parents->item->object.sha1);
        diff_tree_combined(sha1, parent, num_parent, dense, rev);
 }

diff --git a/compat/mingw.c b/compat/mingw.c
index 2a047019e819740b0208bcaa9c18999c68d1c89c..cdeda1d9859fd545950e0c39ee7de3c9dc09bb07 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -562,7 +562,7 @@ static char **get_path_split(void)
        if (!n)
                return NULL;
 
        if (!n)
                return NULL;
 

-       path = xmalloc((n+1)*sizeof(char*));
+       path = xmalloc((n+1)*sizeof(char *));

        p = envpath;
        i = 0;
        do {
        p = envpath;
        i = 0;
        do {

diff --git a/config.c b/config.c
index f76a78311e50310c02ebb30e3fc8b211ee41e562..1682273c12ab042d73fa32caf30d18fb13ef85e3 100644 (file)
--- a/config.c
+++ b/config.c
@@ -724,16 +724,16 @@ int git_config(config_fn_t fn, void *data)
 
 static struct {
        int baselen;
 
 static struct {
        int baselen;

-       char* key;
+       char *key;

        int do_not_match;
        int do_not_match;

-       regex_t* value_regex;
+       regex_t *value_regex;

        int multi_replace;
        size_t offset[MAX_MATCHES];
        enum { START, SECTION_SEEN, SECTION_END_SEEN, KEY_SEEN } state;
        int seen;
 } store;
 
        int multi_replace;
        size_t offset[MAX_MATCHES];
        enum { START, SECTION_SEEN, SECTION_END_SEEN, KEY_SEEN } state;
        int seen;
 } store;
 

-static int matches(const char* key, const char* value)
+static int matches(const char *key, const char *value)

 {
        return !strcmp(key, store.key) &&
                (store.value_regex == NULL ||
 {
        return !strcmp(key, store.key) &&
                (store.value_regex == NULL ||


@@ -741,7 +741,7 @@ static int matches(const char* key, const char* value)
                  !regexec(store.value_regex, value, 0, NULL, 0)));
 }
 
                  !regexec(store.value_regex, value, 0, NULL, 0)));
 }
 

-static int store_aux(const char* key, const char* value, void *cb)
+static int store_aux(const char *key, const char *value, void *cb)

 {
        const char *ep;
        size_t section_len;
 {
        const char *ep;
        size_t section_len;


@@ -810,7 +810,7 @@ static int write_error(const char *filename)
        return 4;
 }
 
        return 4;
 }
 

-static int store_write_section(int fd, const char* key)
+static int store_write_section(int fd, const char *key)

 {
        const char *dot;
        int i, success;
 {
        const char *dot;
        int i, success;


@@ -835,7 +835,7 @@ static int store_write_section(int fd, const char* key)
        return success;
 }
 
        return success;
 }
 

-static int store_write_pair(int fd, const char* key, const char* value)
+static int store_write_pair(int fd, const char *key, const char *value)

 {
        int i, success;
        int length = strlen(key + store.baselen + 1);
 {
        int i, success;
        int length = strlen(key + store.baselen + 1);


@@ -883,8 +883,8 @@ static int store_write_pair(int fd, const char* key, const char* value)
        return success;
 }
 
        return success;
 }
 

-static ssize_t find_beginning_of_line(const char* contents, size_t size,
-       size_t offset_, int* found_bracket)
+static ssize_t find_beginning_of_line(const char *contents, size_t size,
+       size_t offset_, int *found_bracket)

 {
        size_t equal_offset = size, bracket_offset = size;
        ssize_t offset;
 {
        size_t equal_offset = size, bracket_offset = size;
        ssize_t offset;


@@ -909,7 +909,7 @@ static ssize_t find_beginning_of_line(const char* contents, size_t size,
        return offset;
 }
 
        return offset;
 }
 

-int git_config_set(const char* key, const char* value)
+int git_config_set(const char *key, const char *value)

 {
        return git_config_set_multivar(key, value, NULL, 0);
 }
 {
        return git_config_set_multivar(key, value, NULL, 0);
 }


@@ -937,15 +937,15 @@ int git_config_set(const char* key, const char* value)
  * - the config file is removed and the lock file rename()d to it.
  *
  */
  * - the config file is removed and the lock file rename()d to it.
  *
  */

-int git_config_set_multivar(const char* key, const char* value,
-       const char* value_regex, int multi_replace)
+int git_config_set_multivar(const char *key, const char *value,
+       const char *value_regex, int multi_replace)

 {
        int i, dot;
        int fd = -1, in_fd;
        int ret;
 {
        int i, dot;
        int fd = -1, in_fd;
        int ret;

-       char* config_filename;
+       char *config_filename;

        struct lock_file *lock = NULL;
        struct lock_file *lock = NULL;

-       const char* last_dot = strrchr(key, '.');
+       const char *last_dot = strrchr(key, '.');

 
        if (config_exclusive_filename)
                config_filename = xstrdup(config_exclusive_filename);
 
        if (config_exclusive_filename)
                config_filename = xstrdup(config_exclusive_filename);


@@ -1026,13 +1026,13 @@ int git_config_set_multivar(const char* key, const char* value,
                        goto out_free;
                }
 
                        goto out_free;
                }
 

-               store.key = (char*)key;
+               store.key = (char *)key;

                if (!store_write_section(fd, key) ||
                    !store_write_pair(fd, key, value))
                        goto write_err_out;
        } else {
                struct stat st;
                if (!store_write_section(fd, key) ||
                    !store_write_pair(fd, key, value))
                        goto write_err_out;
        } else {
                struct stat st;

-               char* contents;
+               char *contents;

                size_t contents_sz, copy_begin, copy_end;
                int i, new_line = 0;
 
                size_t contents_sz, copy_begin, copy_end;
                int i, new_line = 0;
 

diff --git a/contrib/convert-objects/convert-objects.c b/contrib/convert-objects/convert-objects.c
index 90e7900e6d7aff2fadf9ba04f8d982733493411c..f3b57bf1d21e8256bf084076e50cbc9ff84a1ee8 100644 (file)
--- a/contrib/convert-objects/convert-objects.c
+++ b/contrib/convert-objects/convert-objects.c
@@ -59,7 +59,7 @@ static void convert_ascii_sha1(void *buffer)
        struct entry *entry;
 
        if (get_sha1_hex(buffer, sha1))
        struct entry *entry;
 
        if (get_sha1_hex(buffer, sha1))

-               die("expected sha1, got '%s'", (char*) buffer);
+               die("expected sha1, got '%s'", (char *) buffer);

        entry = convert_entry(sha1);
        memcpy(buffer, sha1_to_hex(entry->new_sha1), 40);
 }
        entry = convert_entry(sha1);
        memcpy(buffer, sha1_to_hex(entry->new_sha1), 40);
 }


@@ -100,7 +100,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
                if (!slash) {
                        newlen += sprintf(new + newlen, "%o %s", mode, path);
                        new[newlen++] = '\0';
                if (!slash) {
                        newlen += sprintf(new + newlen, "%o %s", mode, path);
                        new[newlen++] = '\0';

-                       hashcpy((unsigned char*)new + newlen, (unsigned char *) buffer + len - 20);
+                       hashcpy((unsigned char *)new + newlen, (unsigned char *) buffer + len - 20);

                        newlen += 20;
 
                        used += len;
                        newlen += 20;
 
                        used += len;


@@ -271,7 +271,7 @@ static void convert_commit(void *buffer, unsigned long size, unsigned char *resu
        unsigned long orig_size = size;
 
        if (memcmp(buffer, "tree ", 5))
        unsigned long orig_size = size;
 
        if (memcmp(buffer, "tree ", 5))

-               die("Bad commit '%s'", (char*) buffer);
+               die("Bad commit '%s'", (char *) buffer);

        convert_ascii_sha1((char *) buffer + 5);
        buffer = (char *) buffer + 46;    /* "tree " + "hex sha1" + "\n" */
        while (!memcmp(buffer, "parent ", 7)) {
        convert_ascii_sha1((char *) buffer + 5);
        buffer = (char *) buffer + 46;    /* "tree " + "hex sha1" + "\n" */
        while (!memcmp(buffer, "parent ", 7)) {

diff --git a/diff-no-index.c b/diff-no-index.c
index 42c1dd8ad3b0633767bf577975a895722f882565..4ebc1dbd87d9b90ad2aaa5c7d4601761e2d1d724 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -233,7 +233,7 @@ void diff_no_index(struct rev_info *revs,
        if (prefix) {
                int len = strlen(prefix);
 
        if (prefix) {
                int len = strlen(prefix);
 

-               revs->diffopt.paths = xcalloc(2, sizeof(char*));
+               revs->diffopt.paths = xcalloc(2, sizeof(char *));

                for (i = 0; i < 2; i++) {
                        const char *p = argv[argc - 2 + i];
                        /*
                for (i = 0; i < 2; i++) {
                        const char *p = argv[argc - 2 + i];
                        /*

diff --git a/diff.c b/diff.c
index 3ac71686ebef3d3f9c8b0b72adf612e9535031a5..363dcb9613f5f57a2ae31ea6f803caf44954475a 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -876,7 +876,7 @@ static void fill_print_name(struct diffstat_file *file)
        file->print_name = pname;
 }
 
        file->print_name = pname;
 }
 

-static void show_stats(struct diffstat_t* data, struct diff_options *options)
+static void show_stats(struct diffstat_t *data, struct diff_options *options)

 {
        int i, len, add, del, adds = 0, dels = 0;
        int max_change = 0, max_len = 0;
 {
        int i, len, add, del, adds = 0, dels = 0;
        int max_change = 0, max_len = 0;


@@ -1025,7 +1025,7 @@ static void show_shortstats(struct diffstat_t* data, struct diff_options *option
               total_files, adds, dels);
 }
 
               total_files, adds, dels);
 }
 

-static void show_numstat(struct diffstat_t* data, struct diff_options *options)
+static void show_numstat(struct diffstat_t *data, struct diff_options *options)

 {
        int i;
 
 {
        int i;
 

diff --git a/dir.c b/dir.c
index c91ebfb46f929f926e1925c2db830c5847f3223b..15677da47c9dfc6bcb8f7f0b06bed16cf6f723ae 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -156,7 +156,7 @@ void add_exclude(const char *string, const char *base,
        if (len && string[len - 1] == '/') {
                char *s;
                x = xmalloc(sizeof(*x) + len);
        if (len && string[len - 1] == '/') {
                char *s;
                x = xmalloc(sizeof(*x) + len);

-               s = (char*)(x+1);
+               s = (char *)(x+1);

                memcpy(s, string, len - 1);
                s[len - 1] = '\0';
                string = s;
                memcpy(s, string, len - 1);
                s[len - 1] = '\0';
                string = s;

diff --git a/fast-import.c b/fast-import.c
index 8d959af3b2346a03f737c47d6dd000dfd917f69d..e9d23ffb2fb3f6df141944dca7ddab0edbd1e5ee 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -212,7 +212,7 @@ struct tree_content;
 struct tree_entry
 {
        struct tree_content *tree;
 struct tree_entry
 {
        struct tree_content *tree;

-       struct atom_str* name;
+       struct atom_str *name;

        struct tree_entry_ms
        {
                uint16_t mode;
        struct tree_entry_ms
        {
                uint16_t mode;


@@ -313,7 +313,7 @@ static unsigned int object_entry_alloc = 5000;
 static struct object_entry_pool *blocks;
 static struct object_entry *object_table[1 << 16];
 static struct mark_set *marks;
 static struct object_entry_pool *blocks;
 static struct object_entry *object_table[1 << 16];
 static struct mark_set *marks;

-static const char* mark_file;
+static const char *mark_file;

 
 /* Our last blob */
 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
 
 /* Our last blob */
 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };


@@ -672,7 +672,7 @@ static struct branch *lookup_branch(const char *name)
 static struct branch *new_branch(const char *name)
 {
        unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
 static struct branch *new_branch(const char *name)
 {
        unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;

-       struct branch* b = lookup_branch(name);
+       struct branch *b = lookup_branch(name);

 
        if (b)
                die("Invalid attempt to create duplicate branch: %s", name);
 
        if (b)
                die("Invalid attempt to create duplicate branch: %s", name);


@@ -1035,7 +1035,7 @@ static int store_object(
        git_SHA_CTX c;
        z_stream s;
 
        git_SHA_CTX c;
        z_stream s;
 

-       hdrlen = sprintf((char*)hdr,"%s %lu", typename(type),
+       hdrlen = sprintf((char *)hdr,"%s %lu", typename(type),

                (unsigned long)dat->len) + 1;
        git_SHA1_Init(&c);
        git_SHA1_Update(&c, hdr, hdrlen);
                (unsigned long)dat->len) + 1;
        git_SHA1_Init(&c);
        git_SHA1_Update(&c, hdr, hdrlen);


@@ -1217,7 +1217,7 @@ static const char *get_mode(const char *str, uint16_t *modep)
 
 static void load_tree(struct tree_entry *root)
 {
 
 static void load_tree(struct tree_entry *root)
 {

-       unsigned char* sha1 = root->versions[1].sha1;
+       unsigned char *sha1 = root->versions[1].sha1;

        struct object_entry *myoe;
        struct tree_content *t;
        unsigned long size;
        struct object_entry *myoe;
        struct tree_content *t;
        unsigned long size;


@@ -1258,8 +1258,8 @@ static void load_tree(struct tree_entry *root)
                e->versions[0].mode = e->versions[1].mode;
                e->name = to_atom(c, strlen(c));
                c += e->name->str_len + 1;
                e->versions[0].mode = e->versions[1].mode;
                e->name = to_atom(c, strlen(c));
                c += e->name->str_len + 1;

-               hashcpy(e->versions[0].sha1, (unsigned char*)c);
-               hashcpy(e->versions[1].sha1, (unsigned char*)c);
+               hashcpy(e->versions[0].sha1, (unsigned char *)c);
+               hashcpy(e->versions[1].sha1, (unsigned char *)c);

                c += 20;
        }
        free(buf);
                c += 20;
        }
        free(buf);

diff --git a/git.c b/git.c
index cc5aaa76f10021018fd5a5ea84ae9912d3633b69..5a00726d09a13d5f70ab0378e02bbbd299124d5c 100644 (file)
--- a/git.c
+++ b/git.c
@@ -47,7 +47,7 @@ static void commit_pager_choice(void) {
        }
 }
 
        }
 }
 

-static int handle_options(const char*** argv, int* argc, int* envchanged)
+static int handle_options(const char ***argv, int *argc, int *envchanged)

 {
        int handled = 0;
 
 {
        int handled = 0;
 


@@ -136,7 +136,7 @@ static int handle_alias(int *argcp, const char ***argv)
        int envchanged = 0, ret = 0, saved_errno = errno;
        const char *subdir;
        int count, option_count;
        int envchanged = 0, ret = 0, saved_errno = errno;
        const char *subdir;
        int count, option_count;

-       const char** new_argv;
+       const char **new_argv;

        const char *alias_command;
        char *alias_string;
        int unused_nongit;
        const char *alias_command;
        char *alias_string;
        int unused_nongit;


@@ -187,10 +187,10 @@ static int handle_alias(int *argcp, const char ***argv)
                                  "trace: alias expansion: %s =>",
                                  alias_command);
 
                                  "trace: alias expansion: %s =>",
                                  alias_command);
 

-               new_argv = xrealloc(new_argv, sizeof(char*) *
+               new_argv = xrealloc(new_argv, sizeof(char *) *

                                    (count + *argcp + 1));
                /* insert after command name */
                                    (count + *argcp + 1));
                /* insert after command name */

-               memcpy(new_argv + count, *argv + 1, sizeof(char*) * *argcp);
+               memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);

                new_argv[count+*argcp] = NULL;
 
                *argv = new_argv;
                new_argv[count+*argcp] = NULL;
 
                *argv = new_argv;

diff --git a/lockfile.c b/lockfile.c
index 3dbb2d1ff9407a7417be294adedc5312e7421a96..828d19f452a8bfffe2ee224a630e8246f4a1edab 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -109,7 +109,7 @@ static char *resolve_symlink(char *p, size_t s)
                         * link is a relative path, so I must replace the
                         * last element of p with it.
                         */
                         * link is a relative path, so I must replace the
                         * last element of p with it.
                         */

-                       char *r = (char*)last_path_elm(p);
+                       char *r = (char *)last_path_elm(p);

                        if (r - p + link_len < s)
                                strcpy(r, link);
                        else {
                        if (r - p + link_len < s)
                                strcpy(r, link);
                        else {

diff --git a/reflog-walk.c b/reflog-walk.c
index fd065f4e1a689176a3f3255b2d88270bce094ff0..5623ea6b48a2f355e8866eabb2805b51b4127a4a 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -241,7 +241,7 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
        commit->object.flags &= ~(ADDED | SEEN | SHOWN);
 }
 
        commit->object.flags &= ~(ADDED | SEEN | SHOWN);
 }
 

-void show_reflog_message(struct reflog_walk_info* info, int oneline,
+void show_reflog_message(struct reflog_walk_info *info, int oneline,

        enum date_mode dmode)
 {
        if (info && info->last_commit_reflog) {
        enum date_mode dmode)
 {
        if (info && info->last_commit_reflog) {

diff --git a/run-command.c b/run-command.c
index b05c734d05e99cd009a0df26f0fc95fa13ae6f25..eb2efc33073512efd14b65e67db8cf814ca3fa33 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -106,7 +106,7 @@ int start_command(struct child_process *cmd)
                if (cmd->env) {
                        for (; *cmd->env; cmd->env++) {
                                if (strchr(*cmd->env, '='))
                if (cmd->env) {
                        for (; *cmd->env; cmd->env++) {
                                if (strchr(*cmd->env, '='))

-                                       putenv((char*)*cmd->env);
+                                       putenv((char *)*cmd->env);

                                else
                                        unsetenv(*cmd->env);
                        }
                                else
                                        unsetenv(*cmd->env);
                        }

diff --git a/server-info.c b/server-info.c
index 66b0d9d878a011393582b837301eb1fd5caf2e40..906ce5b27242ca1e415a5410135d58f1c000e8b0 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -132,8 +132,8 @@ static int read_pack_info_file(const char *infofile)
 
 static int compare_info(const void *a_, const void *b_)
 {
 
 static int compare_info(const void *a_, const void *b_)
 {

-       struct pack_info * const* a = a_;
-       struct pack_info * const* b = b_;
+       struct pack_info *const *a = a_;
+       struct pack_info *const *b = b_;

 
        if (0 <= (*a)->old_num && 0 <= (*b)->old_num)
                /* Keep the order in the original */
 
        if (0 <= (*a)->old_num && 0 <= (*b)->old_num)
                /* Keep the order in the original */

diff --git a/sha1_file.c b/sha1_file.c
index f708cf4f674fdf393044d6c36c7d97f1fa7dcd0c..28bd9082fc9f4b79519f6bef8204600072c07027 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -791,7 +791,7 @@ static int in_window(struct pack_window *win, off_t offset)
                && (offset + 20) <= (win_off + win->len);
 }
 
                && (offset + 20) <= (win_off + win->len);
 }
 

-unsigned char* use_pack(struct packed_git *p,
+unsigned char *use_pack(struct packed_git *p,

                struct pack_window **w_cursor,
                off_t offset,
                unsigned int *left)
                struct pack_window **w_cursor,
                off_t offset,
                unsigned int *left)

diff --git a/wt-status.c b/wt-status.c
index 929b00f59285c21a07df98700c23171505f5cddb..1b6df45450c39c0f456df68485b5735950816ac8 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -40,7 +40,7 @@ static int parse_status_slot(const char *var, int offset)
        die("bad config variable '%s'", var);
 }
 
        die("bad config variable '%s'", var);
 }
 

-static const char* color(int slot)
+static const char *color(int slot)

 {
        return wt_status_use_color > 0 ? wt_status_colors[slot] : "";
 }
 {
        return wt_status_use_color > 0 ? wt_status_colors[slot] : "";
 }