Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 24809 invoked by uid 500); 23 Jun 2002 06:46:53 -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: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 24798 invoked by uid 500); 23 Jun 2002 06:46:53 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 23 Jun 2002 06:46:52 -0000 Message-ID: <20020623064652.95209.qmail@icarus.apache.org> From: wrowe@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/dav/fs repos.c repos.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N wrowe 2002/06/22 23:46:52 Modified: modules/dav/fs repos.c repos.h Log: Whoops... removal of the last compat was just this bit premature. Revision Changes Path 1.70 +7 -7 httpd-2.0/modules/dav/fs/repos.c Index: repos.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/dav/fs/repos.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- repos.c 6 Apr 2002 01:11:49 -0000 1.69 +++ repos.c 23 Jun 2002 06:46:52 -0000 1.70 @@ -1823,7 +1823,7 @@ static dav_prop_insert dav_fs_insert_prop(const dav_resource *resource, int propid, dav_prop_insert what, - ap_text_header *phdr) + apr_text_header *phdr) { const char *value; const char *s; @@ -1923,7 +1923,7 @@ "D:namespace=\"%s\"/>" DEBUG_CR, info->name, dav_fs_namespace_uris[info->ns]); } - ap_text_append(p, phdr, s); + apr_text_append(p, phdr, s); /* we inserted what was asked for */ return what; @@ -1945,13 +1945,13 @@ } static dav_error *dav_fs_patch_validate(const dav_resource *resource, - const ap_xml_elem *elem, + const apr_xml_elem *elem, int operation, void **context, int *defer_to_dead) { - const ap_text *cdata; - const ap_text *f_cdata; + const apr_text *cdata; + const apr_text *f_cdata; char value; dav_elem_private *priv = elem->priv; @@ -2010,7 +2010,7 @@ } static dav_error *dav_fs_patch_exec(const dav_resource *resource, - const ap_xml_elem *elem, + const apr_xml_elem *elem, int operation, void *context, dav_liveprop_rollback **rollback_ctx) @@ -2120,7 +2120,7 @@ } void dav_fs_insert_all_liveprops(request_rec *r, const dav_resource *resource, - dav_prop_insert what, ap_text_header *phdr) + dav_prop_insert what, apr_text_header *phdr) { /* don't insert any liveprops if this isn't "our" resource */ if (resource->hooks != &dav_hooks_repository_fs) 1.18 +1 -1 httpd-2.0/modules/dav/fs/repos.h Index: repos.h =================================================================== RCS file: /home/cvs/httpd-2.0/modules/dav/fs/repos.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- repos.h 13 Mar 2002 20:47:45 -0000 1.17 +++ repos.h 23 Jun 2002 06:46:52 -0000 1.18 @@ -109,7 +109,7 @@ const char *ns_uri, const char *name, const dav_hooks_liveprop **hooks); void dav_fs_insert_all_liveprops(request_rec *r, const dav_resource *resource, - dav_prop_insert what, ap_text_header *phdr); + dav_prop_insert what, apr_text_header *phdr); void dav_fs_register(apr_pool_t *p);