dir.c: minor clean-up

gitster · gitster · commit 686a4a06b679 · 2007-11-29T01:11:46.000-08:00
Replace handcrafted reallocation with ALLOC_GROW().
Reindent "file_exists()" helper function.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/dir.c b/dir.c
@@ -144,11 +144,7 @@ void add_exclude(const char *string, const char *base,
 		x->flags |= EXC_FLAG_NOWILDCARD;
 	if (*string == '*' && no_wildcard(string+1))
 		x->flags |= EXC_FLAG_ENDSWITH;
-	if (which->nr == which->alloc) {
-		which->alloc = alloc_nr(which->alloc);
-		which->excludes = xrealloc(which->excludes,
-					   which->alloc * sizeof(x));
-	}
+	ALLOC_GROW(which->excludes, which->nr + 1, which->alloc);
 	which->excludes[which->nr++] = x;
 }
 
@@ -690,11 +686,10 @@ int read_directory(struct dir_struct *dir, const char *path, const char *base, i
 	return dir->nr;
 }
 
-int
-file_exists(const char *f)
+int file_exists(const char *f)
 {
-  struct stat sb;
-  return stat(f, &sb) == 0;
+	struct stat sb;
+	return stat(f, &sb) == 0;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,7 @@ void add_exclude(const char string, const char base,`
`144`	`144`	`x->flags \|= EXC_FLAG_NOWILDCARD;`
`145`	`145`	`if (string == '' && no_wildcard(string+1))`
`146`	`146`	`x->flags \|= EXC_FLAG_ENDSWITH;`
`147`		`- if (which->nr == which->alloc) {`
`148`		`- which->alloc = alloc_nr(which->alloc);`
`149`		`- which->excludes = xrealloc(which->excludes,`
`150`		`- which->alloc * sizeof(x));`
`151`		`- }`
	`147`	`+ ALLOC_GROW(which->excludes, which->nr + 1, which->alloc);`
`152`	`148`	`which->excludes[which->nr++] = x;`
`153`	`149`	`}`
`154`	`150`
`@@ -690,11 +686,10 @@ int read_directory(struct dir_struct dir, const char path, const char *base, i`
`690`	`686`	`return dir->nr;`
`691`	`687`	`}`
`692`	`688`
`693`		`-int`
`694`		`-file_exists(const char *f)`
	`689`	`+int file_exists(const char *f)`
`695`	`690`	`{`
`696`		`- struct stat sb;`
`697`		`- return stat(f, &sb) == 0;`
	`691`	`+ struct stat sb;`
	`692`	`+ return stat(f, &sb) == 0;`
`698`	`693`	`}`
`699`	`694`
`700`	`695`	`/*`