summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJason Riedy <ejr@cs.berkeley.edu>2005-08-23 20:34:07 (GMT)
committerJason Riedy <ejr@cs.berkeley.edu>2005-08-24 03:41:12 (GMT)
commitc7c81b3a51de2778535c8bb18d42a4bb7dfd57bc (patch)
tree78e210d8703959d13f476205e48d5e9125166296 /sha1_file.c
parent6c5f9baa3bc0d63e141e0afc23110205379905a4 (diff)
downloadgit-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.zip
git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.gz
git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.bz2
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 'sha1_file.c')
-rw-r--r--sha1_file.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 7766977..fa37f1e 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -283,7 +283,10 @@ void prepare_alt_odb(void)
char *map;
int fd;
struct stat st;
- char *alt = gitenv(ALTERNATE_DB_ENVIRONMENT) ? : "";
+ char *alt;
+
+ alt = gitenv(ALTERNATE_DB_ENVIRONMENT);
+ if (!alt) alt = "";
sprintf(path, "%s/info/alternates", get_object_directory());
if (alt_odb_tail)