From c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc Mon Sep 17 00:00:00 2001 From: Jason Riedy Date: Tue, 23 Aug 2005 13:34:07 -0700 Subject: Fix ?: statements. Omitting the first branch in ?: is a GNU extension. Cute, but not supported by other compilers. Replaced mostly by explicit tests. Calls to getenv() simply are repeated on non-GNU compilers. Signed-off-by: Jason Riedy --- fsck-cache.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'fsck-cache.c') diff --git a/fsck-cache.c b/fsck-cache.c index 8091780193..ca24a1b844 100644 --- a/fsck-cache.c +++ b/fsck-cache.c @@ -390,7 +390,10 @@ static int fsck_head_link(void) char hex[40]; unsigned char sha1[20]; static char path[PATH_MAX], link[PATH_MAX]; - const char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT; + const char *git_dir; + + git_dir = gitenv(GIT_DIR_ENVIRONMENT); + if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT; snprintf(path, sizeof(path), "%s/HEAD", git_dir); if (readlink(path, link, sizeof(link)) < 0) -- cgit v1.3