From cvs-return-4769-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Sun Feb 16 21:59:10 2003 Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 63545 invoked by uid 500); 16 Feb 2003 21:59:10 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 63532 invoked from network); 16 Feb 2003 21:59:10 -0000 Date: 16 Feb 2003 21:59:09 -0000 Message-ID: <20030216215909.80159.qmail@icarus.apache.org> From: brane@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr acconfig.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N brane 2003/02/16 13:59:09 Modified: include/arch/win32 apr_private.h include/arch/unix apr_arch_file_io.h include/arch/netware apr_private.h file_io/win32 filepath.c file_io/unix filepath_util.c filepath.c . acconfig.h Added: include/arch apr_private_common.h Log: Move the apr_filepath_list_split_impl and apr_filepath_list_merge_impl prototypes from include/arch/unix/apr_arch_file_io.h into a new private header, include/arch/apr_private_common.h, and include that from the various apr_private.h instances. Update the filepath.c and filepath_util.c files to reflect this change. Revision Changes Path 1.34 +5 -0 apr/include/arch/win32/apr_private.h Index: apr_private.h =================================================================== RCS file: /home/cvs/apr/include/arch/win32/apr_private.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- apr_private.h 1 Jan 2003 00:01:50 -0000 1.33 +++ apr_private.h 16 Feb 2003 21:59:08 -0000 1.34 @@ -182,5 +182,10 @@ #define HAVE_GETNAMEINFO 1 #endif +/* + * Include common private declarations. + */ +#include "../apr_private_common.h" + #endif /*APR_PRIVATE_H*/ #endif /*WIN32*/ 1.3 +0 -8 apr/include/arch/unix/apr_arch_file_io.h Index: apr_arch_file_io.h =================================================================== RCS file: /home/cvs/apr/include/arch/unix/apr_arch_file_io.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apr_arch_file_io.h 13 Feb 2003 13:24:48 -0000 1.2 +++ apr_arch_file_io.h 16 Feb 2003 21:59:08 -0000 1.3 @@ -153,14 +153,6 @@ mode_t apr_unix_perms2mode(apr_fileperms_t perms); apr_fileperms_t apr_unix_mode2perms(mode_t mode); -apr_status_t apr_filepath_list_split_impl(apr_array_header_t **pathelts, - const char *liststr, - char separator, - apr_pool_t *p); -apr_status_t apr_filepath_list_merge_impl(char **liststr, - apr_array_header_t *pathelts, - char separator, - apr_pool_t *p); #endif /* ! FILE_IO_H */ 1.19 +5 -0 apr/include/arch/netware/apr_private.h Index: apr_private.h =================================================================== RCS file: /home/cvs/apr/include/arch/netware/apr_private.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- apr_private.h 7 Feb 2003 18:02:04 -0000 1.18 +++ apr_private.h 16 Feb 2003 21:59:08 -0000 1.19 @@ -189,5 +189,10 @@ #undef malloc #define malloc(x) library_malloc(gLibHandle,x) +/* + * Include common private declarations. + */ +#include "../apr_private_common.h" + #endif /*APR_PRIVATE_H*/ #endif /*NETWARE*/ 1.1 apr/include/arch/apr_private_common.h Index: apr_private_common.h =================================================================== /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ /* * This file contains private declarations common to all architectures. */ #ifndef APR_PRIVATE_COMMON_H #define APR_PRIVATE_COMMON_H #include "apr_pools.h" #include "apr_tables.h" apr_status_t apr_filepath_list_split_impl(apr_array_header_t **pathelts, const char *liststr, char separator, apr_pool_t *p); apr_status_t apr_filepath_list_merge_impl(char **liststr, apr_array_header_t *pathelts, char separator, apr_pool_t *p); #endif /*APR_PRIVATE_COMMON_H*/ 1.41 +2 -9 apr/file_io/win32/filepath.c Index: filepath.c =================================================================== RCS file: /home/cvs/apr/file_io/win32/filepath.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- filepath.c 12 Feb 2003 20:26:13 -0000 1.40 +++ filepath.c 16 Feb 2003 21:59:08 -0000 1.41 @@ -53,6 +53,7 @@ */ #include "apr.h" +#include "apr_private.h" #include "apr_arch_file_io.h" #include "apr_strings.h" #include "apr_lib.h" @@ -977,21 +978,13 @@ } -apr_status_t apr_filepath_list_split_impl(apr_array_header_t **pathelts, - const char *liststr, - char separator, - apr_pool_t *p); -apr_status_t apr_filepath_list_merge_impl(char **liststr, - apr_array_header_t *pathelts, - char separator, - apr_pool_t *p); - APR_DECLARE(apr_status_t) apr_filepath_list_split(apr_array_header_t **pathelts, const char *liststr, apr_pool_t *p) { return apr_filepath_list_split_impl(pathelts, liststr, ';', p); } + APR_DECLARE(apr_status_t) apr_filepath_list_merge(char **liststr, apr_array_header_t *pathelts, apr_pool_t *p) 1.4 +2 -1 apr/file_io/unix/filepath_util.c Index: filepath_util.c =================================================================== RCS file: /home/cvs/apr/file_io/unix/filepath_util.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- filepath_util.c 13 Feb 2003 13:24:48 -0000 1.3 +++ filepath_util.c 16 Feb 2003 21:59:08 -0000 1.4 @@ -61,7 +61,8 @@ #include "apr_pools.h" #include "apr_strings.h" #include "apr_tables.h" -#include "apr_arch_file_io.h" + +#include "apr_private.h" apr_status_t apr_filepath_list_split_impl(apr_array_header_t **pathelts, const char *liststr, 1.23 +1 -0 apr/file_io/unix/filepath.c Index: filepath.c =================================================================== RCS file: /home/cvs/apr/file_io/unix/filepath.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- filepath.c 13 Feb 2003 13:24:48 -0000 1.22 +++ filepath.c 16 Feb 2003 21:59:08 -0000 1.23 @@ -53,6 +53,7 @@ */ #include "apr.h" +#include "apr_private.h" #include "apr_arch_file_io.h" #include "apr_file_io.h" #include "apr_strings.h" 1.64 +5 -0 apr/acconfig.h Index: acconfig.h =================================================================== RCS file: /home/cvs/apr/acconfig.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- acconfig.h 14 Dec 2002 05:55:03 -0000 1.63 +++ acconfig.h 16 Feb 2003 21:59:09 -0000 1.64 @@ -42,4 +42,9 @@ #define apr_sigwait(a,b) sigwait((a),(b)) #endif +/* + * Include common private declarations. + */ +#include "../apr_private_common.h" + #endif /* APR_PRIVATE_H */