From: Jim Jagielski <jim@apache.org>
Date: Fri, 9 Nov 2012 14:04:22 +0000 (+0000)
Subject: Remove warnings
X-Git-Tag: 2.5.0-alpha~6138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec425400e64e561fb3e0acd75b9df180b0777f65;p=thirdparty%2Fapache%2Fhttpd.git

Remove warnings
mod_speling.c:400:41: warning: data argument not used by format string [-Wformat-extra-args]
                          r->uri, nuri, ref);
                                                                                                                        mod_speling.c:508:53: warning: data argument not used by format string [-Wformat-extra-args]
                          r->uri, candidates->nelts, ref);

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407460 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index b1c75d01f28..c520aa1c49a 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -396,8 +396,9 @@ static int check_speling(request_rec *r)
             ap_log_rerror(APLOG_MARK, APLOG_INFO, APR_SUCCESS,
                           r,
                           ref ? "Fixed spelling: %s to %s from %s"
-                              : "Fixed spelling: %s to %s",
-                          r->uri, nuri, ref);
+                              : "Fixed spelling: %s to %s%s",
+                          r->uri, nuri,
+                          (ref ? ref : ""));
 
             return HTTP_MOVED_PERMANENTLY;
         }
@@ -504,8 +505,9 @@ static int check_speling(request_rec *r)
 
             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
                          ref ? "Spelling fix: %s: %d candidates from %s"
-                             : "Spelling fix: %s: %d candidates",
-                         r->uri, candidates->nelts, ref);
+                             : "Spelling fix: %s: %d candidates%s",
+                         r->uri, candidates->nelts,
+                         (ref ? ref : ""));
 
             return HTTP_MULTIPLE_CHOICES;
         }