You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@codematters.co.uk> on 2004/12/05 17:51:10 UTC
Re: svn commit: r12157 - trunk/subversion/libsvn_subr
jszakmeister@tigris.org writes:
> Author: jszakmeister
> Date: Sat Dec 4 20:32:42 2004
> New Revision: 12157
> +
> + utf8_error:
> + if (error_stream)
> + fprintf (error_stream, "Can't convert module path to UTF-8");
> + return EXIT_FAILURE;
> }
../svn/subversion/libsvn_subr/cmdline.c: In function `svn_cmdline_init':
../svn/subversion/libsvn_subr/cmdline.c:224: warning: label `utf8_error' defined but not used
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r12157 - trunk/subversion/libsvn_subr
Posted by John Szakmeister <jo...@szakmeister.net>.
Philip Martin wrote:
> jszakmeister@tigris.org writes:
>
>
>>Author: jszakmeister
>>Date: Sat Dec 4 20:32:42 2004
>>New Revision: 12157
>
>
>>+
>>+ utf8_error:
>>+ if (error_stream)
>>+ fprintf (error_stream, "Can't convert module path to UTF-8");
>>+ return EXIT_FAILURE;
>> }
>
>
> ../svn/subversion/libsvn_subr/cmdline.c: In function `svn_cmdline_init':
> ../svn/subversion/libsvn_subr/cmdline.c:224: warning: label `utf8_error' defined but not used
Would the attached patch be acceptable? I was trying to follow trends
that were elsewhere in the code... unfortunately, none of them had to
worry about the preprocessor conditionals. The only thing I don't like
about this is that the label is a little buried, so it may not be
immediately apparent where your jumping to. That's why I avoided it the
first time around.
-John
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r12157 - trunk/subversion/libsvn_subr
Posted by Philip Martin <ph...@codematters.co.uk>.
John Szakmeister <jo...@szakmeister.net> writes:
> --- subversion/libsvn_subr/cmdline.c (revision 12158)
> +++ subversion/libsvn_subr/cmdline.c (working copy)
> @@ -199,7 +199,12 @@
> if (!apr_err && (inwords > 0 || outbytes == 0))
> apr_err = APR_INCOMPLETE;
> if (apr_err)
> - goto utf8_error;
> + {
> + utf8_error:
> + if (error_stream)
> + fprintf (error_stream, "Can't convert module path to UTF-8");
> + return EXIT_FAILURE;
> + }
>
> utf8_path[outlength - outbytes] = '\0';
> internal_path = svn_path_internal_style (utf8_path, pool);
> @@ -220,11 +225,6 @@
> #endif
>
> return EXIT_SUCCESS;
> -
> - utf8_error:
> - if (error_stream)
> - fprintf (error_stream, "Can't convert module path to UTF-8");
> - return EXIT_FAILURE;
> }
>
>
Looks OK to me.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r12157 - trunk/subversion/libsvn_subr
Posted by John Szakmeister <jo...@szakmeister.net>.
Philip Martin wrote:
> jszakmeister@tigris.org writes:
>
>
>>Author: jszakmeister
>>Date: Sat Dec 4 20:32:42 2004
>>New Revision: 12157
>
>
>>+
>>+ utf8_error:
>>+ if (error_stream)
>>+ fprintf (error_stream, "Can't convert module path to UTF-8");
>>+ return EXIT_FAILURE;
>> }
>
>
> ../svn/subversion/libsvn_subr/cmdline.c: In function `svn_cmdline_init':
> ../svn/subversion/libsvn_subr/cmdline.c:224: warning: label `utf8_error' defined but not used
Let me try this again. :-/
-John