svn commit: r983913 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Aug 10 10:16:39 2010
New Revision: 983913

URL: http://svn.apache.org/viewvc?rev=983913&view=rev
Log:
Add a couple of argument assertions.

* subversion/libsvn_wc/adm_ops.c
  (svn_wc__process_committed_internal, svn_wc_queue_committed3): Assert that
    neither checksum is given or both checksums are given.

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

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=983913&r1=983912&r2=983913&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Aug 10 10:16:39 2010
@@ -247,6 +247,11 @@ svn_wc__process_committed_internal(svn_w
 {
   svn_wc__db_kind_t kind;
 
+  SVN_ERR_ASSERT((md5_checksum == NULL && sha1_checksum == NULL)
+                 || (md5_checksum != NULL && sha1_checksum != NULL
+                     && md5_checksum->kind == svn_checksum_md5
+                     && sha1_checksum->kind == svn_checksum_sha1));
+
   SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, TRUE, scratch_pool));
 
   SVN_ERR(process_committed_leaf(db, local_abspath, !top_of_recurse,
@@ -411,6 +416,10 @@ svn_wc_queue_committed3(svn_wc_committed
   committed_queue_item_t *cqi;
 
   SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
+  SVN_ERR_ASSERT((md5_checksum == NULL && sha1_checksum == NULL)
+                 || (md5_checksum != NULL && sha1_checksum != NULL
+                     && md5_checksum->kind == svn_checksum_md5
+                     && sha1_checksum->kind == svn_checksum_sha1));
 
   queue->have_recursive |= recurse;