You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/03/17 12:33:45 UTC

svn commit: r924229 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c wc.h

Author: julianfoad
Date: Wed Mar 17 11:33:45 2010
New Revision: 924229

URL: http://svn.apache.org/viewvc?rev=924229&view=rev
Log:
Rename a function parameter to match the doc string. A follow-up to r921503.

* subversion/libsvn_wc/wc.h,
  subversion/libsvn_wc/adm_ops.c
  (svn_wc__prop_array_to_hash): Rename 'wcprop_changes' to 'props'.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_ops.c
    subversion/trunk/subversion/libsvn_wc/wc.h

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=924229&r1=924228&r2=924229&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Mar 17 11:33:45 2010
@@ -578,21 +578,20 @@ svn_wc__process_committed_internal(svn_w
 
 
 apr_hash_t *
-svn_wc__prop_array_to_hash(const apr_array_header_t *wcprop_changes,
+svn_wc__prop_array_to_hash(const apr_array_header_t *props,
                            apr_pool_t *result_pool)
 {
   int i;
   apr_hash_t *dav_cache;
 
-  if (wcprop_changes == NULL || wcprop_changes->nelts == 0)
+  if (props == NULL || props->nelts == 0)
     return NULL;
 
   dav_cache = apr_hash_make(result_pool);
 
-  for (i = 0; i < wcprop_changes->nelts; i++)
+  for (i = 0; i < props->nelts; i++)
     {
-      const svn_prop_t *prop = APR_ARRAY_IDX(wcprop_changes, i,
-                                             const svn_prop_t *);
+      const svn_prop_t *prop = APR_ARRAY_IDX(props, i, const svn_prop_t *);
 
       if (prop->value != NULL)
         apr_hash_set(dav_cache, prop->name, APR_HASH_KEY_STRING, prop->value);

Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=924229&r1=924228&r2=924229&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Wed Mar 17 11:33:45 2010
@@ -328,7 +328,7 @@ svn_error_t *svn_wc__ensure_directory(co
    ### one's contains *pointers* to svn_prop_t's.  So much for
    ### consistency.  */
 apr_hash_t *
-svn_wc__prop_array_to_hash(const apr_array_header_t *wcprop_changes,
+svn_wc__prop_array_to_hash(const apr_array_header_t *props,
                            apr_pool_t *result_pool);
 
 



Re: svn commit: r924229 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c wc.h

Posted by Julian Foad <ju...@wandisco.com>.
C. Michael Pilato wrote:
> julianfoad@apache.org wrote:
> > Author: julianfoad
> > Date: Wed Mar 17 11:33:45 2010
> > New Revision: 924229
> > 
> > URL: http://svn.apache.org/viewvc?rev=924229&view=rev
> > Log:
> > Rename a function parameter to match the doc string. A follow-up to r921503.
> > 
> > * subversion/libsvn_wc/wc.h,
> >   subversion/libsvn_wc/adm_ops.c
> >   (svn_wc__prop_array_to_hash): Rename 'wcprop_changes' to 'props'.
[...]
> I was really confused about this commit ... until I realized that the
> similar changes I made yesterday were still sitting uncommitted in my
> working copy.  Doh!  I committed another little tweak here in r924260,
> leftover after merging in yours via 'svn update'.

Oh, thanks - I didn't notice the potential for that extra tweak.

- Julian



Re: svn commit: r924229 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c wc.h

Posted by Julian Foad <ju...@wandisco.com>.
C. Michael Pilato wrote:
> julianfoad@apache.org wrote:
> > Author: julianfoad
> > Date: Wed Mar 17 11:33:45 2010
> > New Revision: 924229
> > 
> > URL: http://svn.apache.org/viewvc?rev=924229&view=rev
> > Log:
> > Rename a function parameter to match the doc string. A follow-up to r921503.
> > 
> > * subversion/libsvn_wc/wc.h,
> >   subversion/libsvn_wc/adm_ops.c
> >   (svn_wc__prop_array_to_hash): Rename 'wcprop_changes' to 'props'.
[...]
> I was really confused about this commit ... until I realized that the
> similar changes I made yesterday were still sitting uncommitted in my
> working copy.  Doh!  I committed another little tweak here in r924260,
> leftover after merging in yours via 'svn update'.

Oh, thanks - I didn't notice the potential for that extra tweak.

- Julian


Re: svn commit: r924229 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c wc.h

Posted by "C. Michael Pilato" <cm...@collab.net>.
julianfoad@apache.org wrote:
> Author: julianfoad
> Date: Wed Mar 17 11:33:45 2010
> New Revision: 924229
> 
> URL: http://svn.apache.org/viewvc?rev=924229&view=rev
> Log:
> Rename a function parameter to match the doc string. A follow-up to r921503.
> 
> * subversion/libsvn_wc/wc.h,
>   subversion/libsvn_wc/adm_ops.c
>   (svn_wc__prop_array_to_hash): Rename 'wcprop_changes' to 'props'.
> 
> Modified:
>     subversion/trunk/subversion/libsvn_wc/adm_ops.c
>     subversion/trunk/subversion/libsvn_wc/wc.h

I was really confused about this commit ... until I realized that the
similar changes I made yesterday were still sitting uncommitted in my
working copy.  Doh!  I committed another little tweak here in r924260,
leftover after merging in yours via 'svn update'.

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand


Re: svn commit: r924229 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c wc.h

Posted by "C. Michael Pilato" <cm...@collab.net>.
julianfoad@apache.org wrote:
> Author: julianfoad
> Date: Wed Mar 17 11:33:45 2010
> New Revision: 924229
> 
> URL: http://svn.apache.org/viewvc?rev=924229&view=rev
> Log:
> Rename a function parameter to match the doc string. A follow-up to r921503.
> 
> * subversion/libsvn_wc/wc.h,
>   subversion/libsvn_wc/adm_ops.c
>   (svn_wc__prop_array_to_hash): Rename 'wcprop_changes' to 'props'.
> 
> Modified:
>     subversion/trunk/subversion/libsvn_wc/adm_ops.c
>     subversion/trunk/subversion/libsvn_wc/wc.h

I was really confused about this commit ... until I realized that the
similar changes I made yesterday were still sitting uncommitted in my
working copy.  Doh!  I committed another little tweak here in r924260,
leftover after merging in yours via 'svn update'.

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand