On Mon, 1 Oct 2001 14:02:19 -0700
Greg Stein <gstein@lyra.org> wrote:
> On Mon, Oct 01, 2001 at 07:02:16PM +0200, Branko �ibej wrote:
> > Greg Stein wrote:
> >...
> > >For now, the *real* and proper solution is to use Neon's callbacks to read
> > >from the apr_file_t rather than passing in a file descriptor. In fact, that
> > >is probably the long-term solution, too. (as long as we Neon)
> >
> > Can that be done now? Or should I wait for neon-0.17.0?
>
> Any time. I don't think 0.17 changes the APIs in this area.
I tested out the neon 0.17.0 release and with Joe's help created
this patch. After this patch is added, subversion seems to pass all
the tests with the updated version of neon. Of course, you folks
might want to use this userdata ptr for something.
cheers
Mo DeJong
Index: subversion/libsvn_ra_dav/merge.c
===================================================================
--- subversion/libsvn_ra_dav/SVN/text-base/merge.c Mon Sep 10 09:52:10 2001
+++ subversion/libsvn_ra_dav/merge.c Tue Oct 2 00:51:50 2001
@@ -251,7 +251,7 @@
return bump_resource(mc, relative, mc->vsn_url->data);
}
-static int validate_element(ne_xml_elmid parent, ne_xml_elmid child)
+static int validate_element(void *userdata, ne_xml_elmid parent, ne_xml_elmid child)
{
if ((child == ELEM_collection || child == ELEM_baseline)
&& parent != ELEM_resourcetype) {
Index: subversion/libsvn_ra_dav/props.c
===================================================================
--- subversion/libsvn_ra_dav/SVN/text-base/props.c Mon Sep 10 17:16:49 2001
+++ subversion/libsvn_ra_dav/props.c Tue Oct 2 00:52:32 2001
@@ -169,7 +169,7 @@
(void) ne_propset_iterate(rset, add_to_hash, r);
}
-static int validate_element(ne_xml_elmid parent, ne_xml_elmid child)
+static int validate_element(void *userdata, ne_xml_elmid parent, ne_xml_elmid child)
{
switch (parent)
{
Index: subversion/libsvn_ra_dav/fetch.c
===================================================================
--- subversion/libsvn_ra_dav/SVN/text-base/fetch.c Sat Sep 29 10:42:23 2001
+++ subversion/libsvn_ra_dav/fetch.c Tue Oct 2 00:50:26 2001
@@ -762,7 +762,7 @@
** ### next are subdir elems, possibly fetch-file, then fetch-prop.
*/
-static int validate_element(ne_xml_elmid parent, ne_xml_elmid child)
+static int validate_element(void *userdata, ne_xml_elmid parent, ne_xml_elmid child)
{
/* We're being very strict with the validity of XML elements here. If
something exists that we don't know about, then we might not update
Index: subversion/libsvn_ra_dav/options.c
===================================================================
--- subversion/libsvn_ra_dav/SVN/text-base/options.c Mon Sep 10 09:52:08 2001
+++ subversion/libsvn_ra_dav/options.c Tue Oct 2 00:52:15 2001
@@ -46,7 +46,7 @@
-static int validate_element(ne_xml_elmid parent, ne_xml_elmid child)
+static int validate_element(void *userdata, ne_xml_elmid parent, ne_xml_elmid child)
{
switch (parent)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:43 2006