From c7d77dab9333112cfce8cce51e56005b5e8b4076 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 21 Nov 2005 23:44:35 -0800 Subject: git-var: constness and globalness cleanup. var.c::git_var read function did not have to return writable strings; make it and the functions it points at return const char * instead. ident.c::get_ident() did not need to be global, so make it static. Signed-off-by: Junio C Hamano --- ident.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'ident.c') diff --git a/ident.c b/ident.c index bc89e1d04c..ac1c27f199 100644 --- a/ident.c +++ b/ident.c @@ -156,7 +156,8 @@ static int copy(char *buf, int size, int offset, const char *src) return offset; } -char *get_ident(const char *name, const char *email, const char *date_str) +static const char *get_ident(const char *name, const char *email, + const char *date_str) { static char buffer[1000]; char date[50]; @@ -181,12 +182,16 @@ char *get_ident(const char *name, const char *email, const char *date_str) return buffer; } -char *git_author_info(void) +const char *git_author_info(void) { - return get_ident(getenv("GIT_AUTHOR_NAME"), getenv("GIT_AUTHOR_EMAIL"), getenv("GIT_AUTHOR_DATE")); + return get_ident(getenv("GIT_AUTHOR_NAME"), + getenv("GIT_AUTHOR_EMAIL"), + getenv("GIT_AUTHOR_DATE")); } -char *git_committer_info(void) +const char *git_committer_info(void) { - return get_ident(getenv("GIT_COMMITTER_NAME"), getenv("GIT_COMMITTER_EMAIL"), getenv("GIT_COMMITTER_DATE")); + return get_ident(getenv("GIT_COMMITTER_NAME"), + getenv("GIT_COMMITTER_EMAIL"), + getenv("GIT_COMMITTER_DATE")); } -- cgit v1.2.1