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

Re: svn commit: r35484 - in branches/http-protocol-v2: . subversion/libsvn_ra_serf

From: Greg Stein <gstein_at_gmail.com>
Date: Tue, 27 Jan 2009 12:04:48 +0100

On Mon, Jan 26, 2009 at 23:11, C. Michael Pilato <cmpilato_at_collab.net> wrote:
>...
> +++ branches/http-protocol-v2/subversion/libsvn_ra_serf/options.c Mon Jan 26 14:11:48 2009 (r35484)
> @@ -463,14 +463,22 @@ svn_ra_serf__exchange_capabilities(svn_r
> apr_pool_t *pool)
> {
> svn_ra_serf__options_context_t *opt_ctx;
> + svn_error_t *err;
>
> /* This routine automatically fills in serf_sess->capabilities */
> svn_ra_serf__create_options_req(&opt_ctx, serf_sess, serf_sess->conns[0],
> serf_sess->repos_url_str, pool);
>
> - return svn_ra_serf__context_run_wait(
> - svn_ra_serf__get_options_done_ptr(opt_ctx),
> - serf_sess, pool);
> + err = svn_ra_serf__context_run_wait
> + (svn_ra_serf__get_options_done_ptr(opt_ctx), serf_sess, pool);

Remove whitespace before the open-paren.

> + if (svn_ra_serf__get_options_error(opt_ctx) ||
> + svn_ra_serf__get_options_parser_error(opt_ctx))
> + {
> + svn_error_clear(err);
> + SVN_ERR(svn_ra_serf__get_options_error(opt_ctx));
> + SVN_ERR(svn_ra_serf__get_options_parser_error(opt_ctx));

Is it possible to have both an options_error and an options_parser_error?

You could do something like this:

err = svn_ra_serf__context_run_wait(...);
err = svn_err_compose_create(err, svn_ra_serf__get_options_error(...));
return svn_err_compose_create(err, svn_ra_serf__get_options_parser_error(...));

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1058503
Received on 2009-01-27 12:05:06 CET

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