You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2008/02/02 06:24:19 UTC
svn commit: r617751 - in /webservices/axis2/trunk/c:
src/core/transport/http/sender/libcurl/axis2_libcurl.c
src/core/transport/http/util/http_transport_utils.c util/src/array_list.c
Author: dinesh
Date: Fri Feb 1 21:24:15 2008
New Revision: 617751
URL: http://svn.apache.org/viewvc?rev=617751&view=rev
Log:
fixed build breaks
Modified:
webservices/axis2/trunk/c/src/core/transport/http/sender/libcurl/axis2_libcurl.c
webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
webservices/axis2/trunk/c/util/src/array_list.c
Modified: webservices/axis2/trunk/c/src/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/sender/libcurl/axis2_libcurl.c?rev=617751&r1=617750&r2=617751&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/sender/libcurl/axis2_libcurl.c Fri Feb 1 21:24:15 2008
@@ -602,7 +602,7 @@
if a global initialize is created. Otherwise the client application should perform the
the curl_global_init itself in a thread-safe fashion.
*/
- if (code = curl_global_init(CURL_GLOBAL_ALL))
+ if ((code = curl_global_init(CURL_GLOBAL_ALL)))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "libCurl curl_global_init failed, error: %d", code);
return NULL;
@@ -623,7 +623,7 @@
curl->cookies = AXIS2_FALSE;
if ((!curl->alist) || (!curl->handler))
{
- axis2_libcurl_free(curl, env->allocator);
+ axis2_libcurl_free(curl, env);
curl = 0;
}
}
@@ -636,7 +636,10 @@
const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, curl, AXIS2_FAILURE);
+ if (!curl)
+ {
+ return;
+ }
if (curl->handler)
{
Modified: webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c?rev=617751&r1=617750&r2=617751&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c Fri Feb 1 21:24:15 2008
@@ -1567,7 +1567,8 @@
}
if (cb_ctx->chunked_stream)
{
- --size; // reserve space to insert trailing null
+ --size;
+ /* reserve space to insert trailing null */
len = axis2_http_chunked_stream_read(cb_ctx->chunked_stream, env,
buffer, size);
if (len >= 0)
@@ -1581,7 +1582,7 @@
axutil_stream_t *in_stream = NULL;
in_stream =
(axutil_stream_t *) ((axis2_callback_info_t *) ctx)->in_stream;
- --size; // reserve space to insert trailing null
+ --size; /* reserve space to insert trailing null */
len = axutil_stream_read(in_stream, env, buffer, size);
if (len >= 0)
{
Modified: webservices/axis2/trunk/c/util/src/array_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/array_list.c?rev=617751&r1=617750&r2=617751&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/array_list.c (original)
+++ webservices/axis2/trunk/c/util/src/array_list.c Fri Feb 1 21:24:15 2008
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org