Improved const correctness for strings

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index e26817de219588e680340be8c0faf6b65417c465..6a78517958567e9dee4bfb00236caf5c3d1c3d67 100644 (file)
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -25,7 +25,7 @@ static int update_ref_env(const char *action,
                      unsigned char *oldval)
 {
        char msg[1024];
                      unsigned char *oldval)
 {
        char msg[1024];

-       char *rla = getenv("GIT_REFLOG_ACTION");
+       const char *rla = getenv("GIT_REFLOG_ACTION");

 
        if (!rla)
                rla = "(reflog update)";
 
        if (!rla)
                rla = "(reflog update)";


@@ -61,7 +61,7 @@ static int update_local_ref(const char *name,
        }
 
        if (get_sha1(name, sha1_old)) {
        }
 
        if (get_sha1(name, sha1_old)) {

-               char *msg;
+               const char *msg;

        just_store:
                /* new ref */
                if (!strncmp(name, "refs/tags/", 10))
        just_store:
                /* new ref */
                if (!strncmp(name, "refs/tags/", 10))

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index d7cb11dc0d6339dbea51c89f3cd4966e8f6b4c3d..fb12248f825807b085f4e5ed761002c30925ead5 100644 (file)
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -288,7 +288,7 @@ static void cleanup_space(char *buf)
 }
 
 static void decode_header(char *it, unsigned itsize);
 }
 
 static void decode_header(char *it, unsigned itsize);

-static char *header[MAX_HDR_PARSED] = {
+static const char *header[MAX_HDR_PARSED] = {

        "From","Subject","Date",
 };
 
        "From","Subject","Date",
 };
 

diff --git a/builtin-reset.c b/builtin-reset.c
index 99d5c082a629c870e268160635c8e900155f164a..e1dc31e0eb80ddc2d1b82f12eda31401b9f40ebc 100644 (file)
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -169,7 +169,7 @@ static void prepend_reflog_action(const char *action, char *buf, size_t size)
 }
 
 enum reset_type { MIXED, SOFT, HARD, NONE };
 }
 
 enum reset_type { MIXED, SOFT, HARD, NONE };

-static char *reset_type_names[] = { "mixed", "soft", "hard", NULL };
+static const char *reset_type_names[] = { "mixed", "soft", "hard", NULL };

 
 int cmd_reset(int argc, const char **argv, const char *prefix)
 {
 
 int cmd_reset(int argc, const char **argv, const char *prefix)
 {

diff --git a/match-trees.c b/match-trees.c
index d7e29c4d1d3e44c85e0eeb28040e8ea945090594..0fd6df7d6ed839eaed536bc332312c2688a6bbad 100644 (file)
--- a/match-trees.c
+++ b/match-trees.c
@@ -132,7 +132,7 @@ static void match_trees(const unsigned char *hash1,
                        const unsigned char *hash2,
                        int *best_score,
                        char **best_match,
                        const unsigned char *hash2,
                        int *best_score,
                        char **best_match,

-                       char *base,
+                       const char *base,

                        int recurse_limit)
 {
        struct tree_desc one;
                        int recurse_limit)
 {
        struct tree_desc one;