From 1e08aa6be7d937ee8e0719aed4c46c7b8307f486 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Wed, 16 May 2001 17:24:18 +0000 Subject: [PATCH] Account for changes to the name of field "private" in struct apr_xml_elem. PR: 7727 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89128 13f79535-47bb-0310-9956-ffa450edef68 --- modules/dav/fs/repos.c | 2 +- modules/dav/main/props.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c index e8064d1cc7f..50f408d131a 100644 --- a/modules/dav/fs/repos.c +++ b/modules/dav/fs/repos.c @@ -1863,7 +1863,7 @@ static dav_error *dav_fs_patch_validate(const dav_resource *resource, const ap_text *cdata; const ap_text *f_cdata; char value; - dav_elem_private *priv = elem->private; + dav_elem_private *priv = elem->priv; if (priv->propid != DAV_PROPID_FS_executable) { *defer_to_dead = 1; diff --git a/modules/dav/main/props.c b/modules/dav/main/props.c index 2929a9a2971..d7fba0db531 100644 --- a/modules/dav/main/props.c +++ b/modules/dav/main/props.c @@ -362,7 +362,7 @@ static int dav_find_liveprop_provider(dav_propdb *propdb, static void dav_find_liveprop(dav_propdb *propdb, ap_xml_elem *elem) { const char *ns_uri; - dav_elem_private *priv = elem->private; + dav_elem_private *priv = elem->priv; const dav_hooks_liveprop *hooks; @@ -546,7 +546,7 @@ static dav_error * dav_insert_liveprop(dav_propdb *propdb, ap_text_header *phdr, dav_prop_insert *inserted) { - dav_elem_private *priv = elem->private; + dav_elem_private *priv = elem->priv; *inserted = DAV_PROP_INSERT_NOTDEF; @@ -1178,10 +1178,10 @@ dav_get_props_result dav_get_props(dav_propdb *propdb, ap_xml_doc *doc) ** the property, then try looking it up in the propdb. */ - if (elem->private == NULL) { - elem->private = apr_pcalloc(propdb->p, sizeof(*priv)); + if (elem->priv == NULL) { + elem->priv = apr_pcalloc(propdb->p, sizeof(*priv)); } - priv = elem->private; + priv = elem->priv; /* cache the propid; dav_get_props() could be called many times */ if (priv->propid == 0) @@ -1367,7 +1367,7 @@ void dav_prop_validate(dav_prop_ctx *ctx) ap_xml_elem *prop = ctx->prop; dav_elem_private *priv; - priv = ctx->prop->private = apr_pcalloc(propdb->p, sizeof(*priv)); + priv = ctx->prop->priv = apr_pcalloc(propdb->p, sizeof(*priv)); /* ** Check to see if this is a live property, and fill the fields @@ -1455,7 +1455,7 @@ void dav_prop_exec(dav_prop_ctx *ctx) dav_propdb *propdb = ctx->propdb; dav_error *err = NULL; dav_rollback_item *rollback; - dav_elem_private *priv = ctx->prop->private; + dav_elem_private *priv = ctx->prop->priv; rollback = apr_pcalloc(propdb->p, sizeof(*rollback)); ctx->rollback = rollback; @@ -1526,7 +1526,7 @@ void dav_prop_exec(dav_prop_ctx *ctx) void dav_prop_commit(dav_prop_ctx *ctx) { - dav_elem_private *priv = ctx->prop->private; + dav_elem_private *priv = ctx->prop->priv; /* ** Note that a commit implies ctx->err is NULL. The caller should assume @@ -1544,7 +1544,7 @@ void dav_prop_commit(dav_prop_ctx *ctx) void dav_prop_rollback(dav_prop_ctx *ctx) { dav_error *err = NULL; - dav_elem_private *priv = ctx->prop->private; + dav_elem_private *priv = ctx->prop->priv; /* do nothing if there is no rollback information. */ if (ctx->rollback == NULL) -- 2.47.2