svn commit: r1848996 - /subversion/trunk/subversion/libsvn_subr/dirent_uri.c

[brane]

Author: brane
Date: Sat Dec 15 14:05:04 2018
New Revision: 1848996

URL: http://svn.apache.org/viewvc?rev=1848996&view=rev
Log:
Make some "mandatory" assertions more useful for debugging.

* subversion/libsvn_subr/dirent_uri.c
  (svn_uri_canonicalize,
   svn_relpath_canonicalize,
   svn_dirent_canonicalize): Make the assertion messages more descriptive.

Modified:
    subversion/trunk/subversion/libsvn_subr/dirent_uri.c

Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=1848996&r1=1848995&r2=1848996&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Sat Dec 15 14:05:04 
2018
@@ -1659,8 +1659,11 @@ svn_uri_canonicalize(const char *uri, ap
 {
   const char *result;
   svn_error_t *const err = canonicalize(&result, type_uri, uri, pool);
-  svn_error_clear(err);
-  SVN_ERR_ASSERT_NO_RETURN(!err);
+  if (err)
+    {
+      svn_error_clear(err);
+      SVN_ERR_ASSERT_NO_RETURN(!"URI canonicalization failed");
+    }
   return result;
 }
 
@@ -1693,8 +1696,11 @@ svn_relpath_canonicalize(const char *rel
 {
   const char *result;
   svn_error_t *const err = canonicalize(&result, type_relpath, relpath, pool);
-  svn_error_clear(err);
-  SVN_ERR_ASSERT_NO_RETURN(!err);
+  if (err)
+    {
+      svn_error_clear(err);
+      SVN_ERR_ASSERT_NO_RETURN(!"relpath canonicalization failed");
+    }
   return result;
 }
 
@@ -1758,8 +1764,11 @@ svn_dirent_canonicalize(const char *dire
 {
   const char *result;
   svn_error_t *const err = canonicalize_dirent(&result, dirent, pool);
-  svn_error_clear(err);
-  SVN_ERR_ASSERT_NO_RETURN(!err);
+  if (err)
+    {
+      svn_error_clear(err);
+      SVN_ERR_ASSERT_NO_RETURN(!"dirent canonicalization failed");
+    }
   return result;
 }