You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/05/31 17:54:39 UTC
svn commit: r410566 [26/49] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
axiom/test/unit/om/ include/ modules/...
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c Wed May 31 08:54:07 2006
@@ -46,97 +46,97 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_status_line
(struct axis2_http_simple_response *simple_response,
- axis2_env_t **env, const axis2_char_t *http_ver,
+ const axis2_env_t *env, const axis2_char_t *http_ver,
const int status_code, const axis2_char_t *phrase);
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_phrase
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
int AXIS2_CALL
axis2_http_simple_response_get_status_code
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_http_version
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_status_line
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_http_simple_response_contains_header
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_char_t *name);
+ const axis2_env_t *env, axis2_char_t *name);
axis2_array_list_t* AXIS2_CALL
axis2_http_simple_response_get_headers
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_http_header_t* AXIS2_CALL
axis2_http_simple_response_get_first_header
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_char_t *str);
+ const axis2_env_t *env, axis2_char_t *str);
axis2_status_t AXIS2_CALL
axis2_http_simple_response_remove_headers
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, const axis2_char_t *str);
+ const axis2_env_t *env, const axis2_char_t *str);
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_header
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_http_header_t* header);
+ const axis2_env_t *env, axis2_http_header_t* header);
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_charset
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_ssize_t AXIS2_CALL
axis2_http_simple_response_get_content_length
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_content_type
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_body_string
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_char_t *str);
+ const axis2_env_t *env, axis2_char_t *str);
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_body_stream
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_stream_t *stream);
+ const axis2_env_t *env, axis2_stream_t *stream);
axis2_stream_t* AXIS2_CALL
axis2_http_simple_response_get_body
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_ssize_t AXIS2_CALL
axis2_http_simple_response_get_body_bytes
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_char_t **buf);
+ const axis2_env_t *env, axis2_char_t **buf);
axis2_status_t AXIS2_CALL
axis2_http_simple_response_free (axis2_http_simple_response_t *simple_response,
- axis2_env_t **env);
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_DECLARE(axis2_http_simple_response_t *)
-axis2_http_simple_response_create (axis2_env_t **env,
+axis2_http_simple_response_create (const axis2_env_t *env,
axis2_http_status_line_t *status_line,
const axis2_http_header_t **http_headers,
const axis2_ssize_t http_hdr_count,
@@ -156,7 +156,7 @@
if(NULL == simple_response_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
simple_response_impl->status_line = status_line;
@@ -179,22 +179,22 @@
AXIS2_DECLARE(axis2_http_simple_response_t *)
-axis2_http_simple_response_create_default(axis2_env_t **env)
+axis2_http_simple_response_create_default(const axis2_env_t *env)
{
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
simple_response_impl = (axis2_http_simple_response_impl_t *)AXIS2_MALLOC
- ((*env)->allocator, sizeof(
+ (env->allocator, sizeof(
axis2_http_simple_response_impl_t));
- simple_response_impl->simple_response.ops = AXIS2_MALLOC((*env)->allocator,
+ simple_response_impl->simple_response.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_simple_response_ops_t));
if(NULL == simple_response_impl->simple_response.ops)
{
axis2_http_simple_response_free((axis2_http_simple_response_t*)
simple_response_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
simple_response_impl->status_line = NULL;
@@ -243,7 +243,7 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_free (axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -272,9 +272,9 @@
simple_response_impl->header_group = NULL;
}
if(NULL != simple_response->ops)
- AXIS2_FREE((*env)->allocator, simple_response->ops);
+ AXIS2_FREE(env->allocator, simple_response->ops);
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(simple_response));
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(simple_response));
/* Stream is not freed
* Assumption : stream doesn't belong to the response
*/
@@ -284,17 +284,17 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_status_line
(struct axis2_http_simple_response *simple_response,
- axis2_env_t **env, const axis2_char_t *http_ver,
+ const axis2_env_t *env, const axis2_char_t *http_ver,
const int status_code, const axis2_char_t *phrase)
{
axis2_char_t *tmp_status_line_str = NULL;
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, http_ver, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, status_code, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, phrase, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, http_ver, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, status_code, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, phrase, AXIS2_FAILURE);
- tmp_status_line_str = AXIS2_MALLOC((*env)->allocator,
+ tmp_status_line_str = AXIS2_MALLOC(env->allocator,
(AXIS2_STRLEN(http_ver) + AXIS2_STRLEN(phrase) + 8) *
sizeof(axis2_char_t *));
sprintf(tmp_status_line_str, "%s %3d %s%s", http_ver, status_code, phrase,
@@ -308,7 +308,7 @@
}
simple_response_impl->status_line = axis2_http_status_line_create(env,
tmp_status_line_str);
- AXIS2_FREE((*env)->allocator, tmp_status_line_str);
+ AXIS2_FREE(env->allocator, tmp_status_line_str);
if(NULL == simple_response_impl->status_line)
{
@@ -321,7 +321,7 @@
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_phrase
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
if(NULL == AXIS2_INTF_TO_IMPL(simple_response)->status_line)
@@ -336,7 +336,7 @@
int AXIS2_CALL
axis2_http_simple_response_get_status_code
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(NULL == AXIS2_INTF_TO_IMPL(simple_response)->status_line)
@@ -351,7 +351,7 @@
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_http_version
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
if(NULL == AXIS2_INTF_TO_IMPL(simple_response)->status_line)
@@ -366,7 +366,7 @@
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_status_line
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
if(NULL == AXIS2_INTF_TO_IMPL(simple_response)->status_line)
@@ -381,7 +381,7 @@
axis2_array_list_t* AXIS2_CALL
axis2_http_simple_response_get_headers
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(simple_response)->header_group;
@@ -391,7 +391,7 @@
axis2_http_header_t* AXIS2_CALL
axis2_http_simple_response_get_first_header
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_char_t *str)
+ const axis2_env_t *env, axis2_char_t *str)
{
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
axis2_http_header_t *tmp_header = NULL;
@@ -401,7 +401,7 @@
axis2_array_list_t *header_group = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, str, NULL);
+ AXIS2_PARAM_CHECK(env->error, str, NULL);
simple_response_impl = AXIS2_INTF_TO_IMPL(simple_response);
header_group = simple_response_impl->header_group;
@@ -434,7 +434,7 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_remove_headers
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, const axis2_char_t *str)
+ const axis2_env_t *env, const axis2_char_t *str)
{
axis2_array_list_t *header_group = NULL;
axis2_http_header_t *tmp_header = NULL;
@@ -443,7 +443,7 @@
int count = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, str, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
header_group = AXIS2_INTF_TO_IMPL(simple_response)->
header_group;
@@ -477,7 +477,7 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_header
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_http_header_t* header)
+ const axis2_env_t *env, axis2_http_header_t* header)
{
int i = 0;
int count = 0;
@@ -487,7 +487,7 @@
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, header, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, header, AXIS2_FAILURE);
simple_response_impl = AXIS2_INTF_TO_IMPL
(simple_response);
@@ -527,7 +527,7 @@
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_charset
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_http_header_t *tmp_header = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -552,7 +552,7 @@
axis2_ssize_t AXIS2_CALL
axis2_http_simple_response_get_content_length
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_http_header_t *tmp_header = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -569,7 +569,7 @@
axis2_char_t* AXIS2_CALL
axis2_http_simple_response_get_content_type
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_http_header_t *tmp_header = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -585,11 +585,11 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_body_string
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_char_t *str)
+ const axis2_env_t *env, axis2_char_t *str)
{
axis2_stream_t *body_stream = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, str, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
body_stream = AXIS2_INTF_TO_IMPL(simple_response)->stream;
if(NULL == body_stream)
@@ -608,7 +608,7 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_body_stream
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_stream_t *stream)
+ const axis2_env_t *env, axis2_stream_t *stream)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
/*
@@ -625,7 +625,7 @@
axis2_stream_t* AXIS2_CALL
axis2_http_simple_response_get_body
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(simple_response)->stream;
@@ -635,7 +635,7 @@
axis2_ssize_t AXIS2_CALL
axis2_http_simple_response_get_body_bytes
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_char_t **buffer)
+ const axis2_env_t *env, axis2_char_t **buffer)
{
axis2_http_simple_response_impl_t *response_impl = NULL;
axis2_stream_t *tmp_stream = NULL;
@@ -647,7 +647,7 @@
response_impl = AXIS2_INTF_TO_IMPL(simple_response);
if(NULL == response_impl->stream)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NULL_BODY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_BODY, AXIS2_FAILURE);
return -1;
}
tmp_stream = axis2_stream_create_basic(env);
@@ -672,7 +672,7 @@
if(return_size > 0)
{
- *buffer = (char *)AXIS2_MALLOC((*env)->allocator, sizeof(char)*
+ *buffer = (char *)AXIS2_MALLOC(env->allocator, sizeof(char)*
(return_size +1));
return_size = AXIS2_STREAM_READ(tmp_stream, env, *buffer,
return_size + 1);
@@ -684,7 +684,7 @@
axis2_bool_t AXIS2_CALL
axis2_http_simple_response_contains_header
(axis2_http_simple_response_t *simple_response,
- axis2_env_t **env, axis2_char_t *name)
+ const axis2_env_t *env, axis2_char_t *name)
{
axis2_char_t *header_name = NULL;
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
@@ -692,7 +692,7 @@
int i = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
simple_response_impl = AXIS2_INTF_TO_IMPL(
simple_response);
if(NULL == simple_response_impl->header_group)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c Wed May 31 08:54:07 2006
@@ -41,31 +41,31 @@
/***************************** Function headers *******************************/
int AXIS2_CALL
axis2_http_status_line_get_status_code (axis2_http_status_line_t *status_line,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_http_status_line_get_http_version (axis2_http_status_line_t *status_line,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_http_status_line_get_reason_phrase (axis2_http_status_line_t *status_line,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_http_status_line_starts_with_http (axis2_http_status_line_t *status_line,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_http_status_line_to_string (axis2_http_status_line_t *status_line,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_status_line_free (axis2_http_status_line_t *status_line,
- axis2_env_t **env);
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_DECLARE(axis2_http_status_line_t *)
-axis2_http_status_line_create(axis2_env_t **env, axis2_char_t *str)
+axis2_http_status_line_create(const axis2_env_t *env, axis2_char_t *str)
{
axis2_char_t *tmp_status_line = NULL;
axis2_char_t *reason_phrase = NULL;
@@ -78,12 +78,12 @@
AXIS2_ENV_CHECK(env, NULL);
status_line_impl = (axis2_http_status_line_impl_t *)AXIS2_MALLOC
- ((*env)->allocator, sizeof(
+ (env->allocator, sizeof(
axis2_http_status_line_impl_t));
if(NULL == status_line_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
status_line_impl->status_line.ops = NULL;
@@ -97,19 +97,19 @@
{
axis2_http_status_line_free((axis2_http_status_line_t*)
status_line_impl, env);
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
AXIS2_FAILURE);
return NULL;
}
i = tmp - str;
- tmp_status_line = AXIS2_MALLOC((*env)->allocator,
+ tmp_status_line = AXIS2_MALLOC(env->allocator,
i * sizeof(axis2_char_t) +1);
if(NULL == tmp_status_line)
{
axis2_http_status_line_free((axis2_http_status_line_t*)
status_line_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
memcpy(tmp_status_line, str, i * sizeof(axis2_char_t));
@@ -120,10 +120,10 @@
tmp = strchr(tmp, ' ');
if(NULL == tmp)
{
- AXIS2_FREE((*env)->allocator, tmp_status_line);
+ AXIS2_FREE(env->allocator, tmp_status_line);
axis2_http_status_line_free((axis2_http_status_line_t*)
status_line_impl, env);
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
AXIS2_FAILURE);
return NULL;
@@ -133,10 +133,10 @@
tmp = strchr(tmp, ' ');
if(NULL == tmp)
{
- AXIS2_FREE((*env)->allocator, tmp_status_line);
+ AXIS2_FREE(env->allocator, tmp_status_line);
axis2_http_status_line_free((axis2_http_status_line_t*)
status_line_impl, env);
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
AXIS2_FAILURE);
return NULL;
@@ -153,21 +153,21 @@
if(NULL == status_line_impl->http_version ||
NULL == status_line_impl->reason_phrase)
{
- AXIS2_FREE((*env)->allocator, tmp_status_line);
+ AXIS2_FREE(env->allocator, tmp_status_line);
axis2_http_status_line_free((axis2_http_status_line_t*)
status_line_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- AXIS2_FREE((*env)->allocator, tmp_status_line);
+ AXIS2_FREE(env->allocator, tmp_status_line);
- status_line_impl->status_line.ops = AXIS2_MALLOC((*env)->allocator,
+ status_line_impl->status_line.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_status_line_ops_t));
if(NULL == status_line_impl->status_line.ops)
{
axis2_http_status_line_free((axis2_http_status_line_t*)
status_line_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -188,7 +188,7 @@
axis2_status_t AXIS2_CALL
axis2_http_status_line_free (axis2_http_status_line_t *status_line,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_http_status_line_impl_t *status_line_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -196,35 +196,35 @@
if(NULL != status_line_impl->line)
{
- AXIS2_FREE((*env)->allocator, status_line_impl->line);
+ AXIS2_FREE(env->allocator, status_line_impl->line);
status_line_impl->line = NULL;
}
if(NULL != status_line_impl->http_version)
{
- AXIS2_FREE((*env)->allocator, status_line_impl->http_version);
+ AXIS2_FREE(env->allocator, status_line_impl->http_version);
status_line_impl->http_version = NULL;
}
if(NULL != status_line_impl->status_code)
{
- AXIS2_FREE((*env)->allocator, status_line_impl->status_code);
+ AXIS2_FREE(env->allocator, status_line_impl->status_code);
status_line_impl->status_code = NULL;
}
if(NULL != status_line_impl->reason_phrase)
{
- AXIS2_FREE((*env)->allocator, status_line_impl->reason_phrase);
+ AXIS2_FREE(env->allocator, status_line_impl->reason_phrase);
status_line_impl->reason_phrase = NULL;
}
if(NULL != status_line->ops)
- AXIS2_FREE((*env)->allocator, status_line->ops);
+ AXIS2_FREE(env->allocator, status_line->ops);
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(status_line));
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(status_line));
return AXIS2_SUCCESS;
}
int AXIS2_CALL
axis2_http_status_line_get_status_code (axis2_http_status_line_t *status_line,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(status_line)->status_code)
@@ -241,7 +241,7 @@
axis2_char_t* AXIS2_CALL
axis2_http_status_line_get_http_version (axis2_http_status_line_t *status_line,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(status_line)->http_version;
@@ -250,7 +250,7 @@
axis2_char_t* AXIS2_CALL
axis2_http_status_line_get_reason_phrase (axis2_http_status_line_t *status_line,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(status_line)->reason_phrase;
@@ -259,7 +259,7 @@
axis2_bool_t AXIS2_CALL
axis2_http_status_line_starts_with_http (axis2_http_status_line_t *status_line,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(0 == AXIS2_STRNCASECMP(AXIS2_INTF_TO_IMPL(status_line)->line, "HTTP", 4))
@@ -271,7 +271,7 @@
axis2_char_t *AXIS2_CALL
axis2_http_status_line_to_string (axis2_http_status_line_t *status_line,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(status_line)->line;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Wed May 31 08:54:07 2006
@@ -40,7 +40,7 @@
AXIS2_DECLARE(axis2_status_t)
axis2_http_transport_utils_process_http_post_request
- (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx,
+ (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
axis2_stream_t *in_stream, axis2_stream_t *out_stream,
axis2_char_t *content_type, int content_length,
axis2_char_t *soap_action_header,
@@ -48,7 +48,7 @@
AXIS2_DECLARE(axis2_bool_t)
axis2_http_transport_utils_process_http_get_request
- (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx,
+ (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
axis2_stream_t *in_stream, axis2_stream_t *out_stream,
axis2_char_t *content_type,
axis2_char_t *soap_action_header,
@@ -57,58 +57,58 @@
AXIS2_DECLARE(axis2_soap_envelope_t*)
axis2_http_transport_utils_create_envelope_from_get_request
- (axis2_env_t **env, axis2_char_t *request_uri,
+ (const axis2_env_t *env, axis2_char_t *request_uri,
axis2_hash_t *request_params);
AXIS2_DECLARE(axis2_om_stax_builder_t* )
axis2_http_transport_utils_select_builder_for_mime
- (axis2_env_t **env, axis2_char_t *request_uri,
+ (const axis2_env_t *env, axis2_char_t *request_uri,
axis2_msg_ctx_t *msg_ctx, axis2_stream_t *in_stream,
axis2_char_t *content_type);
AXIS2_DECLARE(axis2_bool_t )
-axis2_http_transport_utils_is_optimized(axis2_env_t **env,
+axis2_http_transport_utils_is_optimized(const axis2_env_t *env,
axis2_om_element_t *om_element);
AXIS2_DECLARE(axis2_bool_t )
-axis2_http_transport_utils_do_write_mtom(axis2_env_t **env,
+axis2_http_transport_utils_do_write_mtom(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
AXIS2_DECLARE(axis2_bool_t )
-axis2_http_transport_utils_is_doing_rest(axis2_env_t **env,
+axis2_http_transport_utils_is_doing_rest(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
AXIS2_DECLARE(axis2_bool_t)
axis2_http_transport_utils_is_doing_rest_through_post
- (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx);
+ (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx);
AXIS2_DECLARE(axis2_status_t)
-axis2_http_transport_utils_strdecode(axis2_env_t **env, axis2_char_t *dest,
+axis2_http_transport_utils_strdecode(const axis2_env_t *env, axis2_char_t *dest,
axis2_char_t *src);
AXIS2_DECLARE(int)
axis2_http_transport_utils_hexit(axis2_char_t c);
AXIS2_DECLARE(axis2_char_t* )
-axis2_http_transport_utils_get_services_html(axis2_env_t **env,
+axis2_http_transport_utils_get_services_html(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
AXIS2_DECLARE(axis2_char_t*)
-axis2_http_transport_utils_get_charset_enc(axis2_env_t **env,
+axis2_http_transport_utils_get_charset_enc(const axis2_env_t *env,
axis2_char_t *content_type);
int AXIS2_CALL
axis2_http_transport_utils_on_data_request(char *buffer, int size, void *ctx);
AXIS2_DECLARE(axis2_soap_envelope_t*)
-axis2_http_transport_utils_create_soap_msg(axis2_env_t **env,
+axis2_http_transport_utils_create_soap_msg(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx, axis2_char_t *soap_ns_uri);
AXIS2_DECLARE(axis2_char_t*)
-axis2_http_transport_utils_get_value_from_content_type(axis2_env_t **env,
+axis2_http_transport_utils_get_value_from_content_type(const axis2_env_t *env,
axis2_char_t *content_type, axis2_char_t *key);
/***************************** End of function headers ************************/
AXIS2_DECLARE(axis2_status_t )
axis2_http_transport_utils_process_http_post_request
- (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx,
+ (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
axis2_stream_t *in_stream, axis2_stream_t *out_stream,
axis2_char_t *content_type, int content_length,
axis2_char_t *soap_action_header,
@@ -130,16 +130,16 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_hash_t *binary_data_map = NULL;
- AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, in_stream, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, out_stream, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, content_type, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, request_uri, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, in_stream, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, out_stream, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, request_uri, AXIS2_FAILURE);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
callback_ctx.in_stream = in_stream;
- callback_ctx.env = *env;
+ callback_ctx.env = env;
callback_ctx.content_length = content_length;
callback_ctx.unread_len = content_length;
callback_ctx.chunked_stream = NULL;
@@ -181,11 +181,11 @@
env, in_stream);
if(NULL == callback_ctx.chunked_stream)
{
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "Error occured in"
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error occured in"
" creating in chunked stream.");
return AXIS2_FAILURE;
}
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "HTTP"
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "HTTP"
" stream chunked");
}
}
@@ -356,7 +356,7 @@
*
*if(0 != AXIS2_STRCMP(char_set, xml_char_set))
*{
- * AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CHARSET_MISMATCH,
+ * AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CHARSET_MISMATCH,
* AXIS2_FAILURE);
* AXIS2_SOAP_ENVELOPE_FREE(envelope, env);
* envelope = NULL;
@@ -411,7 +411,7 @@
AXIS2_DECLARE(axis2_bool_t)
axis2_http_transport_utils_process_http_get_request
- (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx,
+ (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
axis2_stream_t *in_stream, axis2_stream_t *out_stream,
axis2_char_t *content_type,
axis2_char_t *soap_action_header,
@@ -422,12 +422,12 @@
axis2_engine_t *engine = NULL;
axis2_property_t *property = NULL;
- AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, in_stream, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, out_stream, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, content_type, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, request_uri, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, request_params, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, in_stream, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, out_stream, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, request_uri, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, request_params, AXIS2_FALSE);
if(NULL != soap_action_header)
{
@@ -476,7 +476,7 @@
AXIS2_DECLARE(axis2_soap_envelope_t*)
axis2_http_transport_utils_create_envelope_from_get_request
- (axis2_env_t **env, axis2_char_t *request_uri,
+ (const axis2_env_t *env, axis2_char_t *request_uri,
axis2_hash_t *request_params)
{
axis2_char_t **values = NULL;
@@ -487,8 +487,8 @@
axis2_om_node_t *op_node = NULL;
axis2_om_element_t *op_ele = NULL;
axis2_hash_index_t *hi = NULL;
- AXIS2_PARAM_CHECK((*env)->error, request_uri, NULL);
- AXIS2_PARAM_CHECK((*env)->error, request_params, NULL);
+ AXIS2_PARAM_CHECK(env->error, request_uri, NULL);
+ AXIS2_PARAM_CHECK(env->error, request_params, NULL);
values = axis2_parse_request_url_for_svc_and_op(env, request_uri);
if(NULL == values)
@@ -497,19 +497,19 @@
}
if(NULL == values[0] && NULL != values[1])
{
- AXIS2_FREE((*env)->allocator, values[1]);
- AXIS2_FREE((*env)->allocator, values);
+ AXIS2_FREE(env->allocator, values[1]);
+ AXIS2_FREE(env->allocator, values);
return NULL;
}
if(NULL != values[0] && NULL == values[1])
{
- AXIS2_FREE((*env)->allocator, values[0]);
- AXIS2_FREE((*env)->allocator, values);
+ AXIS2_FREE(env->allocator, values[0]);
+ AXIS2_FREE(env->allocator, values);
return NULL;
}
if(NULL == values[0] && NULL == values[1])
{
- AXIS2_FREE((*env)->allocator, values);
+ AXIS2_FREE(env->allocator, values);
return NULL;
}
envelope = axis2_soap_envelope_create_default_soap_envelope(env, AXIS2_SOAP12);
@@ -541,7 +541,7 @@
AXIS2_DECLARE(axis2_om_stax_builder_t* )
axis2_http_transport_utils_select_builder_for_mime
- (axis2_env_t **env, axis2_char_t *request_uri,
+ (const axis2_env_t *env, axis2_char_t *request_uri,
axis2_msg_ctx_t *msg_ctx, axis2_stream_t *in_stream,
axis2_char_t *content_type)
{
@@ -553,7 +553,7 @@
AXIS2_DECLARE(axis2_bool_t )
-axis2_http_transport_utils_is_optimized(axis2_env_t **env,
+axis2_http_transport_utils_is_optimized(const axis2_env_t *env,
axis2_om_element_t *om_element)
{
/*
@@ -564,12 +564,12 @@
AXIS2_DECLARE(axis2_bool_t)
-axis2_http_transport_utils_do_write_mtom(axis2_env_t **env,
+axis2_http_transport_utils_do_write_mtom(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
axis2_property_t *property = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
AXIS2_ENABLE_MTOM, AXIS2_FALSE);
if(property)
@@ -587,7 +587,7 @@
AXIS2_DECLARE(axis2_bool_t)
-axis2_http_transport_utils_is_doing_rest(axis2_env_t **env,
+axis2_http_transport_utils_is_doing_rest(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
/*
@@ -599,7 +599,7 @@
AXIS2_DECLARE(axis2_bool_t)
axis2_http_transport_utils_is_doing_rest_through_post
- (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx)
+ (const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx)
{
/*
TODO implement when REST support is added
@@ -608,7 +608,7 @@
}
AXIS2_DECLARE(axis2_hash_t *)
-axis2_http_transport_utils_get_request_params(axis2_env_t **env,
+axis2_http_transport_utils_get_request_params(const axis2_env_t *env,
axis2_char_t *request_uri)
{
@@ -620,7 +620,7 @@
axis2_char_t *tmp_value = NULL;
axis2_hash_t *ret = NULL;
- AXIS2_PARAM_CHECK((*env)->error, request_uri, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, request_uri, AXIS2_FAILURE);
if(NULL == tmp || '\0' == *(tmp +1))
{
@@ -671,12 +671,12 @@
AXIS2_DECLARE(axis2_status_t)
-axis2_http_transport_utils_strdecode(axis2_env_t **env, axis2_char_t *dest,
+axis2_http_transport_utils_strdecode(const axis2_env_t *env, axis2_char_t *dest,
axis2_char_t *src)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, dest, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, src, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, dest, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, src, AXIS2_FAILURE);
for ( ; *src != '\0'; ++dest, ++src )
{
@@ -716,7 +716,7 @@
}
AXIS2_DECLARE(axis2_char_t*)
-axis2_http_transport_utils_get_services_html(axis2_env_t **env,
+axis2_http_transport_utils_get_services_html(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
axis2_hash_t *services_map = NULL;
@@ -727,7 +727,7 @@
axis2_bool_t svcs_exists = AXIS2_FALSE;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, conf_ctx, NULL);
+ AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
services_map = AXIS2_CONF_GET_SVCS(AXIS2_CONF_CTX_GET_CONF(conf_ctx,env),
env);
@@ -749,10 +749,10 @@
ret = AXIS2_STRACAT(tmp2, "<h3>", env);
tmp2 = ret;
ret = AXIS2_STRACAT(tmp2, sname, env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
ret = AXIS2_STRACAT(tmp2, "</h3>", env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
ops = AXIS2_SVC_GET_OPS(((axis2_svc_t *)service), env);
if(NULL != ops && 0 != axis2_hash_count(ops))
@@ -763,7 +763,7 @@
ret = AXIS2_STRACAT(tmp2, "<i>Available Operations</i> <ul>",
env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
for(hi2 = axis2_hash_first(ops, env); NULL != hi2;
hi2 = axis2_hash_next(env, hi2))
@@ -772,24 +772,24 @@
oname = AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(
((axis2_op_t *)op), env), env);
ret = AXIS2_STRACAT(tmp2, "<li>", env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
ret = AXIS2_STRACAT(tmp2, oname, env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
ret = AXIS2_STRACAT(tmp2, "</li>", env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
}
ret = AXIS2_STRACAT(tmp2, "</ul>", env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
}
else
{
ret = AXIS2_STRACAT(tmp2, "No operations Available", env);
- /*AXIS2_FREE((*env)->allocator, tmp);*/
+ /*AXIS2_FREE(env->allocator, tmp);*/
tmp2 = ret;
}
}
@@ -801,7 +801,7 @@
ret = AXIS2_STRACAT(tmp2, "<hr><h2><font color=\"red\">Faulty \
Services</font></h2>"
, env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
for(hi = axis2_hash_first(errorneous_svc_map, env); NULL != hi;
@@ -809,13 +809,13 @@
{
axis2_hash_this(hi, (const void **)&fsname, NULL, NULL);
ret = AXIS2_STRACAT(tmp2, "<h3><font color=\"red\">", env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
ret = AXIS2_STRACAT(tmp2, (axis2_char_t*)fsname, env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
ret = AXIS2_STRACAT(tmp2, "</font></h3>", env);
- AXIS2_FREE((*env)->allocator, tmp2);
+ AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
}
}
@@ -826,16 +826,16 @@
ret = AXIS2_STRACAT("<html><head><title>Axis2C :: Services</title></head>"
"<body><font face=\"courier\">"
, tmp2, env);
- /*AXIS2_FREE((*env)->allocator, tmp2);*/
+ /*AXIS2_FREE(env->allocator, tmp2);*/
tmp2 = ret;
ret = AXIS2_STRACAT(tmp2, "</font></body></html>\r\n", env);
- /*AXIS2_FREE((*env)->allocator, tmp);*/
+ /*AXIS2_FREE(env->allocator, tmp);*/
return ret;
}
AXIS2_DECLARE(axis2_char_t*)
-axis2_http_transport_utils_get_charset_enc(axis2_env_t **env,
+axis2_http_transport_utils_get_charset_enc(const axis2_env_t *env,
axis2_char_t *content_type)
{
axis2_char_t *tmp = NULL;
@@ -843,7 +843,7 @@
axis2_char_t *tmp2 = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, content_type, NULL);
+ AXIS2_PARAM_CHECK(env->error, content_type, NULL);
tmp_content_type = AXIS2_STRDUP(content_type, env);
if(NULL == tmp_content_type)
@@ -853,7 +853,7 @@
tmp = strstr(tmp_content_type, AXIS2_HTTP_CHAR_SET_ENCODING);
if(NULL == tmp)
{
- AXIS2_FREE((*env)->allocator, tmp_content_type);
+ AXIS2_FREE(env->allocator, tmp_content_type);
return AXIS2_STRDUP(AXIS2_HTTP_HEADER_DEFAULT_CHAR_ENCODING, env);
}
tmp = strchr(tmp, '=');
@@ -869,7 +869,7 @@
}
if(NULL == tmp)
{
- AXIS2_FREE((*env)->allocator, tmp_content_type);
+ AXIS2_FREE(env->allocator, tmp_content_type);
return AXIS2_STRDUP(AXIS2_HTTP_HEADER_DEFAULT_CHAR_ENCODING, env);
}
/* Following formats are acceptable
@@ -888,14 +888,14 @@
tmp += sizeof(axis2_char_t);
}
tmp2 = AXIS2_STRDUP(tmp, env);
- AXIS2_FREE((*env)->allocator, tmp_content_type);
+ AXIS2_FREE(env->allocator, tmp_content_type);
return tmp2;
}
int AXIS2_CALL
axis2_http_transport_utils_on_data_request(char *buffer, int size, void *ctx)
{
- axis2_env_t **env = NULL;
+ const axis2_env_t *env = NULL;
int len = -1;
axis2_callback_info_t *cb_ctx = (axis2_callback_info_t*)ctx;
@@ -903,7 +903,7 @@
{
return 0;
}
- env = &((axis2_callback_info_t*)ctx)->env;
+ env = ((axis2_callback_info_t*)ctx)->env;
if(cb_ctx->unread_len <= 0 && -1 != cb_ctx->content_length)
{
return 0;
@@ -954,7 +954,7 @@
}
AXIS2_DECLARE(axis2_soap_envelope_t*)
-axis2_http_transport_utils_create_soap_msg(axis2_env_t **env,
+axis2_http_transport_utils_create_soap_msg(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx, axis2_char_t *soap_ns_uri)
{
axis2_op_ctx_t *op_ctx = NULL;
@@ -966,8 +966,8 @@
int *content_length = NULL;
axis2_property_t *property = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, msg_ctx, NULL);
- AXIS2_PARAM_CHECK((*env)->error, soap_ns_uri, NULL);
+ AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
+ AXIS2_PARAM_CHECK(env->error, soap_ns_uri, NULL);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
@@ -978,14 +978,14 @@
property = NULL;
}
/* TODO free this when xml pulling is over */
- callback_ctx = AXIS2_MALLOC((*env)->allocator, sizeof(axis2_callback_info_t));
+ callback_ctx = AXIS2_MALLOC(env->allocator, sizeof(axis2_callback_info_t));
if(NULL == callback_ctx)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
callback_ctx->in_stream = in_stream;
- callback_ctx->env = *env;
+ callback_ctx->env = env;
callback_ctx->content_length = -1;
callback_ctx->unread_len = -1;
callback_ctx->chunked_stream = NULL;
@@ -1004,7 +1004,7 @@
}
if(NULL == in_stream)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NULL_IN_STREAM_IN_MSG_CTX,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_IN_STREAM_IN_MSG_CTX,
AXIS2_FAILURE);
return NULL;
}
@@ -1132,7 +1132,7 @@
AXIS2_DECLARE(axis2_char_t*)
-axis2_http_transport_utils_get_value_from_content_type(axis2_env_t **env,
+axis2_http_transport_utils_get_value_from_content_type(const axis2_env_t *env,
axis2_char_t *content_type, axis2_char_t *key)
{
axis2_char_t *tmp = NULL;
@@ -1140,8 +1140,8 @@
axis2_char_t *tmp2 = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, content_type, NULL);
- AXIS2_PARAM_CHECK((*env)->error, key, NULL);
+ AXIS2_PARAM_CHECK(env->error, content_type, NULL);
+ AXIS2_PARAM_CHECK(env->error, key, NULL);
tmp_content_type = AXIS2_STRDUP(content_type, env);
if(NULL == tmp_content_type)
@@ -1151,7 +1151,7 @@
tmp = strstr(tmp_content_type, key);
if(NULL == tmp)
{
- AXIS2_FREE((*env)->allocator, tmp_content_type);
+ AXIS2_FREE(env->allocator, tmp_content_type);
return NULL;
}
@@ -1164,10 +1164,10 @@
}
if(NULL == tmp)
{
- AXIS2_FREE((*env)->allocator, tmp_content_type);
+ AXIS2_FREE(env->allocator, tmp_content_type);
return NULL;
}
tmp2 = AXIS2_STRDUP(tmp + 1, env);
- AXIS2_FREE((*env)->allocator, tmp_content_type);
+ AXIS2_FREE(env->allocator, tmp_content_type);
return tmp2;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Wed May 31 08:54:07 2006
@@ -49,13 +49,13 @@
axis2_bool_t AXIS2_CALL
axis2_http_worker_process_request(axis2_http_worker_t *http_worker,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_simple_http_svr_conn_t *svr_conn,
axis2_http_simple_request_t *simple_request);
axis2_status_t AXIS2_CALL
axis2_http_worker_set_response_headers(axis2_http_worker_t *http_worker,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_simple_http_svr_conn_t *svr_conn,
axis2_http_simple_request_t *simple_request,
axis2_http_simple_response_t *simple_response,
@@ -63,47 +63,47 @@
axis2_status_t AXIS2_CALL
axis2_http_worker_set_transport_out_config(axis2_http_worker_t *http_worker,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_http_simple_response_t *simple_response);
axis2_hash_t* AXIS2_CALL
axis2_http_worker_get_headers(axis2_http_worker_t *http_worker,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_http_simple_request_t *request);
axis2_status_t AXIS2_CALL
axis2_http_worker_set_svr_port(axis2_http_worker_t *worker,
- axis2_env_t **env, int port);
+ const axis2_env_t *env, int port);
axis2_status_t AXIS2_CALL
axis2_http_worker_free(axis2_http_worker_t *http_worker,
- axis2_env_t **env);
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_DECLARE(axis2_http_worker_t *)
-axis2_http_worker_create (axis2_env_t **env, axis2_conf_ctx_t *conf_ctx)
+axis2_http_worker_create (const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx)
{
axis2_http_worker_impl_t *http_worker_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
http_worker_impl = (axis2_http_worker_impl_t *)
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_http_worker_impl_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_http_worker_impl_t));
if(NULL == http_worker_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
http_worker_impl->conf_ctx = conf_ctx;
http_worker_impl->svr_port = 9090; /* default - must set later*/
- http_worker_impl->http_worker.ops = AXIS2_MALLOC((*env)->allocator,
+ http_worker_impl->http_worker.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_worker_ops_t));
if(NULL == http_worker_impl->http_worker.ops)
{
axis2_http_worker_free((axis2_http_worker_t*)http_worker_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -117,23 +117,23 @@
}
axis2_status_t AXIS2_CALL
-axis2_http_worker_free (axis2_http_worker_t *http_worker, axis2_env_t **env)
+axis2_http_worker_free (axis2_http_worker_t *http_worker, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(http_worker)->conf_ctx = NULL;
if(NULL != http_worker->ops)
- AXIS2_FREE((*env)->allocator, http_worker->ops);
+ AXIS2_FREE(env->allocator, http_worker->ops);
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(http_worker));
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(http_worker));
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
axis2_http_worker_process_request(axis2_http_worker_t *http_worker,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_simple_http_svr_conn_t *svr_conn,
axis2_http_simple_request_t *simple_request)
{
@@ -164,15 +164,15 @@
axis2_char_t *svc_grp_uuid = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svr_conn, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, simple_request, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svr_conn, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, simple_request, AXIS2_FAILURE);
http_worker_impl = AXIS2_INTF_TO_IMPL(http_worker);
conf_ctx = http_worker_impl->conf_ctx;
if(NULL == conf_ctx)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NULL_CONFIGURATION_CONTEXT,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_CONFIGURATION_CONTEXT,
AXIS2_FAILURE);
return AXIS2_FALSE;
}
@@ -184,11 +184,11 @@
(simple_request, env), env);
if(NULL == http_version)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NULL_HTTP_VERSION,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_HTTP_VERSION,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Client HTTP version %s",
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Client HTTP version %s",
http_version);
response = axis2_http_simple_response_create_default(env);
@@ -264,7 +264,7 @@
if(NULL != svc_grp_uuid)
{
- AXIS2_FREE((*env)->allocator, svc_grp_uuid);
+ AXIS2_FREE(env->allocator, svc_grp_uuid);
svc_grp_uuid = NULL;
}
@@ -410,7 +410,7 @@
out_stream, env));
status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response);
- AXIS2_FREE((*env)->allocator, url_external_form);
+ AXIS2_FREE(env->allocator, url_external_form);
url_external_form = NULL;
AXIS2_MSG_CTX_FREE(msg_ctx, env);
msg_ctx = NULL;
@@ -424,7 +424,7 @@
axis2_status_t AXIS2_CALL
axis2_http_worker_set_response_headers(axis2_http_worker_t *http_worker,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_simple_http_svr_conn_t *svr_conn,
axis2_http_simple_request_t *simple_request,
axis2_http_simple_response_t *simple_response,
@@ -433,9 +433,9 @@
axis2_http_header_t *conn_header = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svr_conn, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, simple_request, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, simple_response, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svr_conn, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, simple_request, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, simple_response, AXIS2_FAILURE);
if(AXIS2_FALSE == AXIS2_HTTP_SIMPLE_RESPONSE_CONTAINS_HEADER
(simple_response, env, AXIS2_HTTP_HEADER_CONNECTION))
{
@@ -515,7 +515,7 @@
*/
axis2_status_t AXIS2_CALL
axis2_http_worker_set_transport_out_config(axis2_http_worker_t *http_worker,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_http_simple_response_t *simple_response)
{
@@ -523,8 +523,8 @@
axis2_hash_t *tranport_outs = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, conf_ctx, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, simple_response, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, simple_response, AXIS2_FAILURE);
config = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
tranport_outs = AXIS2_CONF_GET_TRANSPORTS_OUT(config, env);
@@ -538,14 +538,14 @@
axis2_hash_t* AXIS2_CALL
axis2_http_worker_get_headers(axis2_http_worker_t *http_worker,
- axis2_env_t **env, axis2_http_simple_request_t *request)
+ const axis2_env_t *env, axis2_http_simple_request_t *request)
{
axis2_array_list_t *header_list = NULL;
int hdr_count = 0;
int i = 0;
axis2_hash_t *header_map = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, request, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, request, AXIS2_FAILURE);
header_list = AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(request, env);
if(NULL == header_list)
@@ -582,7 +582,7 @@
axis2_status_t AXIS2_CALL
axis2_http_worker_set_svr_port(axis2_http_worker_t *worker,
- axis2_env_t **env, int port)
+ const axis2_env_t *env, int port)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(worker)->svr_port = port;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c Wed May 31 08:54:07 2006
@@ -40,55 +40,55 @@
axis2_char_t* AXIS2_CALL
axis2_http_response_writer_get_encoding
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_response_writer_close(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_response_writer_flush(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_response_writer_write_char
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, char c);
+ const axis2_env_t *env, char c);
axis2_status_t AXIS2_CALL
axis2_http_response_writer_write_buf
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, char *buf, int offset,
+ const axis2_env_t *env, char *buf, int offset,
axis2_ssize_t len);
axis2_status_t AXIS2_CALL
axis2_http_response_writer_print_str
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, char *str);
+ const axis2_env_t *env, char *str);
axis2_status_t AXIS2_CALL
axis2_http_response_writer_print_int
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, int i);
+ const axis2_env_t *env, int i);
axis2_status_t AXIS2_CALL
axis2_http_response_writer_println_str
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, char *str);
+ const axis2_env_t *env, char *str);
axis2_status_t AXIS2_CALL
axis2_http_response_writer_println
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_response_writer_free(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env);
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
axis2_http_response_writer_t* AXIS2_CALL
-axis2_http_response_writer_create (axis2_env_t **env, axis2_stream_t *stream)
+axis2_http_response_writer_create (const axis2_env_t *env, axis2_stream_t *stream)
{
AXIS2_ENV_CHECK(env, NULL);
return axis2_http_response_writer_create_with_encoding(env, stream,
@@ -97,32 +97,32 @@
}
axis2_http_response_writer_t* AXIS2_CALL
-axis2_http_response_writer_create_with_encoding(axis2_env_t **env,
+axis2_http_response_writer_create_with_encoding(const axis2_env_t *env,
axis2_stream_t *stream, const axis2_char_t *encoding)
{
axis2_http_response_writer_impl_t *response_writer_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, encoding, NULL);
+ AXIS2_PARAM_CHECK(env->error, encoding, NULL);
response_writer_impl = (axis2_http_response_writer_impl_t *)AXIS2_MALLOC
- ((*env)->allocator, sizeof(
+ (env->allocator, sizeof(
axis2_http_response_writer_impl_t));
if(NULL == response_writer_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
response_writer_impl->stream = stream;
response_writer_impl->encoding = (axis2_char_t *)AXIS2_STRDUP(encoding, env);
- response_writer_impl->response_writer.ops = AXIS2_MALLOC((*env)->allocator,
+ response_writer_impl->response_writer.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_response_writer_ops_t));
if(NULL == response_writer_impl->response_writer.ops)
{
axis2_http_response_writer_free((axis2_http_response_writer_t*)
response_writer_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -153,16 +153,16 @@
axis2_status_t AXIS2_CALL
axis2_http_response_writer_free(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_FREE((*env)->allocator,
+ AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(response_writer)->encoding);
if(NULL != response_writer->ops)
- AXIS2_FREE((*env)->allocator, response_writer->ops);
+ AXIS2_FREE(env->allocator, response_writer->ops);
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(response_writer));
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(response_writer));
return AXIS2_SUCCESS;
}
@@ -170,7 +170,7 @@
axis2_char_t* AXIS2_CALL
axis2_http_response_writer_get_encoding
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(response_writer)->encoding;
@@ -179,7 +179,7 @@
axis2_status_t AXIS2_CALL
axis2_http_response_writer_close(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_SUCCESS;
@@ -188,7 +188,7 @@
axis2_status_t AXIS2_CALL
axis2_http_response_writer_flush(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
/*
@@ -201,7 +201,7 @@
axis2_status_t AXIS2_CALL
axis2_http_response_writer_write_char
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, char c)
+ const axis2_env_t *env, char c)
{
axis2_http_response_writer_impl_t *writer_impl = NULL;
int write = -1;
@@ -224,13 +224,13 @@
axis2_status_t AXIS2_CALL
axis2_http_response_writer_write_buf
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, char *buf, int offset,
+ const axis2_env_t *env, char *buf, int offset,
axis2_ssize_t len)
{
axis2_http_response_writer_impl_t *writer_impl = NULL;
int write = -1;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, buf, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, buf, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(response_writer);
if(NULL == writer_impl->stream)
@@ -252,14 +252,14 @@
axis2_status_t AXIS2_CALL
axis2_http_response_writer_print_str
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, char *str)
+ const axis2_env_t *env, char *str)
{
axis2_http_response_writer_impl_t *writer_impl = NULL;
int write = -1;
int len = -1;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, str, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(response_writer);
len = AXIS2_STRLEN(str);
@@ -279,7 +279,7 @@
axis2_status_t AXIS2_CALL
axis2_http_response_writer_print_int
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, int i)
+ const axis2_env_t *env, int i)
{
axis2_char_t int_str[10];
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -291,10 +291,10 @@
axis2_status_t AXIS2_CALL
axis2_http_response_writer_println_str
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env, char *str)
+ const axis2_env_t *env, char *str)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, str, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
if (AXIS2_SUCCESS == axis2_http_response_writer_print_str(response_writer,
env, str))
@@ -309,7 +309,7 @@
axis2_status_t AXIS2_CALL
axis2_http_response_writer_println
(axis2_http_response_writer_t *response_writer,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return axis2_http_response_writer_print_str(response_writer, env,
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c Wed May 31 08:54:07 2006
@@ -43,44 +43,44 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
-axis2_http_server_init(axis2_transport_receiver_t *server, axis2_env_t **env,
+axis2_http_server_init(axis2_transport_receiver_t *server, const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_transport_in_desc_t *in_desc);
axis2_status_t AXIS2_CALL
-axis2_http_server_start(axis2_transport_receiver_t *server, axis2_env_t **env);
+axis2_http_server_start(axis2_transport_receiver_t *server, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_http_server_stop(axis2_transport_receiver_t *server, axis2_env_t **env);
+axis2_http_server_stop(axis2_transport_receiver_t *server, const axis2_env_t *env);
axis2_conf_ctx_t* AXIS2_CALL
axis2_http_server_get_conf_ctx (axis2_transport_receiver_t *server,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_endpoint_ref_t* AXIS2_CALL
axis2_http_server_get_reply_to_epr(axis2_transport_receiver_t *server,
- axis2_env_t **env, axis2_char_t *svc_name);
+ const axis2_env_t *env, axis2_char_t *svc_name);
axis2_bool_t AXIS2_CALL
axis2_http_server_is_running (axis2_transport_receiver_t *server,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_http_server_free (axis2_transport_receiver_t *server, axis2_env_t **env);
+axis2_http_server_free (axis2_transport_receiver_t *server, const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_DECLARE(axis2_transport_receiver_t *)
-axis2_http_server_create (axis2_env_t **env, axis2_char_t *repo, int port)
+axis2_http_server_create (const axis2_env_t *env, axis2_char_t *repo, int port)
{
axis2_http_server_impl_t *server_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
server_impl = (axis2_http_server_impl_t *)AXIS2_MALLOC
- ((*env)->allocator, sizeof(axis2_http_server_impl_t));
+ (env->allocator, sizeof(axis2_http_server_impl_t));
if(NULL == server_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -89,12 +89,12 @@
server_impl->conf_ctx_private = NULL;
server_impl->port = port;
- server_impl->http_server.ops = AXIS2_MALLOC((*env)->allocator,
+ server_impl->http_server.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_transport_receiver_ops_t));
if(NULL == server_impl->http_server.ops)
{
axis2_http_server_free((axis2_transport_receiver_t*) server_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
if(repo)
@@ -126,7 +126,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_http_server_free (axis2_transport_receiver_t *server, axis2_env_t **env)
+axis2_http_server_free (axis2_transport_receiver_t *server, const axis2_env_t *env)
{
axis2_http_server_impl_t *server_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -150,15 +150,15 @@
if(NULL != server->ops)
{
- AXIS2_FREE((*env)->allocator, server->ops);
+ AXIS2_FREE(env->allocator, server->ops);
}
- AXIS2_FREE((*env)->allocator, server_impl);
+ AXIS2_FREE(env->allocator, server_impl);
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-axis2_http_server_init(axis2_transport_receiver_t *server, axis2_env_t **env,
+axis2_http_server_init(axis2_transport_receiver_t *server, const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_transport_in_desc_t *in_desc)
{
@@ -185,7 +185,7 @@
axis2_status_t AXIS2_CALL
-axis2_http_server_start(axis2_transport_receiver_t *server, axis2_env_t **env)
+axis2_http_server_start(axis2_transport_receiver_t *server, const axis2_env_t *env)
{
axis2_http_server_impl_t *server_impl = NULL;
@@ -206,7 +206,7 @@
AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
return AXIS2_FAILURE;
}
- AXIS2_LOG_INFO((*env)->log, "Starting HTTP server thread");
+ AXIS2_LOG_INFO(env->log, "Starting HTTP server thread");
AXIS2_HTTP_SVR_THREAD_SET_WORKER(server_impl->svr_thread, env, worker);
AXIS2_HTTP_SVR_THREAD_RUN(server_impl->svr_thread, env);
return AXIS2_SUCCESS;
@@ -214,24 +214,24 @@
axis2_status_t AXIS2_CALL
-axis2_http_server_stop(axis2_transport_receiver_t *server, axis2_env_t **env)
+axis2_http_server_stop(axis2_transport_receiver_t *server, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_LOG_INFO((*env)->log, "Terminating HTTP server thread");
+ AXIS2_LOG_INFO(env->log, "Terminating HTTP server thread");
if(NULL != AXIS2_INTF_TO_IMPL(server)->svr_thread)
{
AXIS2_HTTP_SVR_THREAD_DESTROY(AXIS2_INTF_TO_IMPL(server)->svr_thread,
env);
}
- AXIS2_LOG_INFO((*env)->log, "Successfully terminated HTTP server"
+ AXIS2_LOG_INFO(env->log, "Successfully terminated HTTP server"
" thread");
return AXIS2_SUCCESS;
}
axis2_conf_ctx_t* AXIS2_CALL
axis2_http_server_get_conf_ctx (axis2_transport_receiver_t *server,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(server)->conf_ctx;
@@ -239,20 +239,20 @@
axis2_endpoint_ref_t* AXIS2_CALL
axis2_http_server_get_reply_to_epr(axis2_transport_receiver_t *server,
- axis2_env_t **env, axis2_char_t *svc_name)
+ const axis2_env_t *env, axis2_char_t *svc_name)
{
axis2_endpoint_ref_t *epr = NULL;
axis2_char_t *host_address = NULL;
axis2_char_t *svc_path = NULL;
axis2_url_t *url = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, svc_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
host_address = "127.0.0.1"; /* TODO : get from axis2.xml */
svc_path = AXIS2_STRACAT("/axis2/services/", svc_name, env);
url = axis2_url_create(env, "http", host_address,
AXIS2_INTF_TO_IMPL(server)->port, svc_path);
- AXIS2_FREE((*env)->allocator, svc_path);
+ AXIS2_FREE(env->allocator, svc_path);
if(NULL == url)
{
return NULL;
@@ -264,7 +264,7 @@
axis2_bool_t AXIS2_CALL
axis2_http_server_is_running (axis2_transport_receiver_t *server,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_http_server_impl_t *server_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -284,7 +284,7 @@
* Following block distinguish the exposed part of the dll.
*/
AXIS2_EXPORT int axis2_get_instance(struct axis2_transport_receiver **inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
*inst = axis2_http_server_create(env, NULL, -1);
if(!(*inst))
@@ -297,7 +297,7 @@
}
AXIS2_EXPORT int axis2_remove_instance(axis2_transport_receiver_t *inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Wed May 31 08:54:07 2006
@@ -45,7 +45,7 @@
struct axis2_http_svr_thd_args
{
- axis2_env_t **env;
+ axis2_env_t *env;
axis2_socket_t socket;
axis2_http_worker_t *worker;
};
@@ -57,43 +57,43 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_run(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_destroy(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env);
+ const axis2_env_t *env);
int AXIS2_CALL
axis2_http_svr_thread_get_local_port
(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_http_svr_thread_is_running(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_set_worker(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env, axis2_http_worker_t *worker);
+ const axis2_env_t *env, axis2_http_worker_t *worker);
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_free (axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env);
-AXIS2_DECLARE (axis2_env_t*)
-init_thread_env(axis2_env_t **system_env);
+ const axis2_env_t *env);
+AXIS2_DECLARE (const axis2_env_t*)
+init_thread_env(const axis2_env_t **system_env);
void * AXIS2_THREAD_FUNC
worker_func(axis2_thread_t *thd, void *data);
/***************************** End of function headers ************************/
axis2_http_svr_thread_t* AXIS2_CALL
-axis2_http_svr_thread_create (axis2_env_t **env, int port)
+axis2_http_svr_thread_create (const axis2_env_t *env, int port)
{
axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
svr_thread_impl = (axis2_http_svr_thread_impl_t *)AXIS2_MALLOC
- ((*env)->allocator, sizeof(
+ (env->allocator, sizeof(
axis2_http_svr_thread_impl_t));
if(NULL == svr_thread_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -109,13 +109,13 @@
env);
return NULL;
}
- svr_thread_impl->svr_thread.ops = AXIS2_MALLOC((*env)->allocator,
+ svr_thread_impl->svr_thread.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_svr_thread_ops_t));
if(NULL == svr_thread_impl->svr_thread.ops)
{
axis2_http_svr_thread_free((axis2_http_svr_thread_t*) svr_thread_impl,
env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -136,7 +136,7 @@
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_free (axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -154,16 +154,16 @@
}
svr_thread_impl->stopped = AXIS2_TRUE;
if(NULL != svr_thread->ops)
- AXIS2_FREE((*env)->allocator, svr_thread->ops);
+ AXIS2_FREE(env->allocator, svr_thread->ops);
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(svr_thread));
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(svr_thread));
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_run(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
@@ -180,32 +180,32 @@
svr_thread_impl->listen_socket);
if(NULL == svr_thread_impl->worker)
{
- AXIS2_LOG_WARNING((*env)->log, AXIS2_LOG_SI, "Worker not ready yet."
+ AXIS2_LOG_WARNING(env->log, AXIS2_LOG_SI, "Worker not ready yet."
" Cannot serve the request");
axis2_network_handler_close_socket(env, socket);
continue;
}
- arg_list = AXIS2_MALLOC((*env)->allocator,
+ arg_list = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_svr_thd_args_t));
if(NULL == arg_list)
{
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"Memory allocation error in the svr thread loop");
continue;
}
- arg_list->env = env;
+ arg_list->env = (axis2_env_t*)env;
arg_list->socket = socket;
arg_list->worker = svr_thread_impl->worker;
#ifdef AXIS2_SVR_MULTI_THREADED
- worker_thread = AXIS2_THREAD_POOL_GET_THREAD((*env)->thread_pool,
+ worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
worker_func, (void*)arg_list);
if(NULL == worker_thread)
{
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "Thread creation failed"
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
"server thread loop");
continue;
}
- AXIS2_THREAD_POOL_THREAD_DETACH((*env)->thread_pool, worker_thread);
+ AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
#else
worker_func(NULL, (void*)arg_list);
#endif
@@ -216,7 +216,7 @@
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_destroy(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
@@ -228,7 +228,7 @@
return AXIS2_SUCCESS;
}
svr_thread_impl->stopped = AXIS2_TRUE;
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Terminating HTTP server "
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Terminating HTTP server "
"thread.");
if(svr_thread_impl->listen_socket)
{
@@ -243,7 +243,7 @@
int AXIS2_CALL
axis2_http_svr_thread_get_local_port
(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(svr_thread)->port;
@@ -251,7 +251,7 @@
axis2_bool_t AXIS2_CALL
axis2_http_svr_thread_is_running(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(svr_thread)->port;
@@ -259,10 +259,10 @@
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_set_worker(axis2_http_svr_thread_t *svr_thread,
- axis2_env_t **env, axis2_http_worker_t *worker)
+ const axis2_env_t *env, axis2_http_worker_t *worker)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, worker, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, worker, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(svr_thread)->worker = worker;
return AXIS2_SUCCESS;
}
@@ -281,7 +281,7 @@
double secs = 0;
axis2_http_worker_t *tmp = NULL;
axis2_status_t status = AXIS2_FAILURE;
- axis2_env_t **env = NULL;
+ axis2_env_t *env = NULL;
axis2_socket_t socket;
axis2_env_t *thread_env = NULL;
axis2_http_svr_thd_args_t *arg_list = NULL;
@@ -301,16 +301,16 @@
env = arg_list->env;
thread_env = axis2_init_thread_env(env);
socket = arg_list->socket;
- svr_conn = axis2_simple_http_svr_conn_create(&thread_env, socket);
- AXIS2_SIMPLE_HTTP_SVR_CONN_SET_RCV_TIMEOUT(svr_conn, &thread_env,
+ svr_conn = axis2_simple_http_svr_conn_create(thread_env, socket);
+ AXIS2_SIMPLE_HTTP_SVR_CONN_SET_RCV_TIMEOUT(svr_conn, thread_env,
axis2_http_socket_read_timeout);
- request = AXIS2_SIMPLE_HTTP_SVR_CONN_READ_REQUEST(svr_conn, &thread_env);
+ request = AXIS2_SIMPLE_HTTP_SVR_CONN_READ_REQUEST(svr_conn, thread_env);
tmp = arg_list->worker;
- status = AXIS2_HTTP_WORKER_PROCESS_REQUEST(tmp, &thread_env, svr_conn,
+ status = AXIS2_HTTP_WORKER_PROCESS_REQUEST(tmp, thread_env, svr_conn,
request);
- AXIS2_SIMPLE_HTTP_SVR_CONN_FREE(svr_conn, &thread_env);
+ AXIS2_SIMPLE_HTTP_SVR_CONN_FREE(svr_conn, thread_env);
if (request)
- AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, &thread_env);
+ AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, thread_env);
AXIS2_FREE(thread_env->allocator, arg_list);
AXIS2_PLATFORM_GET_TIME_IN_MILLIS(&t2);
millisecs = t2.millitm - t1.millitm;
@@ -344,7 +344,7 @@
axis2_env_free_masked(thread_env, 0x2);
/*axis2_xml_reader_cleanup();*/
#ifdef AXIS2_SVR_MULTI_THREADED
- AXIS2_THREAD_POOL_EXIT_THREAD((*env)->thread_pool, thd);
+ AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
#endif
return NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org