summaryrefslogtreecommitdiff
path: root/trailer.c
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2016-10-14 17:37:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-14 19:07:57 (GMT)
commitd65fd424ad21adbc1ea11fcddae331698453d1e2 (patch)
tree86ed9e84f68f8379fbe49c4d3da97def55cc31aa /trailer.c
parent3cdd5d19178a54d2e51b5098d43b57571241d0ab (diff)
downloadgit-d65fd424ad21adbc1ea11fcddae331698453d1e2.zip
git-d65fd424ad21adbc1ea11fcddae331698453d1e2.tar.gz
git-d65fd424ad21adbc1ea11fcddae331698453d1e2.tar.bz2
trailer: improve const correctness
Change "const char *" to "char *" in struct trailer_item and in the return value of apply_command (since those strings are owned strings). Change "struct conf_info *" to "const struct conf_info *" (since that struct is not modified). Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trailer.c')
-rw-r--r--trailer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/trailer.c b/trailer.c
index c6ea9ac..1f191b2 100644
--- a/trailer.c
+++ b/trailer.c
@@ -27,8 +27,8 @@ static struct conf_info default_conf_info;
struct trailer_item {
struct trailer_item *previous;
struct trailer_item *next;
- const char *token;
- const char *value;
+ char *token;
+ char *value;
struct conf_info conf;
};
@@ -95,8 +95,8 @@ static void free_trailer_item(struct trailer_item *item)
free(item->conf.name);
free(item->conf.key);
free(item->conf.command);
- free((char *)item->token);
- free((char *)item->value);
+ free(item->token);
+ free(item->value);
free(item);
}
@@ -215,13 +215,13 @@ static struct trailer_item *remove_first(struct trailer_item **first)
return item;
}
-static const char *apply_command(const char *command, const char *arg)
+static char *apply_command(const char *command, const char *arg)
{
struct strbuf cmd = STRBUF_INIT;
struct strbuf buf = STRBUF_INIT;
struct child_process cp = CHILD_PROCESS_INIT;
const char *argv[] = {NULL, NULL};
- const char *result;
+ char *result;
strbuf_addstr(&cmd, command);
if (arg)
@@ -425,7 +425,7 @@ static int set_if_missing(struct conf_info *item, const char *value)
return 0;
}
-static void duplicate_conf(struct conf_info *dst, struct conf_info *src)
+static void duplicate_conf(struct conf_info *dst, const struct conf_info *src)
{
*dst = *src;
if (src->name)