svn commit: r1098206 - /subversion/trunk/subversion/libsvn_client/merge.c

[hwright]

Author: hwright
Date: Sun May  1 01:30:09 2011
New Revision: 1098206

URL: http://svn.apache.org/viewvc?rev=1098206&view=rev
Log:
* subversion/libsvn_client/merge.c
  (remove_noop_subtree_ranges): Don't initialize some local variables.  We
    already assign them values after the early exit, so this is just wasted
    work.

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=1098206&r1=1098205&r2=1098206&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Sun May  1 01:30:09 2011
@@ -7849,14 +7849,10 @@ remove_noop_subtree_ranges(const char *u
                   svn_client__merge_path_t *);
   apr_array_header_t *requested_ranges;
   apr_array_header_t *subtree_gap_ranges;
-  apr_array_header_t *subtree_remaining_ranges =
-    apr_array_make(scratch_pool, 1, sizeof(svn_merge_range_t *));
-  apr_array_header_t *log_targets =
-    apr_array_make(scratch_pool, 1, sizeof(const char *));
-  apr_array_header_t *merged_ranges =
-    apr_array_make(scratch_pool, 0, sizeof(svn_revnum_t *));
-  apr_array_header_t *operative_ranges =
-    apr_array_make(scratch_pool, 0, sizeof(svn_revnum_t *));
+  apr_array_header_t *subtree_remaining_ranges;
+  apr_array_header_t *log_targets;
+  apr_array_header_t *merged_ranges;
+  apr_array_header_t *operative_ranges;
   log_noop_baton_t log_gap_baton;
   svn_merge_range_t *oldest_gap_rev;
   svn_merge_range_t *youngest_gap_rev;