subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1441119 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 31 Jan 2013 18:55:27 GMT
Author: rhuijben
Date: Thu Jan 31 18:55:27 2013
New Revision: 1441119

URL: http://svn.apache.org/viewvc?rev=1441119&view=rev
Log:
* subversion/libsvn_client/merge.c
  (merge_dir_opened,
   merge_file_opened): Make gcc feel more secure about the expression.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1441119&r1=1441118&r2=1441119&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jan 31 18:55:27 2013
@@ -2071,7 +2071,7 @@ merge_file_opened(void **new_file_baton,
                        APR_HASH_KEY_STRING, NULL);
         }
 
-      if (! (merge_b->dry_run && (pdb && pdb->added || fb->add_is_replace)))
+      if (! (merge_b->dry_run && ((pdb && pdb->added) || fb->add_is_replace)))
         {
           svn_wc_notify_state_t obstr_state;
           svn_node_kind_t kind;
@@ -2790,7 +2790,7 @@ merge_dir_opened(void **new_dir_baton,
                        APR_HASH_KEY_STRING, NULL);
         }
 
-      if (! (merge_b->dry_run && (pdb && pdb->added || db->add_is_replace)))
+      if (! (merge_b->dry_run && ((pdb && pdb->added) || db->add_is_replace)))
         {
           svn_wc_notify_state_t obstr_state;
           svn_node_kind_t kind;



Mime
View raw message