Fix a bunch of pointer declarations (codestyle)

felipec · gitster · commit 4b25d091ba53 · 2009-05-01T15:17:31.000-07:00
Essentially; s/type* /type */ as per the coding guidelines.

Signed-off-by: Felipe Contreras &lt;felipe.contreras@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;
 
-	*argv = xmalloc(sizeof(char*) * size);
+	*argv = xmalloc(sizeof(char *) * size);
 
 	/* split alias_string */
 	(*argv)[count++] = cmdline;
@@ -40,7 +40,7 @@ int split_cmdline(char *cmdline, const char ***argv)
 				; /* 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 == '"')) {
diff --git a/alloc.c b/alloc.c
@@ -57,7 +57,7 @@ DEFINE_ALLOCATOR(object, union any_object)
 #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);
 }
diff --git 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 {
-			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;
 		}
@@ -275,7 +275,7 @@ static void free_attr_elem(struct attr_stack *e)
 			    setto == ATTR__UNKNOWN)
 				;
 			else
-				free((char*) setto);
+				free((char *) setto);
 		}
 		free(a);
 	}
diff --git 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);
-	file_o.ptr = (char*) cp;
+	file_o.ptr = (char *) cp;
 	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,
-					      sizeof(int* ) * (num + 1));
+					      sizeof(int *) * (num + 1));
 			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,
-			      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;
@@ -1889,7 +1889,7 @@ static const char *parse_loc(const char *spec,
 		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++;
 	}
diff --git 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;
-	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];
@@ -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))
-			free((char*)p);
+			free((char *)p);
 	}
 
 	if (read_from_stdin) {
diff --git 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) {
-		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";
@@ -349,7 +349,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 				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);
 	}
diff --git 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.
 */
 
-static const unsigned char* get_rev(void)
+static const unsigned char *get_rev(void)
 {
 	struct commit *commit = NULL;
 
diff --git a/builtin-help.c b/builtin-help.c
@@ -114,7 +114,7 @@ static int check_emacsclient_version(void)
 	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. */
@@ -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) {
@@ -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";
diff --git 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))
-		free((char*)p);
+		free((char *)p);
 }
 
 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))
-			free((char*)p);
+			free((char *)p);
 	}
 	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))
-			free((char*)p);
+			free((char *)p);
 	}
 	if (read_from_stdin) {
 		struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
diff --git 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 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 *);
diff --git 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));
-			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;
@@ -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++)
-		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);
 }
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -562,7 +562,7 @@ static char **get_path_split(void)
 	if (!n)
 		return NULL;
 
-	path = xmalloc((n+1)*sizeof(char*));
+	path = xmalloc((n+1)*sizeof(char *));
 	p = envpath;
 	i = 0;
 	do {
diff --git a/config.c b/config.c
@@ -724,24 +724,24 @@ int git_config(config_fn_t fn, void *data)
 
 static struct {
 	int baselen;
-	char* key;
+	char *key;
 	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;
 
-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 ||
 		 (store.do_not_match ^
 		  !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;
@@ -810,7 +810,7 @@ static int write_error(const char *filename)
 	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;
@@ -835,7 +835,7 @@ static int store_write_section(int fd, const char* key)
 	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);
@@ -883,8 +883,8 @@ static int store_write_pair(int fd, const char* key, const char* value)
 	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;
@@ -909,7 +909,7 @@ static ssize_t find_beginning_of_line(const char* contents, size_t size,
 	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);
 }
@@ -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.
  *
  */
-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;
-	char* config_filename;
+	char *config_filename;
 	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);
@@ -1026,13 +1026,13 @@ int git_config_set_multivar(const char* key, const char* value,
 			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;
-		char* contents;
+		char *contents;
 		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
@@ -59,7 +59,7 @@ static void convert_ascii_sha1(void *buffer)
 	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);
 }
@@ -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';
-			hashcpy((unsigned char*)new + newlen, (unsigned char *) buffer + len - 20);
+			hashcpy((unsigned char *)new + newlen, (unsigned char *) buffer + len - 20);
 			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))
-		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)) {
diff --git 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);
 
