svn commit: r1536358 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[ph...@apache.org]

Author: philip
Date: Mon Oct 28 14:12:46 2013
New Revision: 1536358

URL: http://svn.apache.org/r1536358
Log:
* subversion/libsvn_wc/wc_db.c
  (insert_base_node, insert_working_node, svn_wc__db_base_get_info_internal,
   svn_wc__db_depth_get_info, delete_update_movedto,
   svn_wc__db_read_pristine_info): Avoid aborting by using SVN_ERR_ASSERT
  rather than assert.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1536358&r1=1536357&r2=1536358&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Oct 28 14:12:46 2013
@@ -23,7 +23,6 @@
 
 #define SVN_WC__I_AM_WC_DB
 
-#include <assert.h>
 #include <apr_pools.h>
 #include <apr_hash.h>
 
@@ -730,9 +729,9 @@ insert_base_node(const insert_base_baton
     }
 
   /* Set properties.  Must be null if presence not normal or incomplete. */
-  assert(pibb->status == svn_wc__db_status_normal
-         || pibb->status == svn_wc__db_status_incomplete
-         || pibb->props == NULL);
+  SVN_ERR_ASSERT(pibb->status == svn_wc__db_status_normal
+                 || pibb->status == svn_wc__db_status_incomplete
+                 || pibb->props == NULL);
   SVN_ERR(svn_sqlite__bind_properties(stmt, 15, pibb->props,
                                       scratch_pool));
 
@@ -998,9 +997,9 @@ insert_working_node(const insert_working
     }
 
   /* Set properties.  Must be null if presence not normal or incomplete. */
-  assert(piwb->presence == svn_wc__db_status_normal
-         || piwb->presence == svn_wc__db_status_incomplete
-         || piwb->props == NULL);
+  SVN_ERR_ASSERT(piwb->presence == svn_wc__db_status_normal
+                 || piwb->presence == svn_wc__db_status_incomplete
+                 || piwb->props == NULL);
   SVN_ERR(svn_sqlite__bind_properties(stmt, 15, piwb->props, scratch_pool));
 
   SVN_ERR(svn_sqlite__insert(NULL, stmt));
@@ -2498,7 +2497,7 @@ svn_wc__db_base_get_info_internal(svn_wc
             }
           else
             {
-              assert(svn_sqlite__column_is_null(stmt, 13));
+              SVN_ERR_ASSERT(svn_sqlite__column_is_null(stmt, 13));
               *props = NULL;
             }
         }
@@ -2879,7 +2878,7 @@ svn_wc__db_depth_get_info(svn_wc__db_sta
             }
           else
             {
-              assert(svn_sqlite__column_is_null(stmt, 13));
+              SVN_ERR_ASSERT(svn_sqlite__column_is_null(stmt, 13));
               *props = NULL;
             }
         }
@@ -7417,7 +7416,7 @@ delete_update_movedto(svn_wc__db_wcroot_
                             op_depth,
                             new_moved_to_relpath));
   SVN_ERR(svn_sqlite__update(&affected, stmt));
-  assert(affected == 1);
+  SVN_ERR_ASSERT(affected == 1);
 
   return SVN_NO_ERROR;
 }
@@ -8926,7 +8925,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
         }
       else
         {
-          assert(svn_sqlite__column_is_null(stmt, 14));
+          SVN_ERR_ASSERT(svn_sqlite__column_is_null(stmt, 14));
           *props = NULL;
         }
     }