git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: [PATCH] Constness fix for pickaxe option.
Date: Sat, 21 May 2005 15:02:51 -0700	[thread overview]
Message-ID: <7v1x80gruc.fsf_-_@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7voeb4kjda.fsf_-_@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Sat, 21 May 2005 02:40:01 -0700")

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);
 
------------------------------------------------


  reply	other threads:[~2005-05-21 22:01 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-19 10:32 [PATCH] Detect renames in diff family Junio C Hamano
2005-05-19 16:19 ` Linus Torvalds
2005-05-19 17:13   ` Junio C Hamano
2005-05-19 17:31     ` Linus Torvalds
2005-05-19 18:29     ` Nicolas Pitre
2005-05-19 18:46       ` Junio C Hamano
2005-05-19 18:58         ` Nicolas Pitre
2005-05-19 20:36           ` Junio C Hamano
2005-05-19 20:48             ` Nicolas Pitre
2005-05-19 21:44               ` Junio C Hamano
2005-05-19 22:26                 ` Linus Torvalds
2005-05-19 23:32                   ` Junio C Hamano
2005-05-20  0:10                     ` Linus Torvalds
2005-05-20  0:48                       ` Junio C Hamano
2005-05-19 18:47       ` Junio C Hamano
2005-05-19 18:42     ` Junio C Hamano
2005-05-19 18:55       ` Linus Torvalds
2005-05-19 19:53         ` Junio C Hamano
2005-05-19 20:12         ` H. Peter Anvin
2005-05-19 17:46   ` Joel Becker
2005-05-21  9:37   ` Junio C Hamano
2005-05-21  9:39     ` [PATCH 1/3] Diff overhaul, adding half of copy detection Junio C Hamano
2005-05-21  9:40     ` [PATCH 2/3] Introducing software archaeologist's tool "pickaxe" Junio C Hamano
2005-05-21 22:02       ` Junio C Hamano [this message]
2005-05-21 22:16         ` [PATCH] Constness fix for pickaxe option Linus Torvalds
2005-05-21  9:42     ` [PATCH 3/3] Diff overhaul, adding the other half of copy detection Junio C Hamano
2005-05-21 10:11       ` [PATCH] Teach diff-tree to report unmodified paths for -C option Junio C Hamano
2005-05-21 10:51         ` Junio C Hamano
2005-05-21 17:25       ` [PATCH 3/3] Diff overhaul, adding the other half of copy detection Linus Torvalds
2005-05-21 18:10         ` [PATCH 3/3] Diff overhaul, adding the other half Junio C Hamano
2005-05-21 18:27           ` Linus Torvalds
2005-05-21 18:34             ` Linus Torvalds
2005-05-21 18:45               ` Linus Torvalds
2005-05-21 20:10                 ` Junio C Hamano
2005-05-24  5:37                 ` Junio C Hamano
2005-05-24  6:19                   ` Linus Torvalds
2005-05-24  8:16                     ` Junio C Hamano
2005-05-24  8:31                       ` Linus Torvalds
2005-05-24  9:05                         ` Junio C Hamano
2005-05-26  3:17                     ` [RFC/PATCH] Detect copies harder in diff-tree Junio C Hamano
2005-05-21 19:54             ` [PATCH 3/3] Diff overhaul, adding the other half Junio C Hamano
2005-05-21 22:55       ` [PATCH] Tweak diffcore-rename heuristics Junio C Hamano
     [not found]       ` <Pine.LNX.4.58.0505211004400.2206@ppc970.osdl.org>
     [not found]         ` <7v4qcwihu1.fsf@assigned-by-dhcp.cox.net>
2005-05-23  6:50           ` Now I think I am done with diff Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v1x80gruc.fsf_-_@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).