diff options
| author | Jason Riedy <ejr@cs.berkeley.edu> | 2005-08-23 13:34:07 -0700 |
|---|---|---|
| committer | Jason Riedy <ejr@cs.berkeley.edu> | 2005-08-23 20:41:12 -0700 |
| commit | c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc (patch) | |
| tree | 78e210d8703959d13f476205e48d5e9125166296 /fsck-cache.c | |
| parent | 6c5f9baa3bc0d63e141e0afc23110205379905a4 (diff) | |
| download | git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.gz git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.xz | |
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 <ejr@cs.berkeley.edu>
Diffstat (limited to 'fsck-cache.c')
| -rw-r--r-- | fsck-cache.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fsck-cache.c b/fsck-cache.c index 809178019..ca24a1b84 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) |