summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorJason Riedy <ejr@cs.berkeley.edu>2005-08-23 13:34:07 -0700
committerJason Riedy <ejr@cs.berkeley.edu>2005-08-23 20:41:12 -0700
commitc7c81b3a51de2778535c8bb18d42a4bb7dfd57bc (patch)
tree78e210d8703959d13f476205e48d5e9125166296 /path.c
parent6c5f9baa3bc0d63e141e0afc23110205379905a4 (diff)
downloadgit-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.gz
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 'path.c')
-rw-r--r--path.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/path.c b/path.c
index b85f087f43..142e575e5c 100644
--- a/path.c
+++ b/path.c
@@ -41,10 +41,12 @@ char *mkpath(const char *fmt, ...)
char *git_path(const char *fmt, ...)
{
- const char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
+ const char *git_dir;
va_list args;
unsigned len;
+ git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+ if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
len = strlen(git_dir);
if (len > PATH_MAX-100)
return bad_path;