On Fri, Nov 21, 2008 at 09:49:41AM -0800, julianfoad_at_tigris.org wrote:
> Author: julianfoad
> Date: Fri Nov 21 09:49:41 2008
> New Revision: 34315
>
> Log:
> * subversion/svn/cl.h,
> subversion/svn/util.c
> (svn_cl__node_kind_str): For the node kind "none", return "none" instead
> of the empty string. Existing callers should not enounter this case,
> only the new tree-conflict printing.
>
> Modified:
> branches/tc_url_rev/subversion/svn/cl.h
> branches/tc_url_rev/subversion/svn/util.c
>
> Modified: branches/tc_url_rev/subversion/svn/cl.h
> URL: http://svn.collab.net/viewvc/svn/branches/tc_url_rev/subversion/svn/cl.h?pathrev=34315&r1=34314&r2=34315
> ==============================================================================
> --- branches/tc_url_rev/subversion/svn/cl.h Fri Nov 21 09:27:40 2008 (r34314)
> +++ branches/tc_url_rev/subversion/svn/cl.h Fri Nov 21 09:49:41 2008 (r34315)
> @@ -595,8 +595,8 @@ svn_cl__xml_print_header(const char *tag
> svn_error_t *
> svn_cl__xml_print_footer(const char *tagname, apr_pool_t *pool);
>
> -/* Return a (non-localised) string representation of KIND, being "dir" or
> - "file" or, in any other case, the empty string. */
> +/* Return a (non-localised) string representation of KIND, being "none" or
> + "dir" or "file" or, in any other case, the empty string. */
> const char *
> svn_cl__node_kind_str(svn_node_kind_t kind);
>
>
> Modified: branches/tc_url_rev/subversion/svn/util.c
> URL: http://svn.collab.net/viewvc/svn/branches/tc_url_rev/subversion/svn/util.c?pathrev=34315&r1=34314&r2=34315
> ==============================================================================
> --- branches/tc_url_rev/subversion/svn/util.c Fri Nov 21 09:27:40 2008 (r34314)
> +++ branches/tc_url_rev/subversion/svn/util.c Fri Nov 21 09:49:41 2008 (r34315)
> @@ -1003,6 +1003,8 @@ svn_cl__node_kind_str(svn_node_kind_t ki
> {
> switch (kind)
> {
> + case svn_node_file:
> + return "file";
> case svn_node_dir:
> return "dir";
> case svn_node_file:
Shouldn't this have been:
switch (kind)
{
+ case svn_node_none:
+ return "none";
case svn_node_dir:
return "dir";
case svn_node_file:
?
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-21 20:14:58 CET