subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1227870 - in /subversion/trunk/subversion: libsvn_fs_base/bdb/env.c libsvn_ra_serf/util.c mod_dav_svn/lock.c mod_dav_svn/merge.c mod_dav_svn/version.c svn/util.c tests/libsvn_ra_local/ra-local-test.c
Date Thu, 05 Jan 2012 22:16:45 GMT
Author: julianfoad
Date: Thu Jan  5 22:16:44 2012
New Revision: 1227870

URL: http://svn.apache.org/viewvc?rev=1227870&view=rev
Log:
Don't use SVN_NO_ERROR inappropriately: use APR_SUCCESS for an apr_status_t
or NULL for a pointer to a dav_error.

* subversion/libsvn_fs_base/bdb/env.c
  (bdb_error_gatherer): As above.

* subversion/libsvn_ra_serf/util.c
  (svn_ra_serf__conn_setup): Same.

* subversion/mod_dav_svn/lock.c
  (unescape_xml): Same.

* subversion/mod_dav_svn/merge.c
  (dav_svn__merge_response): Same.

* subversion/mod_dav_svn/version.c
  (dav_svn__build_lock_hash): Same.

* subversion/svn/util.c
  (svn_cl__try): Same.

* subversion/tests/libsvn_ra_local/ra-local-test.c
  (try_split_url): Same.

Modified:
    subversion/trunk/subversion/libsvn_fs_base/bdb/env.c
    subversion/trunk/subversion/libsvn_ra_serf/util.c
    subversion/trunk/subversion/mod_dav_svn/lock.c
    subversion/trunk/subversion/mod_dav_svn/merge.c
    subversion/trunk/subversion/mod_dav_svn/version.c
    subversion/trunk/subversion/svn/util.c
    subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c

Modified: subversion/trunk/subversion/libsvn_fs_base/bdb/env.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/bdb/env.c?rev=1227870&r1=1227869&r2=1227870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/bdb/env.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/bdb/env.c Thu Jan  5 22:16:44 2012
@@ -226,7 +226,7 @@ bdb_error_gatherer(const DB_ENV *dbenv, 
 
   SVN_BDB_ERROR_GATHERER_IGNORE(dbenv);
 
-  new_err = svn_error_createf(SVN_NO_ERROR, NULL, "bdb: %s", msg);
+  new_err = svn_error_createf(APR_SUCCESS, NULL, "bdb: %s", msg);
   if (error_info->pending_errors)
     svn_error_compose(error_info->pending_errors, new_err);
   else

Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1227870&r1=1227869&r2=1227870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Thu Jan  5 22:16:44 2012
@@ -478,7 +478,7 @@ svn_ra_serf__conn_setup(apr_socket_t *so
 {
   svn_ra_serf__connection_t *conn = baton;
   svn_ra_serf__session_t *session = conn->session;
-  apr_status_t status = SVN_NO_ERROR;
+  apr_status_t status = APR_SUCCESS;
 
   svn_error_t *err = conn_setup(sock,
                                 read_bkt,

Modified: subversion/trunk/subversion/mod_dav_svn/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/lock.c?rev=1227870&r1=1227869&r2=1227870&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/lock.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/lock.c Thu Jan  5 22:16:44 2012
@@ -149,7 +149,7 @@ unescape_xml(const char **output,
 
   apr_xml_to_text(pool, xml_doc->root, APR_XML_X2T_INNER,
                   xml_doc->namespaces, NULL, output, NULL);
-  return SVN_NO_ERROR;
+  return NULL;
 }
 
 

Modified: subversion/trunk/subversion/mod_dav_svn/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/merge.c?rev=1227870&r1=1227869&r2=1227870&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/merge.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/merge.c Thu Jan  5 22:16:44 2012
@@ -362,5 +362,5 @@ dav_svn__merge_response(ap_filter_t *out
   /* send whatever is left in the brigade */
   (void) ap_pass_brigade(output, bb);
 
-  return SVN_NO_ERROR;
+  return NULL;
 }

Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1227870&r1=1227869&r2=1227870&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Thu Jan  5 22:16:44 2012
@@ -1180,7 +1180,7 @@ dav_svn__build_lock_hash(apr_hash_t **lo
   if (! doc)
     {
       *locks = hash;
-      return SVN_NO_ERROR;
+      return NULL;
     }
 
   /* Sanity check. */
@@ -1191,7 +1191,7 @@ dav_svn__build_lock_hash(apr_hash_t **lo
          definitely no lock-tokens to harvest.  This is likely a
          request from an old client. */
       *locks = hash;
-      return SVN_NO_ERROR;
+      return NULL;
     }
 
   if ((doc->root->ns == ns)
@@ -1217,7 +1217,7 @@ dav_svn__build_lock_hash(apr_hash_t **lo
   if (! child)
     {
       *locks = hash;
-      return SVN_NO_ERROR;
+      return NULL;
     }
 
   /* Then look for N different <lock> structures within. */
@@ -1262,7 +1262,7 @@ dav_svn__build_lock_hash(apr_hash_t **lo
     }
 
   *locks = hash;
-  return SVN_NO_ERROR;
+  return NULL;
 }
 
 

Modified: subversion/trunk/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/util.c?rev=1227870&r1=1227869&r2=1227870&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/util.c (original)
+++ subversion/trunk/subversion/svn/util.c Thu Jan  5 22:16:44 2012
@@ -947,7 +947,7 @@ svn_cl__try(svn_error_t *err,
       va_list ap;
 
       va_start(ap, quiet);
-      while ((apr_err = va_arg(ap, apr_status_t)) != SVN_NO_ERROR)
+      while ((apr_err = va_arg(ap, apr_status_t)) != APR_SUCCESS)
         {
           if (errors_seen)
             {

Modified: subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c?rev=1227870&r1=1227869&r2=1227870&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c Thu Jan  5 22:16:44
2012
@@ -125,7 +125,7 @@ try_split_url(const char *url, apr_pool_
   err = svn_ra_local__split_URL(&repos, &repos_path, &fs_path, url, pool);
 
   if (! err)
-    return SVN_NO_ERROR;
+    return APR_SUCCESS;
 
   apr_err = err->apr_err;
   svn_error_clear(err);



Mime
View raw message