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 /sha1_file.c | |
| parent | 6c5f9baa3bc0d63e141e0afc23110205379905a4 (diff) | |
| download | git-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 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index 776697755a..fa37f1e3ef 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) |