]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
_gnutls_resolve_priorities: avoid gnu extension for ?: construct
authorNikos Mavrogiannopoulos <nmav@gnutls.org>
Sat, 14 Jul 2018 06:27:26 +0000 (08:27 +0200)
committerNikos Mavrogiannopoulos <nmav@gnutls.org>
Sat, 14 Jul 2018 06:27:26 +0000 (08:27 +0200)
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
lib/priority.c

index 9236f7fe0940626deba87082448978a5de49aa50..1b954cfb9648aaf6204da03a14af778d8ba49287 100644 (file)
@@ -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;