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 da...@apache.org on 2006/02/10 07:48:28 UTC
svn commit: r376579 [2/4] - in /webservices/axis2/trunk/c:
modules/core/addr/ modules/core/clientapi/ modules/core/context/
modules/core/deployment/ modules/core/description/ modules/core/engine/
modules/core/transport/http/ modules/core/transport/http...
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c?rev=376579&r1=376578&r2=376579&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 Thu Feb 9 22:48:20 2006
@@ -144,7 +144,7 @@
axis2_http_simple_response_t *ret = NULL;
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_FUNC_PARAM_CHECK(status_line, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
ret = axis2_http_simple_response_create_default(env);
if(NULL == ret)
@@ -245,7 +245,7 @@
axis2_env_t **env)
{
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
simple_response_impl = AXIS2_INTF_TO_IMPL(simple_response);
if(NULL != simple_response_impl->status_line)
@@ -288,7 +288,7 @@
{
axis2_char_t *tmp_status_line_str = NULL;
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ 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);
@@ -322,7 +322,7 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
if(NULL == AXIS2_INTF_TO_IMPL(simple_response)->status_line)
{
return NULL;
@@ -337,7 +337,7 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(NULL == AXIS2_INTF_TO_IMPL(simple_response)->status_line)
{
return -1;
@@ -352,7 +352,7 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
if(NULL == AXIS2_INTF_TO_IMPL(simple_response)->status_line)
{
return NULL;
@@ -367,7 +367,7 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
if(NULL == AXIS2_INTF_TO_IMPL(simple_response)->status_line)
{
return NULL;
@@ -382,7 +382,7 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(simple_response)->header_group;
}
@@ -399,7 +399,7 @@
int count = 0;
axis2_array_list_t *header_group = NULL;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, str, NULL);
simple_response_impl = AXIS2_INTF_TO_IMPL(simple_response);
@@ -441,7 +441,7 @@
int i = 0;
int count = 0;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, str, AXIS2_FAILURE);
header_group = AXIS2_INTF_TO_IMPL(simple_response)->
@@ -485,7 +485,7 @@
axis2_array_list_t *header_group = NULL;
axis2_http_simple_response_impl_t *simple_response_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, header, AXIS2_FAILURE);
simple_response_impl = AXIS2_INTF_TO_IMPL
@@ -529,7 +529,7 @@
axis2_env_t **env)
{
axis2_http_header_t *tmp_header = NULL;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
tmp_header = axis2_http_simple_response_get_first_header
(simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if(NULL != tmp_header)
@@ -554,7 +554,7 @@
axis2_env_t **env)
{
axis2_http_header_t *tmp_header = NULL;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
tmp_header = axis2_http_simple_response_get_first_header
(simple_response, env, AXIS2_HTTP_HEADER_CONTENT_LENGTH);
if(NULL != tmp_header)
@@ -571,7 +571,7 @@
axis2_env_t **env)
{
axis2_http_header_t *tmp_header = NULL;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
tmp_header = axis2_http_simple_response_get_first_header
(simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if(NULL != tmp_header)
@@ -587,7 +587,7 @@
axis2_env_t **env, axis2_char_t *str)
{
axis2_stream_t *body_stream = NULL;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, str, AXIS2_FAILURE);
body_stream = AXIS2_INTF_TO_IMPL(simple_response)->stream;
@@ -609,7 +609,7 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env, axis2_stream_t *stream)
{
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
/*
* We don't free the stream
* Problem in freeing is most of the time the stream doesn't belong
@@ -626,7 +626,7 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(simple_response)->stream;
}
@@ -640,7 +640,7 @@
axis2_stream_t *tmp_stream = NULL;
int return_size = -1;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
response_impl = AXIS2_INTF_TO_IMPL(simple_response);
@@ -690,7 +690,7 @@
int count = 0;
int i = 0;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
simple_response_impl = AXIS2_INTF_TO_IMPL(
simple_response);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c?rev=376579&r1=376578&r2=376579&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 Thu Feb 9 22:48:20 2006
@@ -75,8 +75,6 @@
axis2_http_status_line_impl_t *status_line_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_FUNC_PARAM_CHECK(str, env, NULL);
-
status_line_impl = (axis2_http_status_line_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(
@@ -191,7 +189,7 @@
axis2_env_t **env)
{
axis2_http_status_line_impl_t *status_line_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(status_line, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
status_line_impl = AXIS2_INTF_TO_IMPL(status_line);
if(NULL != status_line_impl->line)
@@ -226,7 +224,7 @@
axis2_http_status_line_get_status_code (axis2_http_status_line_t *status_line,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(status_line, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(status_line)->status_code)
{
return atoi(AXIS2_INTF_TO_IMPL(status_line)->status_code);
@@ -243,7 +241,7 @@
axis2_http_status_line_get_http_version (axis2_http_status_line_t *status_line,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(status_line, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(status_line)->http_version;
}
@@ -252,7 +250,7 @@
axis2_http_status_line_get_reason_phrase (axis2_http_status_line_t *status_line,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(status_line, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(status_line)->reason_phrase;
}
@@ -261,7 +259,7 @@
axis2_http_status_line_starts_with_http (axis2_http_status_line_t *status_line,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(status_line, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(0 == AXIS2_STRNCASECMP(AXIS2_INTF_TO_IMPL(status_line)->line, "HTTP", 4))
{
return AXIS2_TRUE;
@@ -273,6 +271,6 @@
axis2_http_status_line_to_string (axis2_http_status_line_t *status_line,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(status_line, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(status_line)->line;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?rev=376579&r1=376578&r2=376579&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 Thu Feb 9 22:48:20 2006
@@ -109,7 +109,7 @@
axis2_status_t AXIS2_CALL
axis2_http_worker_free (axis2_http_worker_t *http_worker, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(http_worker, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(http_worker)->conf_ctx = NULL;
@@ -145,7 +145,7 @@
axis2_char_t *encoding_header_value = NULL;
axis2_op_ctx_t *op_ctx = NULL;
- AXIS2_FUNC_PARAM_CHECK(http_worker, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, svr_conn, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, simple_request, AXIS2_FAILURE);
@@ -375,7 +375,7 @@
{
axis2_http_header_t *conn_header = NULL;
- AXIS2_FUNC_PARAM_CHECK(http_worker, env, AXIS2_FAILURE);
+ 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);
@@ -465,7 +465,7 @@
axis2_conf_t *config = NULL;
axis2_hash_t *tranport_outs = NULL;
- AXIS2_FUNC_PARAM_CHECK(http_worker, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, simple_response, AXIS2_FAILURE);
@@ -487,7 +487,7 @@
int hdr_count = 0;
int i = 0;
axis2_hash_t *header_map = NULL;
- AXIS2_FUNC_PARAM_CHECK(http_worker, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, request, AXIS2_FAILURE);
header_list = AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(request, env);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?rev=376579&r1=376578&r2=376579&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 Thu Feb 9 22:48:20 2006
@@ -90,7 +90,7 @@
axis2_http_response_writer_t* AXIS2_CALL
axis2_http_response_writer_create (axis2_env_t **env, axis2_stream_t *stream)
{
- AXIS2_FUNC_PARAM_CHECK(stream, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return axis2_http_response_writer_create_with_encoding(env, stream,
AXIS2_HTTP_DEFAULT_CONTENT_CHARSET);
@@ -101,7 +101,7 @@
axis2_stream_t *stream, const axis2_char_t *encoding)
{
axis2_http_response_writer_impl_t *response_writer_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(stream, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, encoding, NULL);
response_writer_impl = (axis2_http_response_writer_impl_t *)AXIS2_MALLOC
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?rev=376579&r1=376578&r2=376579&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 Thu Feb 9 22:48:20 2006
@@ -124,7 +124,7 @@
axis2_env_t **env)
{
axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(svr_thread, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svr_thread_impl = AXIS2_INTF_TO_IMPL(svr_thread);
if(NULL != svr_thread_impl->worker)
@@ -152,7 +152,7 @@
{
axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(svr_thread, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svr_thread_impl = AXIS2_INTF_TO_IMPL(svr_thread);
while(AXIS2_FALSE == svr_thread_impl->stopped)
@@ -212,7 +212,7 @@
{
axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(svr_thread, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
svr_thread_impl = AXIS2_INTF_TO_IMPL(svr_thread);
if(AXIS2_TRUE == svr_thread_impl->stopped)
@@ -236,7 +236,7 @@
(axis2_http_svr_thread_t *svr_thread,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(svr_thread, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(svr_thread)->port;
}
@@ -244,7 +244,7 @@
axis2_http_svr_thread_is_running(axis2_http_svr_thread_t *svr_thread,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(svr_thread, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(svr_thread)->port;
}
@@ -252,7 +252,7 @@
axis2_http_svr_thread_set_worker(axis2_http_svr_thread_t *svr_thread,
axis2_env_t **env, axis2_http_worker_t *worker)
{
- AXIS2_FUNC_PARAM_CHECK(svr_thread, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, worker, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(svr_thread)->worker = worker;
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c Thu Feb 9 22:48:20 2006
@@ -183,7 +183,7 @@
axis2_env_t **env)
{
axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
AXIS2_STREAM_FREE(svr_conn_impl->stream, env);
@@ -201,7 +201,7 @@
axis2_env_t **env)
{
axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
if(-1 != svr_conn_impl->socket)
{
@@ -220,7 +220,7 @@
(axis2_simple_http_svr_conn_t *svr_conn,
axis2_env_t **env, axis2_bool_t keep_alive)
{
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(svr_conn)->keep_alive = keep_alive;
return AXIS2_SUCCESS;
}
@@ -230,7 +230,7 @@
axis2_simple_http_svr_conn_is_keep_alive(axis2_simple_http_svr_conn_t *svr_conn,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(svr_conn)->keep_alive;
}
@@ -240,7 +240,7 @@
axis2_simple_http_svr_conn_get_stream(axis2_simple_http_svr_conn_t *svr_conn,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(svr_conn)->stream;
}
@@ -249,7 +249,7 @@
axis2_simple_http_svr_conn_get_writer(axis2_simple_http_svr_conn_t *svr_conn,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return axis2_http_response_writer_create(env,
AXIS2_INTF_TO_IMPL(svr_conn)->stream);
@@ -269,7 +269,7 @@
axis2_http_request_line_t *request_line = NULL;
axis2_http_simple_request_t *request = NULL;
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
memset(str_line, 0, 1024);
@@ -355,7 +355,7 @@
axis2_char_t *status_line = NULL;
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, response, AXIS2_FAILURE);
svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
@@ -457,7 +457,7 @@
(axis2_simple_http_svr_conn_t *svr_conn,
axis2_env_t **env, int timeout)
{
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return axis2_network_handler_set_sock_option(env,
AXIS2_INTF_TO_IMPL(svr_conn)->socket, SO_RCVTIMEO,
timeout);
@@ -470,7 +470,7 @@
(axis2_simple_http_svr_conn_t *svr_conn,
axis2_env_t **env, int timeout)
{
- AXIS2_FUNC_PARAM_CHECK(svr_conn, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return axis2_network_handler_set_sock_option(env,
AXIS2_INTF_TO_IMPL(svr_conn)->socket, SO_SNDTIMEO,
timeout);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Thu Feb 9 22:48:20 2006
@@ -122,7 +122,7 @@
axis2_http_client_free (axis2_http_client_t *client, axis2_env_t **env)
{
axis2_http_client_impl_t *http_client_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(client, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
http_client_impl = AXIS2_INTF_TO_IMPL(client);
if(NULL != http_client_impl->url)
@@ -168,7 +168,7 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_bool_t chunking_enabled = AXIS2_FALSE;
- AXIS2_FUNC_PARAM_CHECK(client, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
client_impl = AXIS2_INTF_TO_IMPL(client);
if(NULL == client_impl->url)
@@ -324,7 +324,7 @@
axis2_bool_t end_of_line = AXIS2_FALSE;
axis2_bool_t end_of_headers = AXIS2_FALSE;
- AXIS2_FUNC_PARAM_CHECK(client, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
client_impl = AXIS2_INTF_TO_IMPL(client);
if(-1 == client_impl->sockfd || NULL == client_impl->data_stream ||
@@ -414,7 +414,7 @@
axis2_http_simple_response_t* AXIS2_CALL
axis2_http_client_get_response (axis2_http_client_t *client, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(client, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(client)->response;
}
@@ -422,7 +422,7 @@
axis2_http_client_set_url (axis2_http_client_t *client,
axis2_env_t **env, axis2_url_t *url)
{
- AXIS2_FUNC_PARAM_CHECK(client, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, url, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(client)->url)
{
@@ -436,7 +436,7 @@
axis2_url_t* AXIS2_CALL
axis2_http_client_get_url (axis2_http_client_t *client, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(client, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(client)->url;
}
@@ -444,7 +444,7 @@
axis2_http_client_set_timeout (axis2_http_client_t *client, axis2_env_t **env,
int timeout_ms)
{
- AXIS2_FUNC_PARAM_CHECK(client, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(client)->timeout = timeout_ms;
return AXIS2_SUCCESS;
}
@@ -452,6 +452,6 @@
int AXIS2_CALL
axis2_http_client_get_timeout (axis2_http_client_t *client, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(client, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(client)->timeout;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/url.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/url.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/url.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/url.c Thu Feb 9 22:48:20 2006
@@ -260,7 +260,7 @@
axis2_url_free (axis2_url_t *url, axis2_env_t **env)
{
axis2_url_impl_t *url_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(url, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
url_impl = AXIS2_INTF_TO_IMPL(url);
if(NULL != url_impl->protocol)
{
@@ -293,7 +293,7 @@
axis2_url_impl_t *url_impl = NULL;
axis2_char_t *external_form = NULL;
axis2_ssize_t len = 0;
- AXIS2_FUNC_PARAM_CHECK(url, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
url_impl = AXIS2_INTF_TO_IMPL(url);
len = AXIS2_STRLEN(url_impl->protocol) +
AXIS2_STRLEN(url_impl->server) + AXIS2_STRLEN(url_impl->path) +
@@ -310,7 +310,7 @@
axis2_url_set_protocol(axis2_url_t *url, axis2_env_t **env,
axis2_char_t *protocol)
{
- AXIS2_FUNC_PARAM_CHECK(url, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, protocol, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(url)->protocol)
{
@@ -325,7 +325,7 @@
axis2_char_t* AXIS2_CALL
axis2_url_get_protocol (axis2_url_t *url, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(url, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(url)->protocol;
}
@@ -333,7 +333,7 @@
axis2_url_set_server(axis2_url_t *url, axis2_env_t **env,
axis2_char_t *server)
{
- AXIS2_FUNC_PARAM_CHECK(url, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, server, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(url)->server)
{
@@ -348,7 +348,7 @@
axis2_char_t* AXIS2_CALL
axis2_url_get_server (axis2_url_t *url, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(url, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(url)->server;
}
@@ -356,7 +356,7 @@
axis2_url_set_port(axis2_url_t *url, axis2_env_t **env,
int port)
{
- AXIS2_FUNC_PARAM_CHECK(url, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(url)->port = port;
return AXIS2_SUCCESS;
}
@@ -365,7 +365,7 @@
int AXIS2_CALL
axis2_url_get_port (axis2_url_t *url, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(url, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(url)->port;
}
@@ -373,7 +373,7 @@
axis2_url_set_path(axis2_url_t *url, axis2_env_t **env,
axis2_char_t *path)
{
- AXIS2_FUNC_PARAM_CHECK(url, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, path, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(url)->path)
{
@@ -388,6 +388,6 @@
axis2_char_t* AXIS2_CALL
axis2_url_get_path (axis2_url_t *url, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(url, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(url)->path;
}
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Thu Feb 9 22:48:20 2006
@@ -140,7 +140,7 @@
axis2_soap_envelope_t *soap_envelope = NULL;
axis2_soap_header_t *soap_header = NULL;
- AXIS2_FUNC_PARAM_CHECK(handler, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
/*op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
@@ -219,8 +219,6 @@
axis2_om_element_t *element = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_FUNC_PARAM_CHECK(soap_header, env, AXIS2_FAILURE);
- AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
node = AXIS2_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
if (node && AXIS2_OM_NODE_GET_NODE_TYPE(node, env) == AXIS2_OM_ELEMENT)
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Thu Feb 9 22:48:20 2006
@@ -125,7 +125,7 @@
axis2_msg_info_headers_t *msg_info_headers = NULL;
axis2_ctx_t *ctx = NULL;
- AXIS2_FUNC_PARAM_CHECK (handler, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK ((*env)->error, msg_ctx, AXIS2_FAILURE);
msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS (msg_ctx, env);
Modified: webservices/axis2/trunk/c/modules/util/array_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/array_list.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/array_list.c (original)
+++ webservices/axis2/trunk/c/modules/util/array_list.c Thu Feb 9 22:48:20 2006
@@ -168,7 +168,7 @@
{
axis2_array_list_impl_t *array_list_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
array_list_impl = AXIS2_INTF_TO_IMPL(array_list);
@@ -189,19 +189,19 @@
int AXIS2_CALL axis2_array_list_size(struct axis2_array_list *array_list, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(array_list)->size;
}
axis2_bool_t AXIS2_CALL axis2_array_list_is_empty(struct axis2_array_list *array_list, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(array_list)->size == 0;
}
axis2_bool_t AXIS2_CALL axis2_array_list_contains(struct axis2_array_list *array_list, axis2_env_t **env, void *e)
{
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return axis2_array_list_index_of(array_list, env, e) != -1;
}
@@ -210,7 +210,7 @@
axis2_array_list_impl_t *array_list_impl = NULL;
int i = 0;
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
array_list_impl = AXIS2_INTF_TO_IMPL(array_list);
for (i = 0; i < array_list_impl->size; i++)
@@ -223,7 +223,7 @@
{
axis2_array_list_impl_t *array_list_impl = NULL;
int i = 0;
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
array_list_impl = AXIS2_INTF_TO_IMPL(array_list);
for (i = array_list_impl->size - 1; i >= 0; i--)
@@ -234,13 +234,13 @@
void** AXIS2_CALL axis2_array_list_to_array(struct axis2_array_list *array_list, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(array_list, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(array_list)->data;
}
void* AXIS2_CALL axis2_array_list_get(struct axis2_array_list *array_list, axis2_env_t **env, int index)
{
- AXIS2_FUNC_PARAM_CHECK(array_list, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
if (axis2_array_list_check_bound_exclusive(array_list, env, index) )
return AXIS2_INTF_TO_IMPL(array_list)->data[index];
else
@@ -252,7 +252,7 @@
void* result = NULL;
axis2_array_list_impl_t *array_list_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(array_list, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
array_list_impl = AXIS2_INTF_TO_IMPL(array_list);
@@ -269,7 +269,7 @@
{
axis2_array_list_impl_t *array_list_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
array_list_impl = AXIS2_INTF_TO_IMPL(array_list);
@@ -285,7 +285,7 @@
int i = 0;
axis2_array_list_impl_t *array_list_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
array_list_impl = AXIS2_INTF_TO_IMPL(array_list);
@@ -315,7 +315,7 @@
int i = 0;
axis2_array_list_impl_t *array_list_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(array_list, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
array_list_impl = AXIS2_INTF_TO_IMPL(array_list);
@@ -332,7 +332,7 @@
axis2_bool_t AXIS2_CALL axis2_array_list_check_bound_inclusive(struct axis2_array_list *array_list, axis2_env_t **env, int index)
{
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (index < 0 || index > AXIS2_INTF_TO_IMPL(array_list)->size)
{
@@ -344,7 +344,7 @@
axis2_bool_t AXIS2_CALL axis2_array_list_check_bound_exclusive(struct axis2_array_list *array_list, axis2_env_t **env, int index)
{
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (index < 0 || index >= AXIS2_INTF_TO_IMPL(array_list)->size)
{
@@ -358,7 +358,7 @@
{
axis2_array_list_impl_t *array_list_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(array_list, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
array_list_impl = AXIS2_INTF_TO_IMPL(array_list);
Modified: webservices/axis2/trunk/c/modules/util/file.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/file.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/file.c (original)
+++ webservices/axis2/trunk/c/modules/util/file.c Thu Feb 9 22:48:20 2006
@@ -169,7 +169,7 @@
{
axis2_file_impl_t *file_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(file, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
file_impl = AXIS2_INTF_TO_IMPL(file);
if(!file_impl->name)
@@ -216,7 +216,7 @@
{
axis2_file_impl_t *file_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(file, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
file_impl = AXIS2_INTF_TO_IMPL(file);
if(!(file_impl->path))
Modified: webservices/axis2/trunk/c/modules/util/qname.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/qname.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/qname.c (original)
+++ webservices/axis2/trunk/c/modules/util/qname.c Thu Feb 9 22:48:20 2006
@@ -189,7 +189,7 @@
axis2_env_t **env)
{
axis2_qname_impl_t *qname_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(qname, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
qname_impl = AXIS2_INTF_TO_IMPL(qname);
if (qname_impl->localpart)
@@ -232,7 +232,7 @@
int uris_differ = 0;
int localparts_differ = 0;
- AXIS2_FUNC_PARAM_CHECK(qname ,env, AXIS2_FALSE);
+ AXIS2_ENV_CHECK(env, AXIS2_FALSE);
if (!qname1)
{
@@ -274,7 +274,7 @@
axis2_env_t **env)
{
axis2_qname_impl_t *qname_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(qname, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
qname_impl = AXIS2_INTF_TO_IMPL(qname);
return axis2_qname_create(env, qname_impl->localpart,
qname_impl->namespace_uri,
@@ -287,7 +287,7 @@
axis2_qname_get_uri(axis2_qname_t *qname,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(qname, env,NULL);
+ AXIS2_ENV_CHECK(env,NULL);
return AXIS2_INTF_TO_IMPL(qname)->namespace_uri;
}
@@ -295,7 +295,7 @@
axis2_qname_get_prefix(axis2_qname_t *qname,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(qname, env,NULL);
+ AXIS2_ENV_CHECK(env,NULL);
return AXIS2_INTF_TO_IMPL(qname)->prefix;
}
@@ -304,7 +304,7 @@
axis2_qname_get_localpart(axis2_qname_t *qname,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(qname, env,NULL);
+ AXIS2_ENV_CHECK(env,NULL);
return AXIS2_INTF_TO_IMPL(qname)->localpart;
}
@@ -313,7 +313,7 @@
axis2_env_t **env)
{
axis2_qname_impl_t *qname_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(qname, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
qname_impl = AXIS2_INTF_TO_IMPL(qname);
if(qname_impl->qname_string)
{
Modified: webservices/axis2/trunk/c/modules/util/stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/stream.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/stream.c Thu Feb 9 22:48:20 2006
@@ -146,7 +146,7 @@
axis2_stream_free (axis2_stream_t *stream, axis2_env_t **env)
{
axis2_stream_impl_t *stream_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
@@ -192,7 +192,7 @@
axis2_stream_type_t AXIS2_CALL
axis2_stream_get_type (axis2_stream_t *stream, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(stream)->stream_type;
}
@@ -242,7 +242,7 @@
int len = 0;
char *buf = NULL;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
buf = AXIS2_INTF_TO_IMPL(stream)->buffer;
if(NULL == buf)
@@ -280,7 +280,7 @@
axis2_stream_impl_t *stream_impl = NULL;
int new_len = 0;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if (NULL == buffer)
return -1;
@@ -316,7 +316,7 @@
int AXIS2_CALL
axis2_stream_get_len_basic (axis2_stream_t *stream, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(stream)->len;
}
@@ -325,7 +325,7 @@
{
axis2_stream_impl_t *stream_impl = NULL;
int del_len = 0;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
if(count > 0)
@@ -353,7 +353,7 @@
axis2_char_t *buf = NULL;
int ret = -1;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
buf = AXIS2_INTF_TO_IMPL(stream)->buffer;
if(AXIS2_INTF_TO_IMPL(stream)->len <= 0)
{
@@ -373,7 +373,7 @@
axis2_stream_impl_t *stream_impl = NULL;
int new_len = 0;
axis2_char_t *tmp = NULL;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
new_len = stream_impl->len + 1;
@@ -440,7 +440,7 @@
void *buffer, size_t count)
{
FILE *fp = NULL;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(NULL == AXIS2_INTF_TO_IMPL(stream)->fp)
{
@@ -468,7 +468,7 @@
return -1;
}
fp = AXIS2_INTF_TO_IMPL(stream)->fp;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if (NULL == buffer)
return -1;
len = fwrite(buffer, sizeof(axis2_char_t), count, fp);
@@ -479,7 +479,7 @@
int AXIS2_CALL
axis2_stream_get_len_file (axis2_stream_t *stream, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return -1;
}
@@ -489,7 +489,7 @@
axis2_stream_impl_t *stream_impl = NULL;
axis2_char_t c = -1;
int i = count;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(NULL == AXIS2_INTF_TO_IMPL(stream)->fp)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
@@ -505,7 +505,7 @@
int AXIS2_CALL
axis2_stream_get_char_file (axis2_stream_t *stream, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(NULL == AXIS2_INTF_TO_IMPL(stream)->fp)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
@@ -518,7 +518,7 @@
axis2_stream_unget_char_file (axis2_stream_t *stream, axis2_env_t **env,
int ch)
{
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(NULL == AXIS2_INTF_TO_IMPL(stream)->fp)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
@@ -567,7 +567,7 @@
void *buffer, size_t count)
{
int len = 0;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{
@@ -590,7 +590,7 @@
{
int len = 0;
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{
@@ -609,7 +609,7 @@
int AXIS2_CALL
axis2_stream_get_len_socket (axis2_stream_t *stream, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return -1;
}
@@ -619,7 +619,7 @@
axis2_stream_impl_t *stream_impl = NULL;
int len = 0;
char buffer[2];
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
@@ -638,7 +638,7 @@
int AXIS2_CALL
axis2_stream_get_char_socket (axis2_stream_t *stream, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SOCKET,
@@ -652,7 +652,7 @@
axis2_stream_unget_char_socket (axis2_stream_t *stream, axis2_env_t **env,
int ch)
{
- AXIS2_FUNC_PARAM_CHECK(stream, env, AXIS2_CRTICAL_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SOCKET,
Modified: webservices/axis2/trunk/c/modules/util/string.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/string.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/string.c (original)
+++ webservices/axis2/trunk/c/modules/util/string.c Thu Feb 9 22:48:20 2006
@@ -24,7 +24,7 @@
AXIS2_DECLARE(void*)
axis2_strdup (const void *ptr, axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(ptr, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
if (ptr)
{
int len = strlen(ptr);
Modified: webservices/axis2/trunk/c/modules/util/utils.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/utils.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/utils.c (original)
+++ webservices/axis2/trunk/c/modules/util/utils.c Thu Feb 9 22:48:20 2006
@@ -28,7 +28,7 @@
axis2_char_t *service_str = NULL;
axis2_char_t *tmp = NULL;
int i = 0;
- AXIS2_FUNC_PARAM_CHECK(request, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
ret = AXIS2_MALLOC((*env)->allocator,
2*(sizeof(axis2_char_t *)));
memset(ret, 0, 2*sizeof(axis2_char_t*));
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_msg_ref.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_msg_ref.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_msg_ref.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_msg_ref.c Thu Feb 9 22:48:20 2006
@@ -135,7 +135,7 @@
{
axis2_wsdl_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_msg_ref, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
binding_msg_ref_impl = AXIS2_INTF_TO_IMPL(binding_msg_ref);
@@ -171,7 +171,7 @@
axis2_wsdl_binding_msg_ref_get_direction(axis2_wsdl_binding_msg_ref_t *binding_msg_ref,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(binding_msg_ref, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(binding_msg_ref)->direction;
}
@@ -182,7 +182,7 @@
{
axis2_wsdl_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_msg_ref, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, direction, AXIS2_FAILURE);
binding_msg_ref_impl = AXIS2_INTF_TO_IMPL(binding_msg_ref);
@@ -200,7 +200,7 @@
axis2_wsdl_binding_msg_ref_get_msg_label(axis2_wsdl_binding_msg_ref_t *binding_msg_ref,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(binding_msg_ref, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(binding_msg_ref)->msg_label;
}
@@ -211,7 +211,7 @@
{
axis2_wsdl_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_msg_ref, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_label, AXIS2_FAILURE);
binding_msg_ref_impl = AXIS2_INTF_TO_IMPL(binding_msg_ref);
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_op.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_op.c Thu Feb 9 22:48:20 2006
@@ -240,7 +240,7 @@
{
axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
@@ -310,7 +310,7 @@
axis2_wsdl_binding_op_get_input(axis2_wsdl_binding_op_t *binding_op,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(binding_op)->input;
}
@@ -321,7 +321,7 @@
{
axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, input, AXIS2_FAILURE);
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
@@ -338,7 +338,7 @@
axis2_wsdl_binding_op_get_op(axis2_wsdl_binding_op_t *binding_op,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(binding_op)->op;
}
@@ -350,7 +350,7 @@
axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
axis2_op_t *optr = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
@@ -369,7 +369,7 @@
axis2_wsdl_binding_op_get_output(axis2_wsdl_binding_op_t *binding_op,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(binding_op)->output;
}
@@ -380,7 +380,7 @@
{
axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, output, AXIS2_FAILURE);
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
@@ -397,7 +397,7 @@
axis2_wsdl_binding_op_get_qname(axis2_wsdl_binding_op_t *binding_op,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(binding_op)->qname;
}
@@ -408,7 +408,7 @@
{
axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
@@ -427,7 +427,7 @@
axis2_env_t **env,
axis2_wsdl_binding_fault_t *in_fault)
{
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, in_fault, AXIS2_FAILURE);
return AXIS2_LINKED_LIST_ADD(AXIS2_INTF_TO_IMPL(binding_op)->in_faults,
@@ -441,7 +441,7 @@
{
axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, out_fault, AXIS2_FAILURE);
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
@@ -454,7 +454,7 @@
axis2_wsdl_binding_op_get_in_faults(axis2_wsdl_binding_op_t *binding_op,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(binding_op)->in_faults;
}
@@ -465,7 +465,7 @@
{
axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, in_faults, AXIS2_FAILURE);
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
@@ -498,7 +498,7 @@
axis2_wsdl_binding_op_get_out_faults(axis2_wsdl_binding_op_t *binding_op,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(binding_op)->out_faults;
}
@@ -509,7 +509,7 @@
{
axis2_wsdl_binding_op_impl_t *binding_op_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(binding_op, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, out_faults, AXIS2_FAILURE);
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_component.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_component.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_component.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_component.c Thu Feb 9 22:48:20 2006
@@ -155,7 +155,7 @@
{
axis2_wsdl_extensible_component_impl_t *extensible_component_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(extensible_component, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
extensible_component_impl = AXIS2_INTF_TO_IMPL(extensible_component);
@@ -228,7 +228,7 @@
{
axis2_wsdl_extensible_component_impl_t *extensible_component_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(extensible_component, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, wsdl_feature, AXIS2_FAILURE);
extensible_component_impl = AXIS2_INTF_TO_IMPL(extensible_component);
@@ -248,7 +248,7 @@
axis2_wsdl_extensible_component_t *extensible_component,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(extensible_component, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(extensible_component)->features;
}
@@ -261,7 +261,7 @@
{
axis2_wsdl_extensible_component_impl_t *extensible_component_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(extensible_component, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, wsdl_property, AXIS2_FAILURE);
extensible_component_impl = AXIS2_INTF_TO_IMPL(extensible_component);
@@ -281,7 +281,7 @@
axis2_wsdl_extensible_component_t *extensible_component,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(extensible_component, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(extensible_component)->properties;
}
Modified: webservices/axis2/trunk/c/modules/xml/om/om_attribute.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_attribute.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_attribute.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_attribute.c Thu Feb 9 22:48:20 2006
@@ -161,7 +161,7 @@
{
axis2_om_attribute_impl_t *attribute_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_attribute, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
attribute_impl = AXIS2_INTF_TO_IMPL(om_attribute);
if (attribute_impl->localname)
@@ -190,7 +190,7 @@
{
axis2_qname_t *qname = NULL;
axis2_om_attribute_impl_t *attribute_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_attribute, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
attribute_impl = AXIS2_INTF_TO_IMPL(om_attribute);
if(!(attribute_impl->qname))
{
@@ -221,7 +221,7 @@
axis2_om_attribute_impl_t *attribute = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_attribute, env,AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
if (!om_output)
{
@@ -261,7 +261,7 @@
axis2_om_attribute_get_localname(axis2_om_attribute_t *om_attribute,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_attribute, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_attribute)->localname;
}
@@ -270,7 +270,7 @@
axis2_om_attribute_get_value(axis2_om_attribute_t *om_attribute,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_attribute, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_attribute)->value;
}
@@ -278,7 +278,7 @@
axis2_om_attribute_get_namespace(axis2_om_attribute_t *om_attribute,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_attribute, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_attribute)->ns;
}
@@ -287,7 +287,7 @@
axis2_env_t **env,
const axis2_char_t *localname)
{
- AXIS2_FUNC_PARAM_CHECK(om_attribute, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(!localname)
{
AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM);
@@ -303,7 +303,7 @@
axis2_env_t **env,
const axis2_char_t *value)
{
- AXIS2_FUNC_PARAM_CHECK(om_attribute, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(!value)
{
AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM);
@@ -319,7 +319,7 @@
axis2_env_t **env,
axis2_om_namespace_t *om_namespace)
{
- AXIS2_FUNC_PARAM_CHECK(om_attribute, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(!om_namespace)
{
AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM);
Modified: webservices/axis2/trunk/c/modules/xml/om/om_child_element_iterator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_child_element_iterator.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_child_element_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_child_element_iterator.c Thu Feb 9 22:48:20 2006
@@ -63,7 +63,7 @@
axis2_om_node_t *current_child)
{
axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(current_child, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
iterator_impl = (axis2_om_child_element_iterator_impl_t *)AXIS2_MALLOC(
(*env)->allocator,
@@ -111,7 +111,7 @@
(axis2_om_child_element_iterator_t *iterator,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(iterator->ops)
AXIS2_FREE((*env)->allocator, iterator->ops);
@@ -125,7 +125,7 @@
axis2_env_t **env)
{
axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
if(!(iterator_impl->next_called))
@@ -147,7 +147,7 @@
axis2_env_t **env)
{
axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
return iterator_impl->current_child ? AXIS2_TRUE : AXIS2_FALSE;
@@ -159,7 +159,7 @@
axis2_env_t **env)
{
axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
iterator_impl->next_called = AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/modules/xml/om/om_children_iterator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_children_iterator.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_children_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_children_iterator.c Thu Feb 9 22:48:20 2006
@@ -59,7 +59,7 @@
axis2_om_node_t *current_child)
{
axis2_om_children_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(current_child, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
iterator_impl = (axis2_om_children_iterator_impl_t *)AXIS2_MALLOC(
(*env)->allocator,
@@ -102,7 +102,7 @@
axis2_om_children_iterator_free(axis2_om_children_iterator_t *iterator,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(iterator->ops)
AXIS2_FREE((*env)->allocator, iterator->ops);
@@ -115,7 +115,7 @@
axis2_env_t **env)
{
axis2_om_children_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
if(!(iterator_impl->next_called))
@@ -136,7 +136,7 @@
axis2_env_t **env)
{
axis2_om_children_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
return iterator_impl->current_child ? AXIS2_TRUE : AXIS2_FALSE;
@@ -147,7 +147,7 @@
axis2_env_t **env)
{
axis2_om_children_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
iterator_impl->next_called = AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c Thu Feb 9 22:48:20 2006
@@ -130,7 +130,7 @@
axis2_env_t **env)
{
axis2_om_children_qname_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
@@ -150,7 +150,7 @@
axis2_env_t **env)
{
axis2_om_children_qname_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
if(!(iterator_impl->next_called))
@@ -172,7 +172,7 @@
axis2_env_t **env)
{
axis2_om_children_qname_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FALSE);
+ AXIS2_ENV_CHECK( env, AXIS2_FALSE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
@@ -223,7 +223,7 @@
axis2_env_t **env)
{
axis2_om_children_qname_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, NULL);
+ AXIS2_ENV_CHECK( env, NULL);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
Modified: webservices/axis2/trunk/c/modules/xml/om/om_children_with_specific_attribute_iterator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_children_with_specific_attribute_iterator.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_children_with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_children_with_specific_attribute_iterator.c Thu Feb 9 22:48:20 2006
@@ -128,7 +128,7 @@
axis2_om_children_with_specific_attribute_iterator_t *iterator,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(iterator->ops)
AXIS2_FREE((*env)->allocator, iterator->ops);
@@ -142,7 +142,7 @@
axis2_env_t **env)
{
axis2_om_children_with_specific_attribute_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
if(!(iterator_impl->next_called))
@@ -168,7 +168,7 @@
axis2_om_children_with_specific_attribute_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
if(!(iterator_impl->current_child))
{
@@ -221,7 +221,7 @@
axis2_env_t **env)
{
axis2_om_children_with_specific_attribute_iterator_impl_t *iterator_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(iterator, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
iterator_impl->next_called = AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/modules/xml/om/om_comment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_comment.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_comment.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_comment.c Thu Feb 9 22:48:20 2006
@@ -127,7 +127,7 @@
axis2_env_t **env)
{
axis2_om_comment_impl_t *comment_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_comment, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
comment_impl = AXIS2_INTF_TO_IMPL(om_comment);
if (comment_impl->value)
@@ -144,7 +144,7 @@
axis2_om_comment_get_value(axis2_om_comment_t *om_comment,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_comment, env, NULL);
+ AXIS2_ENV_CHECK( env, NULL);
return AXIS2_INTF_TO_IMPL(om_comment)->value;
}
@@ -154,7 +154,7 @@
axis2_env_t **env,
const axis2_char_t *value)
{
- AXIS2_FUNC_PARAM_CHECK(om_comment, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_comment)->value = (axis2_char_t*)AXIS2_STRDUP(value,env);
return AXIS2_SUCCESS;
@@ -167,7 +167,7 @@
{
axis2_om_comment_impl_t *comment_impl;
- AXIS2_FUNC_PARAM_CHECK(om_comment, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, om_output, AXIS2_FAILURE);
comment_impl = AXIS2_INTF_TO_IMPL(om_comment);
Modified: webservices/axis2/trunk/c/modules/xml/om/om_doctype.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_doctype.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_doctype.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_doctype.c Thu Feb 9 22:48:20 2006
@@ -143,7 +143,7 @@
axis2_env_t **env,
const axis2_char_t *value)
{
- AXIS2_FUNC_PARAM_CHECK(om_doctype, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_doctype)->value =
(axis2_char_t*)AXIS2_STRDUP(value,env);
@@ -154,7 +154,7 @@
axis2_om_doctype_get_value(axis2_om_doctype_t *om_doctype,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_doctype, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_doctype)->value;
}
@@ -164,7 +164,7 @@
axis2_om_output_t *om_output)
{
axis2_om_doctype_impl_t *doctype_impl;
- AXIS2_FUNC_PARAM_CHECK(om_doctype, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, om_output, AXIS2_FAILURE);
doctype_impl = AXIS2_INTF_TO_IMPL(om_doctype);
Modified: webservices/axis2/trunk/c/modules/xml/om/om_document.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_document.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_document.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_document.c Thu Feb 9 22:48:20 2006
@@ -169,7 +169,7 @@
{
axis2_om_document_impl_t *document = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_document, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
document = AXIS2_INTF_TO_IMPL(om_document);
if (document->char_set_encoding)
@@ -194,7 +194,7 @@
axis2_om_node_t * child)
{
axis2_om_document_impl_t *document_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(document, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error,child, AXIS2_FAILURE);
document_impl = AXIS2_INTF_TO_IMPL(document);
@@ -220,7 +220,7 @@
axis2_om_document_impl_t *document = NULL;
axis2_om_node_t *last_child = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_document, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
document = AXIS2_INTF_TO_IMPL(om_document);
@@ -250,7 +250,7 @@
{
axis2_om_node_t *node = NULL;
axis2_om_document_impl_t *doc_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(document, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
doc_impl = AXIS2_INTF_TO_IMPL(document);
if (doc_impl->root_element)
@@ -283,7 +283,7 @@
int status = AXIS2_SUCCESS;
axis2_om_document_impl_t *document_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(document, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
document_impl = AXIS2_INTF_TO_IMPL(document);
@@ -309,7 +309,7 @@
axis2_om_document_build_all(struct axis2_om_document *document,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(document,env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
do{
AXIS2_OM_DOCUMENT_BUILD_NEXT(document,env);
}while(!AXIS2_OM_NODE_GET_BUILD_STATUS(AXIS2_INTF_TO_IMPL(document)->root_element,env));
@@ -320,7 +320,7 @@
axis2_om_document_get_builder(axis2_om_document_t *document,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(document, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(document)->builder;
}
@@ -330,7 +330,7 @@
axis2_om_output_t *om_output)
{
axis2_om_document_impl_t *document_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(document, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
document_impl = AXIS2_INTF_TO_IMPL(document);
if(!(document_impl->root_element))
{
Modified: webservices/axis2/trunk/c/modules/xml/om/om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_element.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_element.c Thu Feb 9 22:48:20 2006
@@ -508,7 +508,7 @@
axis2_hash_index_t *hash_index = NULL;
void *ns = NULL;
axis2_om_element_impl_t *om_element_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, uri, NULL);
om_element_impl = AXIS2_INTF_TO_IMPL(om_element);
@@ -581,7 +581,7 @@
axis2_om_element_impl_t *om_element_impl = NULL;
axis2_om_namespace_t *om_namespace = NULL;
axis2_om_namespace_t *temp_ns = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, attribute, AXIS2_FAILURE);
om_element_impl = AXIS2_INTF_TO_IMPL(om_element);
@@ -628,7 +628,7 @@
axis2_om_element_impl_t *element_impl = NULL;
axis2_char_t *name = NULL;
axis2_om_attribute_t *attr = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
element_impl = AXIS2_INTF_TO_IMPL(om_element);
if (!qname)
@@ -652,7 +652,7 @@
{
axis2_status_t status = AXIS2_SUCCESS;
axis2_om_element_impl_t *element_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
element_impl = AXIS2_INTF_TO_IMPL(om_element);
if (element_impl->localname)
@@ -720,7 +720,7 @@
int status = AXIS2_SUCCESS;
axis2_om_element_impl_t *ele_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (!om_output)
{
@@ -825,7 +825,7 @@
axis2_om_element_get_localname(axis2_om_element_t *om_element,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_element)->localname;
}
@@ -834,7 +834,7 @@
axis2_env_t **env,
const axis2_char_t *localname)
{
- AXIS2_FUNC_PARAM_CHECK(om_element, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_element)->localname =
(axis2_char_t*)AXIS2_STRDUP(localname,env);
@@ -845,7 +845,7 @@
axis2_om_element_get_namespace(axis2_om_element_t *om_element,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_element)->ns;
}
@@ -857,7 +857,7 @@
{
axis2_om_namespace_t *om_ns = NULL;
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error,ns , AXIS2_FAILURE);
om_ns = axis2_om_element_find_namespace(om_element, env, node,
AXIS2_OM_NAMESPACE_GET_URI(ns, env),
@@ -879,7 +879,7 @@
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_element,env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_element)->attributes;
}
@@ -888,7 +888,7 @@
(axis2_om_element_t *om_element,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_element,env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_element)->namespaces;
}
@@ -898,7 +898,7 @@
{
axis2_om_namespace_t *ns = NULL;
axis2_om_element_impl_t *om_element_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
om_element_impl = AXIS2_INTF_TO_IMPL(om_element);
@@ -942,7 +942,7 @@
axis2_env_t **env,
axis2_om_node_t *element_node)
{
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_node, NULL);
return axis2_om_children_iterator_create(env,
AXIS2_OM_NODE_GET_FIRST_CHILD(element_node, env));
@@ -955,7 +955,7 @@
axis2_qname_t *element_qname,
axis2_om_node_t *element_node)
{
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_node, NULL);
return axis2_om_children_qname_iterator_create(env,
@@ -973,7 +973,7 @@
{
axis2_om_node_t *om_node = NULL;
axis2_om_children_qname_iterator_t *children_iterator = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_qname, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_node, NULL);
@@ -1010,7 +1010,7 @@
{
axis2_om_element_impl_t *om_element_impl = NULL;
axis2_qname_t *qname = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, om_attribute, AXIS2_FAILURE);
om_element_impl = AXIS2_INTF_TO_IMPL(om_element);
@@ -1032,7 +1032,7 @@
axis2_om_node_t **first_ele_node)
{
axis2_om_node_t *temp_node = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_node, NULL);
temp_node = AXIS2_OM_NODE_GET_FIRST_CHILD(element_node, env);
@@ -1060,7 +1060,7 @@
axis2_om_text_t* text_node = NULL;
axis2_om_node_t* temp_node = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_node, NULL);
temp_node = AXIS2_OM_NODE_GET_FIRST_CHILD(element_node, env);
@@ -1109,7 +1109,7 @@
axis2_om_node_t* temp_node = NULL;
axis2_om_text_t* om_text = NULL;
axis2_om_node_t* node_to_free = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, text, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, element_node, AXIS2_FAILURE);
@@ -1139,7 +1139,7 @@
axis2_om_output_t *om_output = NULL;
axis2_xml_writer_t *xml_writer = NULL;
axis2_char_t *xml = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_node, NULL);
xml_writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0);
@@ -1160,7 +1160,7 @@
{
axis2_om_node_t *first_node = NULL;
axis2_om_element_t *ele = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_node, NULL);
ele = AXIS2_OM_ELEMENT_GET_FIRST_ELEMENT(om_element, env, element_node, &first_node);
if(ele && first_node)
Modified: webservices/axis2/trunk/c/modules/xml/om/om_namespace.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_namespace.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_namespace.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_namespace.c Thu Feb 9 22:48:20 2006
@@ -149,7 +149,7 @@
axis2_env_t **env)
{
axis2_om_namespace_impl_t *ns_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_namespace, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
ns_impl = AXIS2_INTF_TO_IMPL(om_namespace);
@@ -242,7 +242,7 @@
axis2_om_namespace_get_uri(axis2_om_namespace_t *om_namespace,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_namespace, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_namespace)->uri;
}
@@ -251,7 +251,7 @@
axis2_om_namespace_get_prefix(axis2_om_namespace_t *om_namespace,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_namespace, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_namespace)->prefix;
}
@@ -261,7 +261,7 @@
axis2_env_t **env,
const axis2_char_t *uri)
{
- AXIS2_FUNC_PARAM_CHECK(om_namespace, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(!uri)
{
AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM);
@@ -276,7 +276,7 @@
axis2_env_t **env,
const axis2_char_t *prefix)
{
- AXIS2_FUNC_PARAM_CHECK(om_namespace, env,AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
if(!prefix)
{
AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM);
Modified: webservices/axis2/trunk/c/modules/xml/om/om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_node.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_node.c Thu Feb 9 22:48:20 2006
@@ -283,7 +283,7 @@
{
axis2_om_node_impl_t *node_impl = NULL;
axis2_om_node_t *child_node = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_node,env,AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
node_impl = AXIS2_INTF_TO_IMPL(om_node);
@@ -333,7 +333,7 @@
axis2_env_t **env,
axis2_om_node_t *child)
{
- AXIS2_FUNC_PARAM_CHECK(om_node,env,AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, child, AXIS2_FAILURE);
if (AXIS2_INTF_TO_IMPL(om_node)->first_child == NULL)
@@ -361,7 +361,7 @@
axis2_om_node_t *parent = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_node, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
parent = AXIS2_INTF_TO_IMPL(om_node)->parent;
@@ -402,7 +402,7 @@
axis2_om_node_t * parent)
{
- AXIS2_FUNC_PARAM_CHECK(om_node,env,AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, parent, AXIS2_FAILURE);
if(!parent)
@@ -442,7 +442,7 @@
axis2_om_node_t * node_to_insert)
{
axis2_om_node_t *next_sib = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node_to_insert, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(node_to_insert)->parent =
@@ -469,7 +469,7 @@
{
axis2_om_node_t *prev_sibling = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node_to_insert, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(node_to_insert)->parent =
@@ -501,7 +501,7 @@
{
int status = AXIS2_SUCCESS;
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error,om_output,AXIS2_FAILURE);
@@ -583,7 +583,7 @@
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_node)->parent;
}
@@ -593,7 +593,7 @@
{
axis2_om_node_impl_t *om_node_impl = NULL;
int token = 0;
- AXIS2_FUNC_PARAM_CHECK(om_node, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
om_node_impl = AXIS2_INTF_TO_IMPL(om_node);
/**********************************************************/
while(!(om_node_impl->first_child) && !(om_node_impl->done)
@@ -611,7 +611,7 @@
axis2_om_node_get_last_child(axis2_om_node_t *om_node,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_node)->last_child;
}
@@ -620,7 +620,7 @@
axis2_om_node_get_previous_sibling(axis2_om_node_t *om_node,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_node)->prev_sibling;
}
@@ -630,7 +630,7 @@
{
axis2_om_node_impl_t *om_node_impl = NULL;
int token = 0;
- AXIS2_FUNC_PARAM_CHECK(om_node, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
om_node_impl = AXIS2_INTF_TO_IMPL(om_node);
/*****************************************************/
while(!(om_node_impl->next_sibling) && om_node_impl->parent &&
@@ -648,7 +648,7 @@
axis2_om_node_get_node_type(axis2_om_node_t *om_node,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_OM_INVALID);
+ AXIS2_ENV_CHECK(env, AXIS2_OM_INVALID);
return AXIS2_INTF_TO_IMPL(om_node)->node_type;
}
@@ -656,7 +656,7 @@
axis2_om_node_get_data_element(axis2_om_node_t *om_node,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_node)->data_element;
}
@@ -664,7 +664,7 @@
axis2_om_node_set_first_child(axis2_om_node_t *om_node,axis2_env_t **env,
axis2_om_node_t *first_child)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, first_child, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_node)->first_child = first_child;
@@ -676,7 +676,7 @@
axis2_om_node_t *last_child)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, last_child, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_node)->last_child = last_child;
@@ -688,7 +688,7 @@
axis2_om_node_t *prev_sibling)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, prev_sibling, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_node)->prev_sibling = prev_sibling;
@@ -699,7 +699,7 @@
axis2_env_t **env,
axis2_om_node_t *next_sibling)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, next_sibling, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_node)->next_sibling = next_sibling;
return AXIS2_SUCCESS;
@@ -711,7 +711,7 @@
axis2_om_types_t type)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_node)->node_type = type;
return AXIS2_SUCCESS;
}
@@ -721,7 +721,7 @@
axis2_env_t **env,
void* data_element)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, data_element, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_node)->data_element = data_element;
return AXIS2_SUCCESS;
@@ -732,7 +732,7 @@
axis2_env_t **env)
{
/* on error what value should be returned ?...*/
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(om_node)->done;
}
@@ -742,7 +742,7 @@
axis2_env_t **env,
axis2_bool_t done)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_node)->done = done;
return AXIS2_SUCCESS;
}
@@ -752,7 +752,7 @@
axis2_env_t **env,
struct axis2_om_document *om_doc)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, om_doc, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_node)->om_doc = om_doc;
return AXIS2_SUCCESS;
@@ -762,7 +762,7 @@
axis2_om_node_get_document(axis2_om_node_t *om_node,
axis2_env_t **env)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_node)->om_doc;
}
@@ -772,7 +772,7 @@
{
axis2_om_stax_builder_t *builder = NULL;
axis2_om_node_impl_t *om_node_impl = NULL;
- AXIS2_FUNC_PARAM_CHECK(om_node, env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
om_node_impl = AXIS2_INTF_TO_IMPL(om_node);
builder = om_node_impl->builder;
@@ -786,7 +786,7 @@
axis2_env_t **env,
axis2_om_stax_builder_t* builder)
{
- AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, builder, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(om_node)->builder = builder;
return AXIS2_SUCCESS;