svn commit: r1147111 - in /subversion/branches/1.7.x: ./ STATUS subversion/include/svn_client.h subversion/libsvn_client/deprecated.c

[hw...@apache.org]

Author: hwright
Date: Fri Jul 15 12:03:21 2011
New Revision: 1147111

URL: http://svn.apache.org/viewvc?rev=1147111&view=rev
Log:
Merge r1146492, r1146555 from trunk:

 * r1146492, r1146555
   Add const to a couple members of svn_client_info2_t
   Justification:
     We don't want clients to think they can modify the underlying
     structures. We had similar problems with the svn_wc_status_t,
     and it makes it hard to rev APIs when clients may be monkeying
     with the data we pass along.
   Votes:
     +1: gstein, rhuijben, julianfoad, blair

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/include/svn_client.h
    subversion/branches/1.7.x/subversion/libsvn_client/deprecated.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 15 12:03:21 2011
@@ -53,4 +53,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146219,1146222,1146274
+/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1147111&r1=1147110&r2=1147111&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Jul 15 12:03:21 2011
@@ -56,16 +56,6 @@ Candidate changes:
 Approved changes:
 =================
 
- * r1146492, r1146555
-   Add const to a couple members of svn_client_info2_t
-   Justification:
-     We don't want clients to think they can modify the underlying
-     structures. We had similar problems with the svn_wc_status_t,
-     and it makes it hard to rev APIs when clients may be monkeying
-     with the data we pass along.
-   Votes:
-     +1: gstein, rhuijben, julianfoad, blair
-
  * r1146620
    Simple consistency for the 'svn_client_info2_t' structure; no functional
    change.  On the 'wc_info' member, remove 'struct' keyword, as we don't

Modified: subversion/branches/1.7.x/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/include/svn_client.h?rev=1147111&r1=1147110&r2=1147111&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/include/svn_client.h (original)
+++ subversion/branches/1.7.x/subversion/include/svn_client.h Fri Jul 15 12:03:21 2011
@@ -5388,10 +5388,10 @@ typedef struct svn_client_info2_t
   const char *last_changed_author;
 
   /** An exclusive lock, if present.  Could be either local or remote. */
-  svn_lock_t *lock;
+  const svn_lock_t *lock;
 
   /* Possible information about the working copy, NULL if not valid. */
-  struct svn_wc_info_t *wc_info;
+  const struct svn_wc_info_t *wc_info;
 
 } svn_client_info2_t;
 

Modified: subversion/branches/1.7.x/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/deprecated.c?rev=1147111&r1=1147110&r2=1147111&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/deprecated.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/deprecated.c Fri Jul 15 12:03:21 2011
@@ -2177,7 +2177,9 @@ info_from_info2(svn_info_t **new_info,
   info->last_changed_rev    = info2->last_changed_rev;
   info->last_changed_date   = info2->last_changed_date;
   info->last_changed_author = info2->last_changed_author;
-  info->lock                = info2->lock;
+
+  /* Stupid old structure has a non-const LOCK member. Sigh.  */
+  info->lock                = (svn_lock_t *)info2->lock;
 
   info->size64              = info2->size;
   if (info2->size == SVN_INVALID_FILESIZE)