diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-07-14 08:27:26 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-07-14 08:27:26 +0200 |
commit | c378f48f61736cc3579e4ea0422b81209dff4e94 (patch) | |
tree | 1e6a6b5067fb2add0889345d3e7694b8e9a3bedc | |
parent | cf301be1335325e25c40074aae3074d062924a63 (diff) | |
download | gnutls-c378f48f61736cc3579e4ea0422b81209dff4e94.tar.gz |
_gnutls_resolve_priorities: avoid gnu extension for ?: construct
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r-- | lib/priority.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/priority.c b/lib/priority.c index 9236f7fe09..1b954cfb96 100644 --- a/lib/priority.c +++ b/lib/priority.c @@ -1039,6 +1039,8 @@ void _gnutls_unload_system_priorities(void) system_priority_last_mod = 0; } +#define S(str) ((str!=NULL)?str:"") + /* Returns the new priorities if a priority string prefixed * with '@' is provided, or just a copy of the provided * priorities, appended with any additional present in @@ -1112,7 +1114,7 @@ size_t n, n2 = 0, line_size; } while (l>0); _gnutls_debug_log("resolved '%.*s' to '%s', next '%.*s'\n", - ss_len, ss, p ? : "", ss_next_len, ss_next ? : ""); + ss_len, ss, S(p), ss_next_len, S(ss_next)); ss = ss_next; fclose(fp); fp = NULL; |