summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-10 04:25:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-10 05:28:19 (GMT)
commit79db12e8ba74827724873beff2caeb6b85e0c6a9 (patch)
tree0132132fe31fd032a543f17bdf2a3500f723af82 /diff.c
parent4ec99bf080f2d95c7c3d706f65eea1c6b9302f23 (diff)
downloadgit-79db12e8ba74827724873beff2caeb6b85e0c6a9.zip
git-79db12e8ba74827724873beff2caeb6b85e0c6a9.tar.gz
git-79db12e8ba74827724873beff2caeb6b85e0c6a9.tar.bz2
A bit more format warning squelching.
Inspired by patch from Timo Sirainen. Most of them are not strictly necessary but making warnings less chatty would help spot real bugs later. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index 9962fc3..3e52fec 100644
--- a/diff.c
+++ b/diff.c
@@ -134,8 +134,8 @@ static void builtin_diff(const char *name_a,
int complete_rewrite)
{
int i, next_at, cmd_size;
- const char *diff_cmd = "diff -L%s%s -L%s%s";
- const char *diff_arg = "%s %s||:"; /* "||:" is to return 0 */
+ const char *const diff_cmd = "diff -L%s%s -L%s%s";
+ const char *const diff_arg = "%s %s||:"; /* "||:" is to return 0 */
const char *input_name_sq[2];
const char *path0[2];
const char *path1[2];
@@ -782,7 +782,8 @@ static void diff_flush_raw(struct diff_filepair *p,
char status[10];
if (line_termination) {
- const char *err = "path %s cannot be expressed without -z";
+ const char *const err =
+ "path %s cannot be expressed without -z";
if (strchr(p->one->path, line_termination) ||
strchr(p->one->path, inter_name_termination))
die(err, p->one->path);