-		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];
 			/*
diff --git a/diff.c b/diff.c
@@ -876,7 +876,7 @@ static void fill_print_name(struct diffstat_file *file)
 	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;
@@ -1025,7 +1025,7 @@ static void show_shortstats(struct diffstat_t* data, struct diff_options *option
 	       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;
 
diff --git 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);
-		s = (char*)(x+1);
+		s = (char *)(x+1);
 		memcpy(s, string, len - 1);
 		s[len - 1] = '\0';
 		string = s;
diff --git a/fast-import.c b/fast-import.c
diff --git a/git.c b/git.c
diff --git a/lockfile.c b/lockfile.c
diff --git a/reflog-walk.c b/reflog-walk.c
diff --git a/run-command.c b/run-command.c
diff --git a/server-info.c b/server-info.c
diff --git a/sha1_file.c b/sha1_file.c
diff --git a/wt-status.c b/wt-status.c

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ DEFINE_ALLOCATOR(object, union any_object)`
`57`	`57`	`#define SZ_FMT "%zu"`
`58`	`58`	`#endif`
`59`	`59`
`60`		`-static void report(const char* name, unsigned int count, size_t size)`
	`60`	`+static void report(const char *name, unsigned int count, size_t size)`
`61`	`61`	`{`
`62`	`62`	`fprintf(stderr, "%10s: %8u (" SZ_FMT " kB)\n", name, count, size);`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ static struct match_attr parse_attr_line(const char line, const char *src,`
`224`	`224`	`if (is_macro)`
`225`	`225`	`res->u.attr = git_attr(name, namelen);`
`226`	`226`	`else {`
`227`		`- res->u.pattern = (char*)&(res->state[num_attr]);`
	`227`	`+ res->u.pattern = (char *)&(res->state[num_attr]);`
`228`	`228`	`memcpy(res->u.pattern, name, namelen);`
`229`	`229`	`res->u.pattern[namelen] = 0;`
`230`	`230`	`}`
`@@ -275,7 +275,7 @@ static void free_attr_elem(struct attr_stack *e)`
`275`	`275`	`setto == ATTR__UNKNOWN)`
`276`	`276`	`;`
`277`	`277`	`else`
`278`		`- free((char*) setto);`
	`278`	`+ free((char *) setto);`
`279`	`279`	`}`
`280`	`280`	`free(a);`
`281`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ int cmd_describe(int argc, const char *argv, const char prefix)`
`334`	`334`	`die("--long is incompatible with --abbrev=0");`
`335`	`335`
`336`	`336`	`if (contains) {`
`337`		`- const char *args = xmalloc((7 + argc) sizeof(char*));`
	`337`	`+ const char *args = xmalloc((7 + argc) sizeof(char *));`
`338`	`338`	`int i = 0;`
`339`	`339`	`args[i++] = "name-rev";`
`340`	`340`	`args[i++] = "--name-only";`
`@@ -349,7 +349,7 @@ int cmd_describe(int argc, const char *argv, const char prefix)`
`349`	`349`	`args[i++] = s;`
`350`	`350`	`}`
`351`	`351`	`}`
`352`		`- memcpy(args + i, argv, argc * sizeof(char*));`
	`352`	`+ memcpy(args + i, argv, argc * sizeof(char *));`
`353`	`353`	`args[i + argc] = NULL;`
`354`	`354`	`return cmd_name_rev(i + argc, args, prefix);`
`355`	`355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ static void mark_common(struct commit *commit,`
`111`	`111`	`Get the next rev to send, ignoring the common.`
`112`	`112`	`*/`
`113`	`113`
`114`		`-static const unsigned char* get_rev(void)`
	`114`	`+static const unsigned char *get_rev(void)`
`115`	`115`	`{`
`116`	`116`	`struct commit *commit = NULL;`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ static int check_emacsclient_version(void)`
`114`	`114`	`return 0;`
`115`	`115`	`}`
`116`	`116`
`117`		`-static void exec_woman_emacs(const char* path, const char *page)`
	`117`	`+static void exec_woman_emacs(const char path, const char page)`
`118`	`118`	`{`
`119`	`119`	`if (!check_emacsclient_version()) {`
`120`	`120`	`/* This works only with emacsclient version >= 22. */`
`@@ -128,7 +128,7 @@ static void exec_woman_emacs(const char* path, const char *page)`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`		`-static void exec_man_konqueror(const char* path, const char *page)`
	`131`	`+static void exec_man_konqueror(const char path, const char page)`
`132`	`132`	`{`
`133`	`133`	`const char *display = getenv("DISPLAY");`
`134`	`134`	`if (display && *display) {`
`@@ -156,7 +156,7 @@ static void exec_man_konqueror(const char* path, const char *page)`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`159`		`-static void exec_man_man(const char* path, const char *page)`
	`159`	`+static void exec_man_man(const char path, const char page)`
`160`	`160`	`{`
`161`	`161`	`if (!path)`
`162`	`162`	`path = "man";`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ static void update_one(const char path, const char prefix, int prefix_length)`
`292`	`292`	`report("add '%s'", path);`
`293`	`293`	`free_return:`
`294`	`294`	`if (p < path \|\| p > path + strlen(path))`
`295`		`- free((char*)p);`
	`295`	`+ free((char *)p);`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`static void read_index_info(int line_termination)`
`@@ -509,7 +509,7 @@ static int do_unresolve(int ac, const char **av,`
`509`	`509`	`const char *p = prefix_path(prefix, prefix_length, arg);`
`510`	`510`	`err \|= unresolve_one(p);`
`511`	`511`	`if (p < arg \|\| p > arg + strlen(arg))`
`512`		`- free((char*)p);`
	`512`	`+ free((char *)p);`
`513`	`513`	`}`
`514`	`514`	`return err;`
`515`	`515`	`}`
`@@ -712,7 +712,7 @@ int cmd_update_index(int argc, const char *argv, const char prefix)`
`712`	`712`	`if (set_executable_bit)`
`713`	`713`	`chmod_path(set_executable_bit, p);`
`714`	`714`	`if (p < path \|\| p > path + strlen(path))`
`715`		`- free((char*)p);`
	`715`	`+ free((char *)p);`
`716`	`716`	`}`
`717`	`717`	`if (read_from_stdin) {`
`718`	`718`	`struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;`