You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/08/06 16:09:03 UTC
svn commit: r982973 - in /subversion/trunk/subversion/libsvn_ra_neon:
commit.c fetch.c lock.c options.c ra_neon.h util.c
Author: rhuijben
Date: Fri Aug 6 14:09:02 2010
New Revision: 982973
URL: http://svn.apache.org/viewvc?rev=982973&view=rev
Log:
Following up on r982952, fix compilation of ra_neon. This patch makes
svn_ra_neon__request_create() return svn_error_t * and adds a missing
return statement.
* subversion/libsvn_ra_neon/commit.c
(do_checkout,
commit_delete_entry,
commit_close_file): Update callers.
* subversion/libsvn_ra_neon/fetch.c
(custom_get_request): Update caller.
(reporter_finish_report): Add missing return statement.
* subversion/libsvn_ra_neon/lock.c
(do_lock,
svn_ra_neon__get_lock_internal): Update callers.
* subversion/libsvn_ra_neon/options.c
(svn_ra_neon__exchange_capabilities): Update caller.
* subversion/libsvn_ra_neon/ra_neon.h
(svn_ra_neon__request_create): Update prototype.
* subversion/libsvn_ra_neon/util.c
(svn_ra_neon__request_create): Update return type. Reorder some
allocations for C89 compatibility.
Modified:
subversion/trunk/subversion/libsvn_ra_neon/commit.c
subversion/trunk/subversion/libsvn_ra_neon/fetch.c
subversion/trunk/subversion/libsvn_ra_neon/lock.c
subversion/trunk/subversion/libsvn_ra_neon/options.c
subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h
subversion/trunk/subversion/libsvn_ra_neon/util.c
Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=982973&r1=982972&r2=982973&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Fri Aug 6 14:09:02 2010
@@ -416,8 +416,8 @@ static svn_error_t * do_checkout(commit_
### place result into res->wr_url and return it */
/* create/prep the request */
- request =
- svn_ra_neon__request_create(cc->ras, "CHECKOUT", vsn_url, pool);
+ SVN_ERR(svn_ra_neon__request_create(&request, cc->ras, "CHECKOUT", vsn_url,
+ pool));
/* ### store this into cc to avoid pool growth */
body = apr_psprintf(request->pool,
@@ -807,9 +807,8 @@ static svn_error_t * commit_delete_entry
APR_HASH_KEY_STRING)))
apr_hash_set(child_tokens, path, APR_HASH_KEY_STRING, token);
-
- request =
- svn_ra_neon__request_create(parent->cc->ras, "DELETE", child, pool);
+ SVN_ERR(svn_ra_neon__request_create(&request, parent->cc->ras, "DELETE",
+ child, pool));
err = svn_ra_neon__assemble_locktoken_body(&locks_list,
child_tokens, request->pool);
@@ -1274,7 +1273,8 @@ static svn_error_t * commit_close_file(v
svn_error_t *err = SVN_NO_ERROR;
/* create/prep the request */
- request = svn_ra_neon__request_create(cc->ras, "PUT", url, pool);
+ SVN_ERR(svn_ra_neon__request_create(&request, cc->ras, "PUT", url,
+ pool));
extra_headers = apr_hash_make(request->pool);
Modified: subversion/trunk/subversion/libsvn_ra_neon/fetch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/fetch.c?rev=982973&r1=982972&r2=982973&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/fetch.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/fetch.c Fri Aug 6 14:09:02 2010
@@ -394,7 +394,7 @@ static svn_error_t *custom_get_request(s
delta_base = NULL;
}
- request = svn_ra_neon__request_create(ras, "GET", url, pool);
+ SVN_ERR(svn_ra_neon__request_create(&request, ras, "GET", url, pool));
if (delta_base)
{
@@ -2439,6 +2439,8 @@ static svn_error_t * reporter_finish_rep
(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
_("REPORT response handling failed to complete the editor drive"));
}
+
+ return SVN_NO_ERROR;
}
static const svn_ra_reporter3_t ra_neon_reporter = {
Modified: subversion/trunk/subversion/libsvn_ra_neon/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/lock.c?rev=982973&r1=982972&r2=982973&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/lock.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/lock.c Fri Aug 6 14:09:02 2010
@@ -259,7 +259,7 @@ do_lock(svn_lock_t **lock,
_("Failed to parse URI '%s'"), url);
}
- req = svn_ra_neon__request_create(ras, "LOCK", uri.path, pool);
+ SVN_ERR(svn_ra_neon__request_create(&req, ras, "LOCK", uri.path, pool));
ne_uri_free(&uri);
lrb->pool = pool;
@@ -532,7 +532,7 @@ svn_ra_neon__get_lock_internal(svn_ra_ne
url = apr_pstrdup(pool, uri.path);
ne_uri_free(&uri);
- req = svn_ra_neon__request_create(ras, "PROPFIND", url, pool);
+ SVN_ERR(svn_ra_neon__request_create(&req, ras, "PROPFIND", url, pool));
lrb->pool = pool;
lrb->xml_table = lock_elements;
Modified: subversion/trunk/subversion/libsvn_ra_neon/options.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/options.c?rev=982973&r1=982972&r2=982973&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/options.c Fri Aug 6 14:09:02 2010
@@ -263,7 +263,8 @@ svn_ra_neon__exchange_capabilities(svn_r
*youngest_rev = SVN_INVALID_REVNUM;
- req = svn_ra_neon__request_create(ras, "OPTIONS", ras->url->data, pool);
+ SVN_ERR(svn_ra_neon__request_create(&req, ras, "OPTIONS", ras->url->data,
+ pool));
/* ### Use a symbolic name somewhere for this MIME type? */
ne_add_request_header(req->ne_req, "Content-Type", "text/xml");
Modified: subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h?rev=982973&r1=982972&r2=982973&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h Fri Aug 6 14:09:02 2010
@@ -200,8 +200,9 @@ typedef struct {
*
* Register a pool cleanup for any allocated Neon resources.
*/
-svn_ra_neon__request_t *
-svn_ra_neon__request_create(svn_ra_neon__session_t *sess,
+svn_error_t *
+svn_ra_neon__request_create(svn_ra_neon__request_t **request,
+ svn_ra_neon__session_t *sess,
const char *method, const char *url,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_ra_neon/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/util.c?rev=982973&r1=982972&r2=982973&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/util.c Fri Aug 6 14:09:02 2010
@@ -354,15 +354,17 @@ path_from_url(const char *url)
return *p == '\0' ? "/" : p;
}
-svn_ra_neon__request_t *
-svn_ra_neon__request_create(svn_ra_neon__session_t *sess,
+svn_error_t *
+svn_ra_neon__request_create(svn_ra_neon__request_t **request,
+ svn_ra_neon__session_t *sess,
const char *method, const char *url,
apr_pool_t *pool)
{
apr_pool_t *reqpool = svn_pool_create(pool);
- svn_ra_neon__request_t *req = apr_pcalloc(reqpool, sizeof(*req));
+ svn_ra_neon__request_t *req;
+ const char *path;
- /* If there is auth credentials in this session, store it if we can. */
+ /* If there is auth credentials in this session, store it if we can. */
SVN_ERR(svn_ra_neon__maybe_store_auth_info(sess, pool));
/* We never want to send Neon an absolute URL, since that can cause
@@ -370,8 +372,9 @@ svn_ra_neon__request_create(svn_ra_neon_
using different server names from different locations, or those that
want to rewrite the incoming URL). If the URL passed in is absolute,
convert it to a path-absolute relative URL. */
- const char *path = path_from_url(url);
+ path = path_from_url(url);
+ req = apr_pcalloc(reqpool, sizeof(*req));
req->ne_sess = sess->main_session_busy ? sess->ne_sess2 : sess->ne_sess;
req->ne_req = ne_request_create(req->ne_sess, method, path);
req->sess = sess;
@@ -390,7 +393,8 @@ svn_ra_neon__request_create(svn_ra_neon_
dav_request_cleanup,
apr_pool_cleanup_null);
- return req;
+ *request = req;
+ return SVN_NO_ERROR;
}
static apr_status_t
@@ -1312,14 +1316,16 @@ svn_ra_neon__parsed_request(svn_ra_neon_
apr_pool_t *pool)
{
/* create/prep the request */
- svn_ra_neon__request_t* req = svn_ra_neon__request_create(sess, method, url,
- pool);
- svn_error_t *err = parsed_request(req,
- sess, method, url, body, body_file,
- set_parser,
- startelm_cb, cdata_cb, endelm_cb,
- baton, extra_headers, status_code,
- spool_response, pool);
+ svn_ra_neon__request_t* req;
+ svn_error_t *err;
+
+ SVN_ERR(svn_ra_neon__request_create(&req, sess, method, url, pool));
+
+ err = parsed_request(req, sess, method, url, body, body_file,
+ set_parser, startelm_cb, cdata_cb, endelm_cb,
+ baton, extra_headers, status_code, spool_response,
+ pool);
+
svn_ra_neon__request_destroy(req);
return err;
}
@@ -1334,10 +1340,11 @@ svn_ra_neon__simple_request(int *code,
const char *body,
int okay_1, int okay_2, apr_pool_t *pool)
{
- svn_ra_neon__request_t *req =
- svn_ra_neon__request_create(ras, method, url, pool);
+ svn_ra_neon__request_t *req;
svn_error_t *err;
+ SVN_ERR(svn_ra_neon__request_create(&req, ras, method, url, pool));
+
/* we don't need the status parser: it's attached to the request
and detected errors will be returned there... */
(void) multistatus_parser_create(req);
Re: svn commit: r982973 - in /subversion/trunk/subversion/libsvn_ra_neon:
commit.c fetch.c lock.c options.c ra_neon.h util.c
Posted by Senthil Kumaran S <se...@collab.net>.
rhuijben@apache.org wrote:
> Author: rhuijben
> Date: Fri Aug 6 14:09:02 2010
> New Revision: 982973
>
> URL: http://svn.apache.org/viewvc?rev=982973&view=rev
> Log:
> Following up on r982952, fix compilation of ra_neon. This patch makes
> svn_ra_neon__request_create() return svn_error_t * and adds a missing
> return statement.
Thanks for fixing it Bert, I was about to look into it now. I ll be more
careful to avoid such things in future.
--
Senthil Kumaran S
http://www.stylesen.org/