From eac9bcb41a409a7eeae4f4d3890b063bf114aca0 Mon Sep 17 00:00:00 2001 From: Giovanni Bechis Date: Thu, 27 Feb 2020 06:59:10 +0000 Subject: [PATCH] "?:" is a GNU extension, use standard syntax spotted by Christophe Jaillet git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874558 13f79535-47bb-0310-9956-ffa450edef68 --- modules/filters/mod_brotli.c | 2 +- modules/filters/mod_deflate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/filters/mod_brotli.c b/modules/filters/mod_brotli.c index a47684c68f3..0f7d770b670 100644 --- a/modules/filters/mod_brotli.c +++ b/modules/filters/mod_brotli.c @@ -419,7 +419,7 @@ static apr_status_t compress_filter(ap_filter_t *f, apr_bucket_brigade *bb) } q = ap_get_token(r->pool, &accepts, 1); ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, - "token: '%s' - q: '%s'", token ?: "NULL", q); + "token: '%s' - q: '%s'", token ? token : "NULL", q); } /* No acceptable token found or q=0 */ diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c index fc2531a6840..1c09df1f683 100644 --- a/modules/filters/mod_deflate.c +++ b/modules/filters/mod_deflate.c @@ -770,7 +770,7 @@ static apr_status_t deflate_out_filter(ap_filter_t *f, } q = ap_get_token(r->pool, &accepts, 1); ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, - "token: '%s' - q: '%s'", token ?: "NULL", q); + "token: '%s' - q: '%s'", token ? token : "NULL", q); } /* No acceptable token found or q=0 */ -- 2.47.3