subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1358114 - /subversion/trunk/subversion/svn/file-merge.c
Date Fri, 06 Jul 2012 10:59:07 GMT
Author: stsp
Date: Fri Jul  6 10:59:07 2012
New Revision: 1358114

URL: http://svn.apache.org/viewvc?rev=1358114&view=rev
Log:
* subversion/svn/file-merge.c
  (merge_chunks): Use fewer lines of code to do the same thing.
   No functional change.

Modified:
    subversion/trunk/subversion/svn/file-merge.c

Modified: subversion/trunk/subversion/svn/file-merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1358114&r1=1358113&r2=1358114&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Fri Jul  6 10:59:07 2012
@@ -578,17 +578,15 @@ merge_chunks(apr_array_header_t **merged
         {
           SVN_ERR(edit_chunk(merged_chunk, chunk1, editor_cmd, config,
                              result_pool, iterpool));
-          if (*merged_chunk == NULL)
-            continue;
-          break;
+          if (*merged_chunk)
+            break;
         }
       else if (strcmp(answer, "e2") == 0)
         {
           SVN_ERR(edit_chunk(merged_chunk, chunk2, editor_cmd, config,
                              result_pool, iterpool));
-          if (*merged_chunk == NULL)
-            continue;
-          break;
+          if (*merged_chunk)
+            break;
         }
       else if (strcmp(answer, "eb") == 0)
         {
@@ -598,9 +596,8 @@ merge_chunks(apr_array_header_t **merged
                                                               scratch_pool);
           SVN_ERR(edit_chunk(merged_chunk, conflict_chunk, editor_cmd, config,
                              result_pool, iterpool));
-          if (*merged_chunk == NULL)
-            continue;
-          break;
+          if (*merged_chunk)
+            break;
         }
     }
   svn_pool_destroy(iterpool);



Mime
View raw message