On Wed, 1 Jun 2005 kfogel@tigris.org wrote:
> Modified: trunk/subversion/clients/cmdline/cl.h
> Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/clients/cmdline/cl.h?rev=14918&p1=trunk/subversion/clients/cmdline/cl.h&p2=trunk/subversion/clients/cmdline/cl.h&r1=14917&r2=14918
> ==============================================================================
> --- trunk/subversion/clients/cmdline/cl.h (original)
> +++ trunk/subversion/clients/cmdline/cl.h Wed Jun 1 14:34:11 2005
> @@ -192,42 +192,25 @@
> extern const apr_getopt_option_t svn_cl__options[];
>
>
> -/* Evaluate EXPR, and:
> +/* A helper for the many subcommands that wish to merely warn when
> + * invoked on an unversioned, nonexistent, or otherwise innocuously
> + * errorful resource. Meant to be wrapped with SVN_ERR().
> + *
> + * If ERR is null, set *SUCCESS to TRUE and return SVN_NO_ERROR.
> *
> - * - If it returns no error, set SUCCESS to TRUE and continue.
> + * Else if ERR->apr_err is one of the error codes supplied in varargs
> + * (typically, error codes like SVN_ERR_UNVERSIONED_RESOURCE,
> + * SVN_ERR_ENTRY_NOT_FOUND, etc, are supplied), then handle ERR as a
> + * warning (unless QUIET is true), clear ERR, set *SUCCESS to FALSE,
> + * and return SVN_NO_ERROR.
> *
> - * - If it returns an SVN_ERR_UNVERSIONED_RESOURCE or
> - * SVN_ERR_ENTRY_NOT_FOUND error, handle the error as a warning
> - * (unless QUIET is true), clear the error, and set SUCCESS to
> - * FALSE.
> - *
> - * - If it returns any other error, don't touch SUCCESS, just
> - * return that error from the current function.
> - *
> - * This macro is a helper for the many subcommands that merely warn
> - * when invoked on an unversioned or nonexistent resource. It is
> - * modeled on the SVN_ERR() macro, see there for details.
> + * Else set SUCCESS to FALSE and return ERR.
> */
Maybe say that the errors must be 0-terminated, even if it is quite
obvious.
> +++ trunk/subversion/clients/cmdline/propdel-cmd.c Wed Jun 1 14:34:11 2005
> @@ -117,10 +117,13 @@
>
> /* Pass FALSE for 'skip_checks' because it doesn't matter here,
> and opt_state->force doesn't apply to this command anyway. */
> - SVN_CL__TRY (svn_client_propset2 (pname_utf8, NULL, target,
> - opt_state->recursive,
> - FALSE, ctx, subpool),
> - success, opt_state->quiet);
> + SVN_ERR (svn_cl__try (svn_client_propset2 (pname_utf8, NULL, target,
> + opt_state->recursive,
> + FALSE, ctx, subpool),
> + &success, opt_state->quiet,
> + SVN_ERR_UNVERSIONED_RESOURCE,
> + SVN_ERR_ENTRY_NOT_FOUND,
> + NULL));
>
NULL? This is not a pointer, so I'd rather use 0 instead. Same in all
places.
Thanks,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 1 22:20:16 2005