RE: svn commit: r1559035 - /subversion/trunk/subversion/svn/log-cmd.c

[Bert Huijben <be...@qqmail.nl>]

> -----Original Message-----
> From: breser@apache.org [mailto:breser@apache.org]
> Sent: vrijdag 17 januari 2014 08:24
> To: commits@subversion.apache.org
> Subject: svn commit: r1559035 - /subversion/trunk/subversion/svn/log-
> cmd.c
> 
> Author: breser
> Date: Fri Jan 17 07:23:31 2014
> New Revision: 1559035
> 
> URL: http://svn.apache.org/r1559035
> Log:
> Followup to r1559032: fix a style nit.  No functional change.
> 
> * subversion/svn/log-cmd.c
>   (svn_cl__log_entry_receiver_xml): Use indented brackets per our style
> 
> Modified:
>     subversion/trunk/subversion/svn/log-cmd.c
> 
> Modified: subversion/trunk/subversion/svn/log-cmd.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-
> cmd.c?rev=1559035&r1=1559034&r2=1559035&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/svn/log-cmd.c (original)
> +++ subversion/trunk/subversion/svn/log-cmd.c Fri Jan 17 07:23:31 2014
> @@ -548,16 +548,17 @@ svn_cl__log_entry_receiver_xml(void *bat
> 
>    revstr = apr_psprintf(pool, "%ld", log_entry->revision);
>    /* <logentry revision="xxx"> */
> -  if (lb->merge_stack && lb->merge_stack->nelts > 0) {
> +  if (lb->merge_stack && lb->merge_stack->nelts > 0)
> +    {
>        svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "logentry",
>                              "revision", revstr, "reverse-merge",
>                              log_entry->subtractive_merge ? "true" : "false",
>                              SVN_VA_NULL);
> 
> -  } else {
> -      svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "logentry",
> -                            "revision", revstr, SVN_VA_NULL);
> -  }
> +    } else {
> +        svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "logentry",
> +                              "revision", revstr, SVN_VA_NULL);
> +    }

Not necessary for this patch, but svn_xml_make_open_tag() allows adding xml arguments optionally. When the value is passed as NULL (or probably SVN_VA_NULL... I see a TODO in ra_serf), the argument will be skipped, but the processing will continue on the next argument.

	Bert
> 
>    /* <author>xxx</author> */
>    svn_cl__xml_tagged_cdata(&sb, pool, "author", author);
>