@matheusbsbs / matheus-bagliano / commits / 9fe0d87da3
Fork 0

merge-recursive: make a few functions static.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Oct 23, 2006 at 00:46 UTC 9fe0d87da36ce4a61359a4d5c2ea2547e29b4d04
1 file changed +13 -12
merge-recursive.c
+13 -12
@@ -427,8 +427,9 @@ static struct path_list *get_renames(struct tree *tree,
427 return renames;
428 }
429
430 -int update_stages(const char *path, struct diff_filespec *o,
431 - struct diff_filespec *a, struct diff_filespec *b, int clear)
430 +static int update_stages(const char *path, struct diff_filespec *o,
431 + struct diff_filespec *a, struct diff_filespec *b,
432 + int clear)
433 {
434 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
435 if (clear)
@@ -468,7 +469,7 @@ static int remove_path(const char *name)
469 return ret;
470 }
471
471 -int remove_file(int clean, const char *path)
472 +static int remove_file(int clean, const char *path)
473 {
474 int update_cache = index_only || clean;
475 int update_working_directory = !index_only;
@@ -537,11 +538,11 @@ static void flush_buffer(int fd, const char *buf, unsigned long size)
538 }
539 }
540
540 -void update_file_flags(const unsigned char *sha,
541 - unsigned mode,
542 - const char *path,
543 - int update_cache,
544 - int update_wd)
541 +static void update_file_flags(const unsigned char *sha,
542 + unsigned mode,
543 + const char *path,
544 + int update_cache,
545 + int update_wd)
546 {
547 if (index_only)
548 update_wd = 0;
@@ -586,10 +587,10 @@ void update_file_flags(const unsigned char *sha,
587 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
588 }
589
589 -void update_file(int clean,
590 - const unsigned char *sha,
591 - unsigned mode,
592 - const char *path)
590 +static void update_file(int clean,
591 + const unsigned char *sha,
592 + unsigned mode,
593 + const char *path)
594 {
595 update_file_flags(sha, mode, path, index_only || clean, !index_only);
596 }