[PATCH v5 05/11] revision: make get_revision_mark() return const pointer
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Nov 20, 2019, 00:51 UTC
- Message-ID
- <ac23c4ec4522dd2343b8147b95b2408eddba0678.1574211027.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1574211027.git.liu.denton@gmail.com>
get_revision_mark() used to return a `char *`, even though all of the strings it was returning were string literals. Make get_revision_mark() return a `const char *` so that callers won't be tempted to modify the returned string.
Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- revision.c | 4 ++-- revision.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/revision.c b/revision.c index 07412297f0..2eb9ff089b 100644 --- a/revision.c +++ b/revision.c @@ -3934,7 +3934,7 @@ struct commit *get_revision(struct rev_info *revs) return c; } -char *get_revision_mark(const struct rev_info *revs, const struct commit *commit) +const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit) { if (commit->object.flags & BOUNDARY) return "-"; @@ -3956,7 +3956,7 @@ char *get_revision_mark(const struct rev_info *revs, const struct commit *commit void put_revision_mark(const struct rev_info *revs, const struct commit *commit) { - char *mark = get_revision_mark(revs, commit); + const char *mark = get_revision_mark(revs, commit); if (!strlen(mark)) return; fputs(mark, stdout); diff --git a/revision.h b/revision.h index 4134dc6029..addd69410b 100644 --- a/revision.h +++ b/revision.h @@ -322,8 +322,8 @@ int handle_revision_arg(const char *arg, struct rev_info *revs, void reset_revision_walk(void); int prepare_revision_walk(struct rev_info *revs); struct commit *get_revision(struct rev_info *revs); -char *get_revision_mark(const struct rev_info *revs, - const struct commit *commit); +const char *get_revision_mark(const struct rev_info *revs, + const struct commit *commit); void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
-- 2.24.0.420.g9ac4901264