Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7DA09D1B5 for ; Fri, 9 Nov 2012 14:04:49 +0000 (UTC) Received: (qmail 33797 invoked by uid 500); 9 Nov 2012 14:04:49 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 33504 invoked by uid 500); 9 Nov 2012 14:04:48 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 33448 invoked by uid 99); 9 Nov 2012 14:04:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Nov 2012 14:04:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Nov 2012 14:04:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AED9923889D7; Fri, 9 Nov 2012 14:04:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1407460 - /httpd/httpd/trunk/modules/mappers/mod_speling.c Date: Fri, 09 Nov 2012 14:04:22 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121109140422.AED9923889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Fri Nov 9 14:04:22 2012 New Revision: 1407460 URL: http://svn.apache.org/viewvc?rev=1407460&view=rev Log: 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); Modified: httpd/httpd/trunk/modules/mappers/mod_speling.c Modified: httpd/httpd/trunk/modules/mappers/mod_speling.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_speling.c?rev=1407460&r1=1407459&r2=1407460&view=diff ============================================================================== --- httpd/httpd/trunk/modules/mappers/mod_speling.c (original) +++ httpd/httpd/trunk/modules/mappers/mod_speling.c Fri Nov 9 14:04:22 2012 @@ -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; }