{"thread":{"id":"7216","subject":"[PATCH] Correct new compiler warnings in builtin-revert","startedAt":"2007-03-12T19:33:18Z","lastAt":"2007-03-12T19:33:18Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"36945","messageId":"20070312193318.GA16234@spearce.org","threadId":"7216","inReplyTo":null,"subject":"[PATCH] Correct new compiler warnings in builtin-revert","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-03-12T19:33:18Z","receivedAt":"2007-03-12T19:33:18Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"The new builtin-revert code introduces a few new compiler errors\nwhen I'm building with my stricter set of checks enabled in CFLAGS.\nThese all just stem from trying to store a constant string into\na non-const char*.  Simple fix, make the variables const char*.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n builtin-revert.c |    4 ++--\n cache.h          |    2 +-\n environment.c    |    2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin-revert.c b/builtin-revert.c\nindex 652eece..f3f3f5c 100644\n--- a/builtin-revert.c\n+++ b/builtin-revert.c\n@@ -235,8 +235,8 @@ static int revert_or_cherry_pick(int argc, const char **argv)\n \tunsigned char head[20];\n \tstruct commit *base, *next;\n \tint i;\n-\tchar *oneline, *encoding, *reencoded_message = NULL;\n-\tconst char *message;\n+\tchar *oneline, *reencoded_message = NULL;\n+\tconst char *message, *encoding;\n \n \tgit_config(git_default_config);\n \tme = action == REVERT ? \"revert\" : \"cherry-pick\";\ndiff --git a/cache.h b/cache.h\nindex f172d02..4f10667 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -449,7 +449,7 @@ extern int check_repository_format_version(const char *var, const char *value);\n extern char git_default_email[MAX_GITNAME];\n extern char git_default_name[MAX_GITNAME];\n \n-extern char *git_commit_encoding;\n+extern const char *git_commit_encoding;\n extern const char *git_log_output_encoding;\n \n extern int copy_fd(int ifd, int ofd);\ndiff --git a/environment.c b/environment.c\nindex 0151ad0..fff4a4d 100644\n--- a/environment.c\n+++ b/environment.c\n@@ -20,7 +20,7 @@ int is_bare_repository_cfg = -1; /* unspecified */\n int log_all_ref_updates = -1; /* unspecified */\n int warn_ambiguous_refs = 1;\n int repository_format_version;\n-char *git_commit_encoding;\n+const char *git_commit_encoding;\n const char *git_log_output_encoding;\n int shared_repository = PERM_UMASK;\n const char *apply_default_whitespace;\n-- \n1.5.0.3.985.gcf0b4\n"}]}