[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r33017 - trunk/subversion/libsvn_wc

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 10 Sep 2008 11:38:11 -0700

Why not switch to apr_pcalloc() ?

On Wed, Sep 10, 2008 at 10:48 AM, <steveking_at_tigris.org> wrote:
> Author: steveking
> Date: Wed Sep 10 10:48:19 2008
> New Revision: 33017
>
> Log:
> Initialize all struct members
> * subversion/libsvn_wc/util.c
> (svn_wc_conflict_description_create_text),
> (svn_wc_conflict_description_create_prop): initialize all members
>
> Modified:
> trunk/subversion/libsvn_wc/util.c
>
> Modified: trunk/subversion/libsvn_wc/util.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/util.c?pathrev=33017&r1=33016&r2=33017
> ==============================================================================
> --- trunk/subversion/libsvn_wc/util.c Wed Sep 10 10:47:35 2008 (r33016)
> +++ trunk/subversion/libsvn_wc/util.c Wed Sep 10 10:48:19 2008 (r33017)
> @@ -306,6 +306,13 @@ svn_wc_conflict_description_create_text(
> conflict->access = adm_access;
> conflict->action = svn_wc_conflict_action_edit;
> conflict->reason = svn_wc_conflict_reason_edited;
> +
> + conflict->base_file = NULL;
> + conflict->merged_file = NULL;
> + conflict->my_file = NULL;
> + conflict->their_file = NULL;
> + conflict->property_name = NULL;
> + conflict->mime_type = NULL;
> return conflict;
> }
>
> @@ -324,5 +331,14 @@ svn_wc_conflict_description_create_prop(
> conflict->kind = svn_wc_conflict_kind_property;
> conflict->access = adm_access;
> conflict->property_name = property_name;
> +
> + conflict->action = svn_wc_conflict_action_edit;
> + conflict->reason = svn_wc_conflict_reason_edited;
> + conflict->base_file = NULL;
> + conflict->merged_file = NULL;
> + conflict->my_file = NULL;
> + conflict->their_file = NULL;
> + conflict->property_name = NULL;
> + conflict->mime_type = NULL;
> return conflict;
> }
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-10 20:38:33 CEST

This is an archived mail posted to the Subversion Dev mailing list.