Re: svn commit: r27529 - trunk/subversion/libsvn_client

Paul, how about using apr_pcalloc() when creating these little
buggers, instead of dealing with NULL'ing out unused fields later on?

On Wed, 31 Oct 2007, pburba@tigris.org wrote:

> Author: pburba
> Date: Wed Oct 31 13:19:27 2007
> New Revision: 27529
>
> Log:
> Follow-up to r26803, initialize new members of svn_client__merge_path_t.
>
> * subversion/libsvn_client/merge.c
> (get_mergeinfo_walk_cb, insert_parent_and_sibs_of_sw_absent_del_entry,
> get_mergeinfo_paths): Initialize *all* members of any
> svn_client__merge_path_t * we create.
>
>
> Modified:
> trunk/subversion/libsvn_client/merge.c
>
> Modified: trunk/subversion/libsvn_client/merge.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/merge.c?pathrev=27529&r1=27528&r2=27529
> ==============================================================================
> --- trunk/subversion/libsvn_client/merge.c (original)
> +++ trunk/subversion/libsvn_client/merge.c Wed Oct 31 13:19:27 2007
> @@ -2938,6 +2938,9 @@
> && (entry->depth == svn_depth_empty
> || entry->depth == svn_depth_files))
> child->has_noninheritable = TRUE;
> + child->remaining_ranges = NULL;
> + child->pre_merge_mergeinfo = NULL;
> + child->indirect_mergeinfo = FALSE;
>
> APR_ARRAY_PUSH(wb->children_with_mergeinfo,
> svn_client__merge_path_t *) = child;
> @@ -3147,6 +3150,9 @@
> parent->absent = FALSE;
> parent->propval = NULL;
> parent->scheduled_for_deletion = FALSE;
> + parent->remaining_ranges = NULL;
> + parent->pre_merge_mergeinfo = NULL;
> + parent->indirect_mergeinfo = FALSE;
> /* Insert PARENT into CHILDREN_WITH_MERGEINFO. */
> insert_child_to_merge(children_with_mergeinfo, parent, parent_index);
> /* Increment for loop index so we don't process the inserted element. */
> @@ -3187,6 +3193,9 @@
> sibling_of_missing->absent = FALSE;
> sibling_of_missing->propval = NULL;
> sibling_of_missing->scheduled_for_deletion = FALSE;
> + sibling_of_missing->remaining_ranges = NULL;
> + sibling_of_missing->pre_merge_mergeinfo = NULL;
> + sibling_of_missing->indirect_mergeinfo = FALSE;
> insert_child_to_merge(children_with_mergeinfo, sibling_of_missing,
> insert_index);
> }
> @@ -3350,6 +3359,9 @@
> child_of_noninheritable->absent = FALSE;
> child_of_noninheritable->propval = NULL;
> child_of_noninheritable->scheduled_for_deletion = FALSE;
> + child_of_noninheritable->remaining_ranges = NULL;
> + child_of_noninheritable->pre_merge_mergeinfo = NULL;
> + child_of_noninheritable->indirect_mergeinfo = FALSE;
> insert_child_to_merge(children_with_mergeinfo,
> child_of_noninheritable,
> insert_index);
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org