Author: stefan2
Date: Sun Dec  5 21:54:34 2010
New Revision: 1042460

URL: http://svn.apache.org/viewvc?rev=1042460&view=rev
Log:
Since svn_checksum_to_cstring() now accepts NULL for checksums,
callers no longer need to check for them.

* subversion/libsvn_client/info.c
  (build_info_for_entry): remove redundant check
* subversion/libsvn_wc/update_editor.c
  (apply_textdelta): dito

Modified:
    subversion/trunk/subversion/libsvn_client/info.c
    subversion/trunk/subversion/libsvn_wc/update_editor.c

Modified: subversion/trunk/subversion/libsvn_client/info.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/info.c?rev=1042460&r1=1042459&r2=1042460&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/info.c (original)
+++ subversion/trunk/subversion/libsvn_client/info.c Sun Dec  5 21:54:34 2010
@@ -156,8 +156,7 @@ build_info_for_entry(svn_info_t **info,
 
   SVN_ERR(svn_wc__node_get_base_checksum(&checksum, wc_ctx, local_abspath,
                                          pool, pool));
-  if (checksum)
-    tmpinfo->checksum = svn_checksum_to_cstring(checksum, pool);
+  tmpinfo->checksum = svn_checksum_to_cstring(checksum, pool);
 
   SVN_ERR(svn_wc__node_get_depth(&tmpinfo->depth, wc_ctx,
                                  local_abspath, pool));

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1042460&r1=1042459&r2=1042460&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sun Dec  5 21:54:34 
2010
@@ -3460,8 +3460,7 @@ apply_textdelta(void *file_baton,
                                                 fb->edit_baton->db,
                                                 fb->local_abspath,
                                                 pool, pool));
-    recorded_base_checksum
-      = checksum ? svn_checksum_to_cstring(checksum, pool) : NULL;
+    recorded_base_checksum = svn_checksum_to_cstring(checksum, pool);
     if (recorded_base_checksum && expected_base_checksum
         && strcmp(expected_base_checksum, recorded_base_checksum) != 0)
       return svn_error_createf(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,


Reply via email to