Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 43305 invoked from network); 4 Jan 2007 03:13:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jan 2007 03:13:48 -0000 Received: (qmail 68480 invoked by uid 500); 4 Jan 2007 03:13:54 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 68441 invoked by uid 500); 4 Jan 2007 03:13:54 -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 68428 invoked by uid 99); 4 Jan 2007 03:13:54 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jan 2007 19:13:54 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jan 2007 19:13:47 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 74BD91A981A; Wed, 3 Jan 2007 19:12:50 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r492394 - /httpd/httpd/trunk/modules/database/mod_dbd.c Date: Thu, 04 Jan 2007 03:12:50 -0000 To: cvs@httpd.apache.org From: chrisd@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070104031250.74BD91A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chrisd Date: Wed Jan 3 19:12:48 2007 New Revision: 492394 URL: http://svn.apache.org/viewvc?view=rev&rev=492394 Log: Fix several strict compiler warnings for both the threaded and non-threaded versions. Modified: httpd/httpd/trunk/modules/database/mod_dbd.c Modified: httpd/httpd/trunk/modules/database/mod_dbd.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/database/mod_dbd.c?view=diff&rev=492394&r1=492393&r2=492394 ============================================================================== --- httpd/httpd/trunk/modules/database/mod_dbd.c (original) +++ httpd/httpd/trunk/modules/database/mod_dbd.c Wed Jan 3 19:12:48 2007 @@ -128,14 +128,18 @@ return svr; } -#define ISINT(val) \ - for (p = val; *p; ++p) \ - if (!apr_isdigit(*p)) \ - return "Argument must be numeric!" +#define ISINT(val) do { \ + const char *p; \ + \ + for (p = val; *p; ++p) { \ + if (!apr_isdigit(*p)) { \ + return "Argument must be numeric!"; \ + } \ + } \ + } while (0) static const char *dbd_param(cmd_parms *cmd, void *dconf, const char *val) { - const char *p; const apr_dbd_driver_t *driver = NULL; svr_cfg *svr = ap_get_module_config(cmd->server->module_config, &dbd_module); @@ -559,7 +563,7 @@ if (!svr->persist) { /* Return a once-only connection */ - dbd_construct((void**) &rec, svr, s->process->pool); + dbd_construct((void*) &rec, svr, s->process->pool); return rec; } @@ -570,7 +574,7 @@ } } - rv = apr_reslist_acquire(svr->reslist, (void**) &rec); + rv = apr_reslist_acquire(svr->reslist, (void*) &rec); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, "Failed to acquire DBD connection from pool!"); @@ -595,7 +599,7 @@ /* We don't have a connection right now, so we'll open one */ if (!rec) { - dbd_construct((void**) &rec, svr, s->process->pool); + dbd_construct((void*) &rec, svr, s->process->pool); svr->rec = rec; if (rec) {