[PATCH] Constness fix for pickaxe option.
- From
Junio C Hamano <junkio@cox.net>
- Date
- May 21, 2005, 22:02 UTC
- Message-ID
- <7v1x80gruc.fsf_-_@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7voeb4kjda.fsf_-_@assigned-by-dhcp.cox.net>
Constness fix for pickaxe option.
Signed-off-by: Junio C Hamano <junkio@cox.net> ---
diff-cache.c | 2 +- diff-files.c | 2 +- diff-helper.c | 2 +- diff-tree.c | 2 +- diff.c | 2 +- diff.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/diff-cache.c b/diff-cache.c --- a/diff-cache.c +++ b/diff-cache.c @@ -8,7 +8,7 @@ static int line_termination = '\n'; static int detect_rename = 0; static int reverse_diff = 0; static int diff_score_opt = 0; -static char *pickaxe = 0; +static const char *pickaxe = 0; /* A file entry went away or appeared */ static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode) diff --git a/diff-files.c b/diff-files.c --- a/diff-files.c +++ b/diff-files.c @@ -14,7 +14,7 @@ static int line_termination = '\n'; static int detect_rename = 0; static int reverse_diff = 0; static int diff_score_opt = 0; -static char *pickaxe = 0; +static const char *pickaxe = 0; static int silent = 0; static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt) diff --git a/diff-helper.c b/diff-helper.c --- a/diff-helper.c +++ b/diff-helper.c @@ -9,7 +9,7 @@ static int detect_rename = 0; static int diff_score_opt = 0; static int generate_patch = 1; -static char *pickaxe = 0; +static const char *pickaxe = 0; static int parse_oneside_change(const char *cp, int *mode, unsigned char *sha1, char *path) diff --git a/diff-tree.c b/diff-tree.c --- a/diff-tree.c +++ b/diff-tree.c @@ -13,7 +13,7 @@ static int generate_patch = 0; static int detect_rename = 0; static int reverse_diff = 0; static int diff_score_opt = 0; -static char *pickaxe = 0; +static const char *pickaxe = 0; static const char *header = NULL; static const char *header_prefix = ""; diff --git a/diff.c b/diff.c --- a/diff.c +++ b/diff.c @@ -513,7 +513,7 @@ int diff_scoreopt_parse(const char *opt) } void diff_setup(int detect_rename_, int minimum_score_, - char *pickaxe_, + const char *pickaxe_, int reverse_diff_, int diff_raw_output_, const char **pathspec_, int speccnt_) { diff --git a/diff.h b/diff.h --- a/diff.h +++ b/diff.h @@ -20,7 +20,7 @@ extern void diff_unmerge(const char *pat extern int diff_scoreopt_parse(const char *opt); extern void diff_setup(int detect_rename, int minimum_score, - char *pickaxe, + const char *pickaxe, int reverse, int raw_output, const char **spec, int cnt); ------------------------------------------------