cvs commit: httpd-2.0/modules/dav/main props.c

[tr...@apache.org]

trawick     01/05/16 10:24:22

  Modified:    modules/dav/fs repos.c
               modules/dav/main props.c
  Log:
  Account for changes to the name of field "private" in struct apr_xml_elem.
  
  PR:             7727
  
  Revision  Changes    Path
  1.55      +1 -1      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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- repos.c	2001/04/12 13:32:33	1.54
  +++ repos.c	2001/05/16 17:24:12	1.55
  @@ -1863,7 +1863,7 @@
       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;
  
  
  
  1.28      +9 -9      httpd-2.0/modules/dav/main/props.c
  
  Index: props.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/props.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- props.c	2001/03/28 07:37:25	1.27
  +++ props.c	2001/05/16 17:24:18	1.28
  @@ -362,7 +362,7 @@
   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 @@
   				       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 @@
           ** 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 @@
       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 @@
       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_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_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)