[patch] A patch to make rapidsvn compile against subversion-0.30.0

patch-svn-0.30.0.patch (text/plain), 3.10 KB, created by Martin Ehmsen (RETIRED) on 2003-10-15 00:28:10 UTC

Index: src/svncpp/client_status.cpp
===================================================================
--- src/svncpp/client_status.cpp        (revision 6910)
+++ src/svncpp/client_status.cpp        (working copy)
@@ -43,6 +43,23 @@
     return NULL;
   }
 
+  struct StatusEntriesBaton {
+    apr_pool_t* pool;
+    apr_hash_t* hash;
+  };
+
+  static void StatusEntriesFunc (void *baton,
+                                 const char *path,
+                                 svn_wc_status_t *status)
+  {
+      svn_wc_status_t* stat;
+      StatusEntriesBaton* seb = (StatusEntriesBaton*)baton;
+
+      path = apr_pstrdup( seb->pool, path );
+      stat = svn_wc_dup_status (status, seb->pool);
+      apr_hash_set( seb->hash, path, APR_HASH_KEY_STRING, stat );
+  }
+
   static StatusEntries
   localStatus (const char * path,
                const bool descend,
@@ -56,11 +73,18 @@
     apr_hash_t *status_hash;
     svn_revnum_t revnum;
     Pool pool;
+    StatusEntriesBaton baton;
 
+    status_hash = apr_hash_make( pool );
+    baton.hash = status_hash;
+    baton.pool = pool;
+
     error = svn_client_status (
-      &status_hash, // pointer to hash
       &revnum,      // revnum
       path,         // path
+      0,
+      StatusEntriesFunc, // status func
+      &baton,        // status baton
       descend,
       get_all,
       update,
@@ -182,16 +206,23 @@
     svn_error_t *error;
     apr_hash_t *status_hash;
     Pool pool;
+    StatusEntriesBaton baton;
 
+    status_hash = apr_hash_make( pool );
+    baton.hash = status_hash;
+    baton.pool = pool;
+
     error = svn_client_status (
-      &status_hash, // pointer to hash
-      NULL,         // revnum
+      0,      // revnum
       path,         // path
-      false,        // descend
-      true,         // get all
-      false,        //update
-      false,        //no_ignore,
-      *context,   //client ctx
+      0,
+      StatusEntriesFunc, // status func
+      &baton,        // status baton
+      false,
+      true,
+      false,
+      false,
+      *context,    //client ctx
       pool);
 
     if (error != NULL)
Index: src/svncpp/property.cpp
===================================================================
--- src/svncpp/property.cpp     (revision 6910)
+++ src/svncpp/property.cpp     (working copy)
@@ -137,7 +137,7 @@
       = svn_string_create ((const char *) value, pool);
 
     const char *pname_utf8;
-    svn_utf_cstring_to_utf8 (&pname_utf8, name, NULL, pool);
+    svn_utf_cstring_to_utf8 (&pname_utf8, name, pool);
 
     svn_error_t * error = 
       svn_client_propset (pname_utf8, propval, m_path.c_str (),
@@ -152,7 +152,7 @@
     Pool pool;
 
     const char *pname_utf8;
-    svn_utf_cstring_to_utf8 (&pname_utf8, name, NULL, pool);
+    svn_utf_cstring_to_utf8 (&pname_utf8, name, pool);
 
     svn_error_t * error = 
       error = svn_client_propset (pname_utf8, 
@@ -171,7 +171,7 @@
     Pool pool;
 
     const char *pname_utf8;
-    svn_utf_cstring_to_utf8 (&pname_utf8, name, NULL, pool);
+    svn_utf_cstring_to_utf8 (&pname_utf8, name, pool);
     svn_boolean_t is_svn_prop = svn_prop_is_svn_prop (pname_utf8);
 
     return is_svn_prop;