Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 56984 invoked from network); 16 Sep 2008 21:19:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Sep 2008 21:19:42 -0000 Received: (qmail 52961 invoked by uid 500); 16 Sep 2008 21:19:35 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 52906 invoked by uid 500); 16 Sep 2008 21:19:35 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 52895 invoked by uid 99); 16 Sep 2008 21:19:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Sep 2008 14:19:35 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received: from [140.211.11.9] (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 16 Sep 2008 21:18:45 +0000 Received: (qmail 56823 invoked by uid 2161); 16 Sep 2008 21:19:17 -0000 Received: from [192.168.2.4] (euler.heimnetz.de [192.168.2.4]) by cerberus.heimnetz.de (Postfix on SuSE Linux 7.0 (i386)) with ESMTP id 0CDEC1721C for ; Tue, 16 Sep 2008 23:19:04 +0200 (CEST) Message-ID: <48D022D5.3080800@apache.org> Date: Tue, 16 Sep 2008 23:19:17 +0200 From: Ruediger Pluem User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.16) Gecko/20080702 SeaMonkey/1.1.11 MIME-Version: 1.0 To: dev@httpd.apache.org Subject: Re: svn commit: r696047 - in /httpd/flood/trunk: flood_subst_file.c flood_subst_file.h References: <20080916204145.DA8E423889B9@eris.apache.org> In-Reply-To: <20080916204145.DA8E423889B9@eris.apache.org> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Virus-Checked: Checked by ClamAV on apache.org On 09/16/2008 10:41 PM, jerenkrantz@apache.org wrote: > Author: jerenkrantz > Date: Tue Sep 16 13:41:45 2008 > New Revision: 696047 > > URL: http://svn.apache.org/viewvc?rev=696047&view=rev > Log: > Fix up flood_subst_file implementation so that we compile again on Mac OS X. > > Also fix up various nits, add licensing blocks, and reformat to better follow > coding standards. > > * flood_subst_file.c, flood_subst_file.h: Misc. fixes. > > Modified: > httpd/flood/trunk/flood_subst_file.c > httpd/flood/trunk/flood_subst_file.h > > Modified: httpd/flood/trunk/flood_subst_file.c > URL: http://svn.apache.org/viewvc/httpd/flood/trunk/flood_subst_file.c?rev=696047&r1=696046&r2=696047&view=diff > ============================================================================== > @@ -192,8 +172,41 @@ > } > > #ifdef SUBST_MAIN > +subst_rec_t subst_list[SUBST_FILE_ARR_MAX]; > + > +void subst_list_make(subst_rec_t *subst_list) { > + int i2 = 0; > + > + subst_list[0].subst_var = "name"; > + subst_list[0].subst_file_name = "/pmalab1/temphome/guyf/work/replace_mc5/flood_stuff/build/flood-0.4/test"; > + subst_list[0].subst_mode = 0; > + subst_list[0].valid = 1; > + i2++; > + > + subst_list[i2].subst_var = "foot"; > + subst_list[i2].subst_file_name = "/pmalab1/temphome/guyf/work/replace_mc5/flood_stuff/build/flood-0.4/blort"; > + subst_list[i2].subst_mode = 0; > + subst_list[i2].valid = 1; > + > + i2++; > + subst_list[i2].subst_var = "nerve"; > + subst_list[i2].subst_file_name = "/pmalab1/temphome/guyf/work/replace_mc5/flood_stuff/build/flood-0.4/cavort"; > + subst_list[i2].subst_mode = 0; > + subst_list[i2].valid = 1; > +} > + > +int close_subst_file(apr_file_t* subst_file) { > + apr_status_t rc = 0; > + > + if (subst_file) { > + rc = apr_file_close(subst_file); > + } > + return rc; > +} > + > int main(int argc, char** argv) { > - char line[SUBST_FILE_MAX_URL_SIZE]; # why mess around, therefore static > + //# why mess around, therefore static C++ style comments are not liked by all C compilers. Regards Rüdiger