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 [32/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/samples/server/math/math.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/math.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/math.c (original)
+++ webservices/axis2/trunk/c/samples/server/math/math.c Wed May 31 08:54:07 2006
@@ -17,7 +17,7 @@
#include <stdio.h>
axis2_om_node_t *
-axis2_math_add (axis2_env_t **env, axis2_om_node_t *node)
+axis2_math_add (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *param1_node = NULL;
axis2_om_node_t *param1_text_node = NULL;
@@ -30,7 +30,7 @@
if (!node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Math client request ERROR: input parameter NULL\n");
return NULL;
}
@@ -38,7 +38,7 @@
param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!param1_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -46,7 +46,7 @@
param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
if (!param1_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -61,7 +61,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -69,7 +69,7 @@
param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
if (!param2_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -77,7 +77,7 @@
param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
if (!param2_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -92,7 +92,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -123,13 +123,13 @@
return node1;
}
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid parameters\n");
return NULL;
}
axis2_om_node_t *
-axis2_math_sub (axis2_env_t **env, axis2_om_node_t *node)
+axis2_math_sub (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *param1_node = NULL;
axis2_om_node_t *param1_text_node = NULL;
@@ -142,7 +142,7 @@
if (!node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Math client request ERROR: input parameter NULL\n");
return NULL;
}
@@ -150,7 +150,7 @@
param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!param1_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -158,7 +158,7 @@
param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
if (!param1_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -173,7 +173,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -181,7 +181,7 @@
param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
if (!param2_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -189,7 +189,7 @@
param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
if (!param2_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -204,7 +204,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -235,14 +235,14 @@
return node1;
}
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid parameters\n");
return NULL;
}
axis2_om_node_t *
-axis2_math_mul (axis2_env_t **env, axis2_om_node_t *node)
+axis2_math_mul (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *param1_node = NULL;
axis2_om_node_t *param1_text_node = NULL;
@@ -255,7 +255,7 @@
if (!node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Math client request ERROR: input parameter NULL\n");
return NULL;
}
@@ -263,7 +263,7 @@
param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!param1_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -271,7 +271,7 @@
param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
if (!param1_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -286,7 +286,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -294,7 +294,7 @@
param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
if (!param2_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -302,7 +302,7 @@
param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
if (!param2_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -317,7 +317,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -348,14 +348,14 @@
return node1;
}
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid parameters\n");
return NULL;
}
axis2_om_node_t *
-axis2_math_div (axis2_env_t **env, axis2_om_node_t *node)
+axis2_math_div (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *param1_node = NULL;
axis2_om_node_t *param1_text_node = NULL;
@@ -368,7 +368,7 @@
if (!node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Math client request ERROR: input parameter NULL\n");
return NULL;
}
@@ -376,7 +376,7 @@
param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!param1_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -384,7 +384,7 @@
param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
if (!param1_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -399,7 +399,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -407,7 +407,7 @@
param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
if (!param2_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -415,7 +415,7 @@
param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
if (!param2_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -430,7 +430,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -463,7 +463,7 @@
return node1;
}
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid parameters\n");
return NULL;
}
Modified: webservices/axis2/trunk/c/samples/server/math/math.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/math.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/math.h (original)
+++ webservices/axis2/trunk/c/samples/server/math/math.h Wed May 31 08:54:07 2006
@@ -24,9 +24,9 @@
#include <axis2_om_node.h>
#include <axis2_om_element.h>
-axis2_om_node_t *axis2_math_add(axis2_env_t **env, axis2_om_node_t *node);
-axis2_om_node_t *axis2_math_sub(axis2_env_t **env, axis2_om_node_t *node);
-axis2_om_node_t *axis2_math_mul(axis2_env_t **env, axis2_om_node_t *node);
-axis2_om_node_t *axis2_math_div(axis2_env_t **env, axis2_om_node_t *node);
+axis2_om_node_t *axis2_math_add(const axis2_env_t *env, axis2_om_node_t *node);
+axis2_om_node_t *axis2_math_sub(const axis2_env_t *env, axis2_om_node_t *node);
+axis2_om_node_t *axis2_math_mul(const axis2_env_t *env, axis2_om_node_t *node);
+axis2_om_node_t *axis2_math_div(const axis2_env_t *env, axis2_om_node_t *node);
#endif /* MATH_H*/
Modified: webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/math_skeleton.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/math_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/math/math_skeleton.c Wed May 31 08:54:07 2006
@@ -20,31 +20,31 @@
int AXIS2_CALL
math_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*
* This method invokes the right service method
*/
axis2_om_node_t* AXIS2_CALL
math_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL math_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_DECLARE(axis2_svc_skeleton_t *)
-axis2_math_create(axis2_env_t **env)
+axis2_math_create(const axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
- svc_skeleton = AXIS2_MALLOC((*env)->allocator,
+ svc_skeleton = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_skeleton_t));
svc_skeleton->ops = AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ env->allocator, sizeof(axis2_svc_skeleton_ops_t));
svc_skeleton->func_array = NULL;
@@ -58,7 +58,7 @@
int AXIS2_CALL
math_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
svc_skeleton->func_array = axis2_array_list_create(env, 0);
AXIS2_ARRAY_LIST_ADD(svc_skeleton->func_array, env, "add");
@@ -72,7 +72,7 @@
int AXIS2_CALL
math_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/*if(svc_skeleton->func_array)
{
@@ -82,13 +82,13 @@
if(svc_skeleton->ops)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton->ops);
+ AXIS2_FREE(env->allocator, svc_skeleton->ops);
svc_skeleton->ops = NULL;
}
if(svc_skeleton)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton);
+ AXIS2_FREE(env->allocator, svc_skeleton);
svc_skeleton = NULL;
}
return AXIS2_SUCCESS;
@@ -99,7 +99,7 @@
*/
axis2_om_node_t* AXIS2_CALL
math_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx)
{
@@ -141,7 +141,7 @@
*/
AXIS2_EXPORT int axis2_get_instance(struct axis2_svc_skeleton **inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
*inst = axis2_math_create(env);
/*if(NULL != *inst)
@@ -157,7 +157,7 @@
}
AXIS2_EXPORT int axis2_remove_instance(axis2_svc_skeleton_t *inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
Modified: webservices/axis2/trunk/c/samples/server/mtom/mtom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/mtom/mtom.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/mtom/mtom.c (original)
+++ webservices/axis2/trunk/c/samples/server/mtom/mtom.c Wed May 31 08:54:07 2006
@@ -17,10 +17,10 @@
#include <stdio.h>
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env, axis2_char_t *text);
+build_om_programatically(const axis2_env_t *env, axis2_char_t *text);
axis2_om_node_t *
-axis2_mtom_mtom (axis2_env_t **env, axis2_om_node_t *node)
+axis2_mtom_mtom (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *file_name_node = NULL;
axis2_om_node_t *file_text_node = NULL;
@@ -38,7 +38,7 @@
*/
if (!node) /* 'mtomSample' node */
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Echo client ERROR: input parameter NULL\n");
return NULL;
}
@@ -46,7 +46,7 @@
file_name_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!file_name_node) /* 'text' node */
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Echo client ERROR: invalid XML in request\n");
return NULL;
}
@@ -54,7 +54,7 @@
file_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(file_name_node, env);
if (!file_text_node) /* actual text to mtom */
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Echo client ERROR: invalid XML in request\n");
return NULL;
}
@@ -97,7 +97,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Echo client ERROR: invalid XML in request\n");
return NULL;
}
@@ -107,7 +107,7 @@
/* Builds the response content */
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env, axis2_char_t *text)
+build_om_programatically(const axis2_env_t *env, axis2_char_t *text)
{
axis2_om_node_t *mtom_om_node = NULL;
axis2_om_element_t* mtom_om_ele = NULL;
Modified: webservices/axis2/trunk/c/samples/server/mtom/mtom.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/mtom/mtom.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/mtom/mtom.h (original)
+++ webservices/axis2/trunk/c/samples/server/mtom/mtom.h Wed May 31 08:54:07 2006
@@ -24,6 +24,6 @@
#include <axis2_om_node.h>
#include <axis2_om_element.h>
-axis2_om_node_t *axis2_mtom_mtom(axis2_env_t **env, axis2_om_node_t *node);
+axis2_om_node_t *axis2_mtom_mtom(const axis2_env_t *env, axis2_om_node_t *node);
#endif /* CALC_H*/
Modified: webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c Wed May 31 08:54:07 2006
@@ -19,41 +19,41 @@
int AXIS2_CALL
mtom_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
mtom_free_void_arg(void *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*
* This method invokes the right service method
*/
axis2_om_node_t* AXIS2_CALL
mtom_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL
mtom_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_om_node_t* AXIS2_CALL
mtom_on_fault(axis2_svc_skeleton_t *svc_skeli,
- axis2_env_t **env, axis2_om_node_t *node);
+ const axis2_env_t *env, axis2_om_node_t *node);
/*Create function */
axis2_svc_skeleton_t *
-axis2_mtom_create(axis2_env_t **env)
+axis2_mtom_create(const axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
/* Allocate memory for the structs */
- svc_skeleton = AXIS2_MALLOC((*env)->allocator,
+ svc_skeleton = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_skeleton_t));
svc_skeleton->ops = AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ env->allocator, sizeof(axis2_svc_skeleton_ops_t));
svc_skeleton->func_array = NULL;
/* Assign function pointers */
@@ -68,7 +68,7 @@
/* Initialize the service */
int AXIS2_CALL
mtom_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
svc_skeleton->func_array = axis2_array_list_create(env, 0);
/* Add the implemented operation names of the service to
@@ -84,7 +84,7 @@
*/
axis2_om_node_t* AXIS2_CALL
mtom_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx)
{
@@ -100,7 +100,7 @@
/* On fault, handle the fault */
axis2_om_node_t* AXIS2_CALL
mtom_on_fault(axis2_svc_skeleton_t *svc_skeli,
- axis2_env_t **env, axis2_om_node_t *node)
+ const axis2_env_t *env, axis2_om_node_t *node)
{
/* Here we are just setting a simple error message inside an element
* called 'EchoServiceError'
@@ -118,7 +118,7 @@
/* Free the resources used */
int AXIS2_CALL
mtom_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/* Free the function array */
if(svc_skeleton->func_array)
@@ -130,14 +130,14 @@
/* Free the function array */
if(svc_skeleton->ops)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton->ops);
+ AXIS2_FREE(env->allocator, svc_skeleton->ops);
svc_skeleton->ops = NULL;
}
/* Free the service skeleton */
if(svc_skeleton)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton);
+ AXIS2_FREE(env->allocator, svc_skeleton);
svc_skeleton = NULL;
}
@@ -150,7 +150,7 @@
*/
AXIS2_EXPORT int
axis2_get_instance(axis2_svc_skeleton_t **inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
*inst = axis2_mtom_create(env);
if(!(*inst))
@@ -163,7 +163,7 @@
AXIS2_EXPORT int
axis2_remove_instance(axis2_svc_skeleton_t *inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
Modified: webservices/axis2/trunk/c/samples/server/notify/notify.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/notify/notify.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/notify/notify.c (original)
+++ webservices/axis2/trunk/c/samples/server/notify/notify.c Wed May 31 08:54:07 2006
@@ -17,11 +17,11 @@
#include <stdio.h>
void
-axis2_notify_notify (axis2_env_t **env, axis2_om_node_t *node)
+axis2_notify_notify (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *text_node = NULL;
- if (!env || !(*env))
+ if (!env || !env)
return;
/* Expected request format is :-
@@ -29,7 +29,7 @@
*/
if (!node) /* 'notify' node */
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Echo client ERROR: input parameter NULL\n");
return;
}
@@ -37,7 +37,7 @@
text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!node) /* actual text to notify */
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Echo client ERROR: invalid XML in request\n");
return;
}
@@ -53,7 +53,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Echo client ERROR: invalid XML in request\n");
return;
}
Modified: webservices/axis2/trunk/c/samples/server/notify/notify.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/notify/notify.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/notify/notify.h (original)
+++ webservices/axis2/trunk/c/samples/server/notify/notify.h Wed May 31 08:54:07 2006
@@ -24,6 +24,6 @@
#include <axis2_om_node.h>
#include <axis2_om_element.h>
-void axis2_notify_notify(axis2_env_t **env, axis2_om_node_t *node);
+void axis2_notify_notify(const axis2_env_t *env, axis2_om_node_t *node);
#endif /* CALC_H*/
Modified: webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c Wed May 31 08:54:07 2006
@@ -19,41 +19,41 @@
int AXIS2_CALL
notify_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
notify_free_void_arg(void *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*
* This method invokes the right service method
*/
axis2_om_node_t* AXIS2_CALL
notify_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL
notify_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_om_node_t* AXIS2_CALL
notify_on_fault(axis2_svc_skeleton_t *svc_skeli,
- axis2_env_t **env, axis2_om_node_t *node);
+ const axis2_env_t *env, axis2_om_node_t *node);
/*Create function */
axis2_svc_skeleton_t *
-axis2_notify_create(axis2_env_t **env)
+axis2_notify_create(const axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
/* Allocate memory for the structs */
- svc_skeleton = AXIS2_MALLOC((*env)->allocator,
+ svc_skeleton = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_skeleton_t));
svc_skeleton->ops = AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ env->allocator, sizeof(axis2_svc_skeleton_ops_t));
svc_skeleton->func_array = NULL;
@@ -69,7 +69,7 @@
/* Initialize the service */
int AXIS2_CALL
notify_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
svc_skeleton->func_array = axis2_array_list_create(env, 0);
/* Add the implemented operation names of the service to
@@ -85,7 +85,7 @@
*/
axis2_om_node_t* AXIS2_CALL
notify_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx)
{
@@ -102,7 +102,7 @@
/* On fault, handle the fault */
axis2_om_node_t* AXIS2_CALL
notify_on_fault(axis2_svc_skeleton_t *svc_skeli,
- axis2_env_t **env, axis2_om_node_t *node)
+ const axis2_env_t *env, axis2_om_node_t *node)
{
/* Here we are just setting a simple error message inside an element
* called 'EchoServiceError'
@@ -120,7 +120,7 @@
/* Free the resources used */
int AXIS2_CALL
notify_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/* Free the function array */
if(svc_skeleton->func_array)
@@ -132,14 +132,14 @@
/* Free the function array */
if(svc_skeleton->ops)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton->ops);
+ AXIS2_FREE(env->allocator, svc_skeleton->ops);
svc_skeleton->ops = NULL;
}
/* Free the service skeleton */
if(svc_skeleton)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton);
+ AXIS2_FREE(env->allocator, svc_skeleton);
svc_skeleton = NULL;
}
@@ -152,7 +152,7 @@
*/
AXIS2_EXPORT int
axis2_get_instance(axis2_svc_skeleton_t **inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
*inst = axis2_notify_create(env);
if(!(*inst))
@@ -165,7 +165,7 @@
AXIS2_EXPORT int
axis2_remove_instance(axis2_svc_skeleton_t *inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
Modified: webservices/axis2/trunk/c/samples/server/sg_math/add.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.c Wed May 31 08:54:07 2006
@@ -18,7 +18,7 @@
#include <axis2_svc_grp_ctx.h>
axis2_om_node_t *
-axis2_add_add (axis2_env_t **env, axis2_om_node_t *node, axis2_msg_ctx_t *msg_ctx)
+axis2_add_add (const axis2_env_t *env, axis2_om_node_t *node, axis2_msg_ctx_t *msg_ctx)
{
axis2_om_node_t *param1_node = NULL;
axis2_om_node_t *param1_text_node = NULL;
@@ -31,7 +31,7 @@
if (!node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Math client request ERROR: input parameter NULL\n");
return NULL;
}
@@ -39,7 +39,7 @@
param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!param1_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -47,7 +47,7 @@
param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
if (!param1_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -62,7 +62,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -70,7 +70,7 @@
param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
if (!param2_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -78,7 +78,7 @@
param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
if (!param2_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -93,7 +93,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -153,7 +153,7 @@
return node1;
}
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid parameters\n");
return NULL;
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/add.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.h (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.h Wed May 31 08:54:07 2006
@@ -24,7 +24,7 @@
#include <axis2_om_node.h>
#include <axis2_om_element.h>
-axis2_om_node_t *axis2_add_add(axis2_env_t **env,
+axis2_om_node_t *axis2_add_add(const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx);
Modified: webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c Wed May 31 08:54:07 2006
@@ -20,31 +20,31 @@
int AXIS2_CALL
add_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*
* This method invokes the right service method
*/
axis2_om_node_t* AXIS2_CALL
add_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL add_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_DECLARE(axis2_svc_skeleton_t *)
-axis2_add_create(axis2_env_t **env)
+axis2_add_create(const axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
- svc_skeleton = AXIS2_MALLOC((*env)->allocator,
+ svc_skeleton = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_skeleton_t));
svc_skeleton->ops = AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ env->allocator, sizeof(axis2_svc_skeleton_ops_t));
svc_skeleton->func_array = NULL;
@@ -58,7 +58,7 @@
int AXIS2_CALL
add_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
svc_skeleton->func_array = axis2_array_list_create(env, 0);
AXIS2_ARRAY_LIST_ADD(svc_skeleton->func_array, env, "add");
@@ -69,17 +69,17 @@
int AXIS2_CALL
add_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
if(svc_skeleton->ops)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton->ops);
+ AXIS2_FREE(env->allocator, svc_skeleton->ops);
svc_skeleton->ops = NULL;
}
if(svc_skeleton)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton);
+ AXIS2_FREE(env->allocator, svc_skeleton);
svc_skeleton = NULL;
}
return AXIS2_SUCCESS;
@@ -90,7 +90,7 @@
*/
axis2_om_node_t* AXIS2_CALL
add_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx)
{
@@ -126,7 +126,7 @@
*/
AXIS2_EXPORT int axis2_get_instance(struct axis2_svc_skeleton **inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
*inst = axis2_add_create(env);
if(!(*inst))
@@ -138,7 +138,7 @@
}
AXIS2_EXPORT int axis2_remove_instance(axis2_svc_skeleton_t *inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
Modified: webservices/axis2/trunk/c/samples/server/sg_math/div.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div.c Wed May 31 08:54:07 2006
@@ -17,7 +17,7 @@
#include <stdio.h>
axis2_om_node_t *
-axis2_div_div (axis2_env_t **env, axis2_om_node_t *node)
+axis2_div_div (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *param1_node = NULL;
axis2_om_node_t *param1_text_node = NULL;
@@ -30,7 +30,7 @@
if (!node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Math client request ERROR: input parameter NULL\n");
return NULL;
}
@@ -38,7 +38,7 @@
param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!param1_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -46,7 +46,7 @@
param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
if (!param1_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -61,7 +61,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -69,7 +69,7 @@
param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
if (!param2_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -77,7 +77,7 @@
param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
if (!param2_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -92,7 +92,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -125,7 +125,7 @@
return node1;
}
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid parameters\n");
return NULL;
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/div.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div.h (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div.h Wed May 31 08:54:07 2006
@@ -24,6 +24,6 @@
#include <axis2_om_node.h>
#include <axis2_om_element.h>
-axis2_om_node_t *axis2_div_div(axis2_env_t **env, axis2_om_node_t *node);
+axis2_om_node_t *axis2_div_div(const axis2_env_t *env, axis2_om_node_t *node);
#endif /* DIV_H*/
Modified: webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c Wed May 31 08:54:07 2006
@@ -20,31 +20,31 @@
int AXIS2_CALL
div_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*
* This method invokes the right service method
*/
axis2_om_node_t* AXIS2_CALL
div_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL div_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_DECLARE(axis2_svc_skeleton_t *)
-axis2_div_create(axis2_env_t **env)
+axis2_div_create(const axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
- svc_skeleton = AXIS2_MALLOC((*env)->allocator,
+ svc_skeleton = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_skeleton_t));
svc_skeleton->ops = AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ env->allocator, sizeof(axis2_svc_skeleton_ops_t));
svc_skeleton->func_array = NULL;
@@ -58,7 +58,7 @@
int AXIS2_CALL
div_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
svc_skeleton->func_array = axis2_array_list_create(env, 0);
AXIS2_ARRAY_LIST_ADD(svc_skeleton->func_array, env, "div");
@@ -69,17 +69,17 @@
int AXIS2_CALL
div_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
if(svc_skeleton->ops)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton->ops);
+ AXIS2_FREE(env->allocator, svc_skeleton->ops);
svc_skeleton->ops = NULL;
}
if(svc_skeleton)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton);
+ AXIS2_FREE(env->allocator, svc_skeleton);
svc_skeleton = NULL;
}
return AXIS2_SUCCESS;
@@ -90,7 +90,7 @@
*/
axis2_om_node_t* AXIS2_CALL
div_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx)
{
@@ -126,7 +126,7 @@
*/
AXIS2_EXPORT int axis2_get_instance(struct axis2_svc_skeleton **inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
*inst = axis2_div_create(env);
if(!(*inst))
@@ -138,7 +138,7 @@
}
AXIS2_EXPORT int axis2_remove_instance(axis2_svc_skeleton_t *inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul.c Wed May 31 08:54:07 2006
@@ -17,7 +17,7 @@
#include <stdio.h>
axis2_om_node_t *
-axis2_mul_mul (axis2_env_t **env, axis2_om_node_t *node)
+axis2_mul_mul (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *param1_node = NULL;
axis2_om_node_t *param1_text_node = NULL;
@@ -30,7 +30,7 @@
if (!node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Math client request ERROR: input parameter NULL\n");
return NULL;
}
@@ -38,7 +38,7 @@
param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!param1_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -46,7 +46,7 @@
param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
if (!param1_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -61,7 +61,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -69,7 +69,7 @@
param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
if (!param2_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -77,7 +77,7 @@
param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
if (!param2_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -92,7 +92,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -123,7 +123,7 @@
return node1;
}
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid parameters\n");
return NULL;
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul.h (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul.h Wed May 31 08:54:07 2006
@@ -24,6 +24,6 @@
#include <axis2_om_node.h>
#include <axis2_om_element.h>
-axis2_om_node_t *axis2_mul_mul(axis2_env_t **env, axis2_om_node_t *node);
+axis2_om_node_t *axis2_mul_mul(const axis2_env_t *env, axis2_om_node_t *node);
#endif /* MUL_H*/
Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c Wed May 31 08:54:07 2006
@@ -20,31 +20,31 @@
int AXIS2_CALL
mul_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*
* This method invokes the right service method
*/
axis2_om_node_t* AXIS2_CALL
mul_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL mul_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_DECLARE(axis2_svc_skeleton_t *)
-axis2_mul_create(axis2_env_t **env)
+axis2_mul_create(const axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
- svc_skeleton = AXIS2_MALLOC((*env)->allocator,
+ svc_skeleton = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_skeleton_t));
svc_skeleton->ops = AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ env->allocator, sizeof(axis2_svc_skeleton_ops_t));
svc_skeleton->func_array = NULL;
@@ -58,7 +58,7 @@
int AXIS2_CALL
mul_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
svc_skeleton->func_array = axis2_array_list_create(env, 0);
AXIS2_ARRAY_LIST_ADD(svc_skeleton->func_array, env, "mul");
@@ -69,17 +69,17 @@
int AXIS2_CALL
mul_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
if(svc_skeleton->ops)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton->ops);
+ AXIS2_FREE(env->allocator, svc_skeleton->ops);
svc_skeleton->ops = NULL;
}
if(svc_skeleton)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton);
+ AXIS2_FREE(env->allocator, svc_skeleton);
svc_skeleton = NULL;
}
return AXIS2_SUCCESS;
@@ -90,7 +90,7 @@
*/
axis2_om_node_t* AXIS2_CALL
mul_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx)
{
@@ -126,7 +126,7 @@
*/
AXIS2_EXPORT int axis2_get_instance(struct axis2_svc_skeleton **inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
*inst = axis2_mul_create(env);
if(!(*inst))
@@ -138,7 +138,7 @@
}
AXIS2_EXPORT int axis2_remove_instance(axis2_svc_skeleton_t *inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub.c Wed May 31 08:54:07 2006
@@ -17,7 +17,7 @@
#include <stdio.h>
axis2_om_node_t *
-axis2_sub_sub (axis2_env_t **env, axis2_om_node_t *node)
+axis2_sub_sub (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *param1_node = NULL;
axis2_om_node_t *param1_text_node = NULL;
@@ -30,7 +30,7 @@
if (!node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Math client request ERROR: input parameter NULL\n");
return NULL;
}
@@ -38,7 +38,7 @@
param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!param1_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -46,7 +46,7 @@
param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
if (!param1_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -61,7 +61,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -69,7 +69,7 @@
param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
if (!param2_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -77,7 +77,7 @@
param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
if (!param2_text_node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -92,7 +92,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid XML in request\n");
return NULL;
}
@@ -123,7 +123,7 @@
return node1;
}
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST, AXIS2_FAILURE);
printf("Math service ERROR: invalid parameters\n");
return NULL;
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub.h (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub.h Wed May 31 08:54:07 2006
@@ -24,6 +24,6 @@
#include <axis2_om_node.h>
#include <axis2_om_element.h>
-axis2_om_node_t *axis2_sub_sub(axis2_env_t **env, axis2_om_node_t *node);
+axis2_om_node_t *axis2_sub_sub(const axis2_env_t *env, axis2_om_node_t *node);
#endif /* SUB_H*/
Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c Wed May 31 08:54:07 2006
@@ -20,31 +20,31 @@
int AXIS2_CALL
sub_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*
* This method invokes the right service method
*/
axis2_om_node_t* AXIS2_CALL
sub_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL sub_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_DECLARE(axis2_svc_skeleton_t *)
-axis2_sub_create(axis2_env_t **env)
+axis2_sub_create(const axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
- svc_skeleton = AXIS2_MALLOC((*env)->allocator,
+ svc_skeleton = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_skeleton_t));
svc_skeleton->ops = AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ env->allocator, sizeof(axis2_svc_skeleton_ops_t));
svc_skeleton->func_array = NULL;
@@ -58,7 +58,7 @@
int AXIS2_CALL
sub_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
svc_skeleton->func_array = axis2_array_list_create(env, 0);
AXIS2_ARRAY_LIST_ADD(svc_skeleton->func_array, env, "sub");
@@ -69,17 +69,17 @@
int AXIS2_CALL
sub_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
if(svc_skeleton->ops)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton->ops);
+ AXIS2_FREE(env->allocator, svc_skeleton->ops);
svc_skeleton->ops = NULL;
}
if(svc_skeleton)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton);
+ AXIS2_FREE(env->allocator, svc_skeleton);
svc_skeleton = NULL;
}
return AXIS2_SUCCESS;
@@ -90,7 +90,7 @@
*/
axis2_om_node_t* AXIS2_CALL
sub_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx)
{
@@ -126,7 +126,7 @@
*/
AXIS2_EXPORT int axis2_get_instance(struct axis2_svc_skeleton **inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
*inst = axis2_sub_create(env);
if(!(*inst))
@@ -138,7 +138,7 @@
}
AXIS2_EXPORT int axis2_remove_instance(axis2_svc_skeleton_t *inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c Wed May 31 08:54:07 2006
@@ -21,7 +21,7 @@
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -46,11 +46,11 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
* using the axis2.xml file.
@@ -64,7 +64,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -74,18 +74,18 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_payload_for_echo_svc(&env);
+ payload = build_om_payload_for_echo_svc(env);
/* Send request */
- ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, &env, payload);
+ ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIS2_OM_NODE_TO_STRING(ret_node, &env);
+ om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\necho client invoke SUCCESSFUL!\n");
@@ -100,7 +100,7 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c Wed May 31 08:54:07 2006
@@ -21,7 +21,7 @@
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -46,12 +46,12 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
- AXIS2_OPTIONS_SET_ACTION(options, &env,
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ AXIS2_OPTIONS_SET_ACTION(options, env,
"http://ws.apache.org/axis2/c/samples/echoString");
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
@@ -66,7 +66,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -76,21 +76,21 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Engage addressing module */
- AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, &env, AXIS2_MODULE_ADDRESSING);
+ AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_payload_for_echo_svc(&env);
+ payload = build_om_payload_for_echo_svc(env);
/* Send request */
- ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, &env, payload);
+ ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIS2_OM_NODE_TO_STRING(ret_node, &env);
+ om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\necho client invoke SUCCESSFUL!\n");
@@ -105,12 +105,12 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
if (endpoint_ref)
{
- AXIS2_ENDPOINT_REF_FREE(endpoint_ref, &env);
+ AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env);
endpoint_ref = NULL;
}
return 0;
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c Wed May 31 08:54:07 2006
@@ -21,7 +21,7 @@
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_endpoint_ref_t* reply_to = NULL;
@@ -47,18 +47,18 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
- AXIS2_OPTIONS_SET_USE_SEPERATE_LISTENER(options, &env, AXIS2_TRUE);
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ AXIS2_OPTIONS_SET_USE_SEPERATE_LISTENER(options, env, AXIS2_TRUE);
/* Seperate listner needs addressing, hence addressing stuff in options */
- AXIS2_OPTIONS_SET_ACTION(options, &env,
+ AXIS2_OPTIONS_SET_ACTION(options, env,
"http://ws.apache.org/axis2/c/samples/echoString");
- reply_to = axis2_endpoint_ref_create(&env, "http://localhost:6060/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
- AXIS2_OPTIONS_SET_REPLY_TO(options, &env, reply_to);
+ reply_to = axis2_endpoint_ref_create(env, "http://localhost:6060/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
+ AXIS2_OPTIONS_SET_REPLY_TO(options, env, reply_to);
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
* using the axis2.xml file.
@@ -72,7 +72,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -82,20 +82,20 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
- AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, &env, AXIS2_MODULE_ADDRESSING);
+ AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_payload_for_echo_svc(&env);
+ payload = build_om_payload_for_echo_svc(env);
/* Send request */
- ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, &env, payload);
+ ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIS2_OM_NODE_TO_STRING(ret_node, &env);
+ om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\necho client invoke SUCCESSFUL!\n");
@@ -110,7 +110,7 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c Wed May 31 08:54:07 2006
@@ -21,7 +21,7 @@
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -46,12 +46,12 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
- AXIS2_OPTIONS_SET_SOAP_VERSION(options, &env, AXIS2_SOAP11);
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIS2_SOAP11);
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
* using the axis2.xml file.
@@ -65,7 +65,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -75,18 +75,18 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_payload_for_echo_svc(&env);
+ payload = build_om_payload_for_echo_svc(env);
/* Send request */
- ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, &env, payload);
+ ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIS2_OM_NODE_TO_STRING(ret_node, &env);
+ om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\necho client invoke SUCCESSFUL!\n");
@@ -101,7 +101,7 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c Wed May 31 08:54:07 2006
@@ -22,12 +22,12 @@
/* my on_complete callback function */
axis2_status_t AXIS2_CALL
echo_callback_on_complete(struct axis2_callback *callback,
- axis2_env_t **env);
+ const axis2_env_t *env);
/* my on_error callback function */
axis2_status_t AXIS2_CALL
echo_callback_on_error(struct axis2_callback *callback,
- axis2_env_t **env,
+ const axis2_env_t *env,
int exception);
/* to check whether the callback is completed */
@@ -35,7 +35,7 @@
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -61,11 +61,11 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
* using the axis2.xml file.
@@ -79,7 +79,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -89,14 +89,14 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_payload_for_echo_svc(&env);
+ payload = build_om_payload_for_echo_svc(env);
/* Create the callback object with default on_complete and on_error
callback functions */
- callback = axis2_callback_create(&env);
+ callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
AXIS2_CALLBACK_SET_ON_COMPLETE(callback, echo_callback_on_complete);
@@ -106,7 +106,7 @@
/* Send request */
- AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, &env,
+ AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env,
payload, callback);
/** Wait till callback is complete. Simply keep the parent thread running
@@ -129,7 +129,7 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
@@ -138,7 +138,7 @@
axis2_status_t AXIS2_CALL
echo_callback_on_complete(struct axis2_callback *callback,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/** SOAP response has arrived here; get the soap envelope
from the callback object and do whatever you want to do with it */
@@ -153,9 +153,9 @@
if (!soap_envelope)
{
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
- " %d :: %s", (*env)->error->error_number,
- AXIS2_ERROR_GET_MESSAGE((*env)->error));
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
+ " %d :: %s", env->error->error_number,
+ AXIS2_ERROR_GET_MESSAGE(env->error));
printf("echo stub invoke FAILED!\n");
status = AXIS2_FAILURE;
}
@@ -165,9 +165,9 @@
if(!ret_node)
{
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
- " %d :: %s", (*env)->error->error_number,
- AXIS2_ERROR_GET_MESSAGE((*env)->error));
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
+ " %d :: %s", env->error->error_number,
+ AXIS2_ERROR_GET_MESSAGE(env->error));
printf("echo stub invoke FAILED!\n");
status = AXIS2_FAILURE;
}
@@ -186,12 +186,12 @@
axis2_status_t AXIS2_CALL
echo_callback_on_error(struct axis2_callback *callback,
- axis2_env_t **env,
+ const axis2_env_t *env,
int exception)
{
/** take necessary action on error */
printf("\necho client invike FAILED. Error code:%d ::%s", exception,
- AXIS2_ERROR_GET_MESSAGE((*env)->error));
+ AXIS2_ERROR_GET_MESSAGE(env->error));
isComplete = 1;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c Wed May 31 08:54:07 2006
@@ -22,12 +22,12 @@
/* my on_complete callback function */
axis2_status_t AXIS2_CALL
echo_callback_on_complete(struct axis2_callback *callback,
- axis2_env_t **env);
+ const axis2_env_t *env);
/* my on_error callback function */
axis2_status_t AXIS2_CALL
echo_callback_on_error(struct axis2_callback *callback,
- axis2_env_t **env,
+ const axis2_env_t *env,
int exception);
/* to check whether the callback is completed */
@@ -35,7 +35,7 @@
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_endpoint_ref_t* reply_to = NULL;
@@ -62,18 +62,18 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
- AXIS2_OPTIONS_SET_USE_SEPERATE_LISTENER(options, &env, AXIS2_TRUE);
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ AXIS2_OPTIONS_SET_USE_SEPERATE_LISTENER(options, env, AXIS2_TRUE);
/* Seperate listner needs addressing, hence addressing stuff in options */
- AXIS2_OPTIONS_SET_ACTION(options, &env,
+ AXIS2_OPTIONS_SET_ACTION(options, env,
"http://ws.apache.org/axis2/c/samples/echoString");
- reply_to = axis2_endpoint_ref_create(&env, "http://localhost:6060/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
- AXIS2_OPTIONS_SET_REPLY_TO(options, &env, reply_to);
+ reply_to = axis2_endpoint_ref_create(env, "http://localhost:6060/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
+ AXIS2_OPTIONS_SET_REPLY_TO(options, env, reply_to);
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
* using the axis2.xml file.
@@ -87,7 +87,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -97,16 +97,16 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
- AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, &env, AXIS2_MODULE_ADDRESSING);
+ AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_payload_for_echo_svc(&env);
+ payload = build_om_payload_for_echo_svc(env);
/* Create the callback object with default on_complete and on_error
callback functions */
- callback = axis2_callback_create(&env);
+ callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
AXIS2_CALLBACK_SET_ON_COMPLETE(callback, echo_callback_on_complete);
@@ -116,7 +116,7 @@
/* Send request */
- AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, &env,
+ AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env,
payload, callback);
/** Wait till callback is complete. Simply keep the parent thread running
@@ -139,7 +139,7 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
@@ -148,7 +148,7 @@
axis2_status_t AXIS2_CALL
echo_callback_on_complete(struct axis2_callback *callback,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/** SOAP response has arrived here; get the soap envelope
from the callback object and do whatever you want to do with it */
@@ -163,9 +163,9 @@
if (!soap_envelope)
{
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
- " %d :: %s", (*env)->error->error_number,
- AXIS2_ERROR_GET_MESSAGE((*env)->error));
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
+ " %d :: %s", env->error->error_number,
+ AXIS2_ERROR_GET_MESSAGE(env->error));
printf("echo stub invoke FAILED!\n");
status = AXIS2_FAILURE;
}
@@ -175,9 +175,9 @@
if(!ret_node)
{
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
- " %d :: %s", (*env)->error->error_number,
- AXIS2_ERROR_GET_MESSAGE((*env)->error));
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
+ " %d :: %s", env->error->error_number,
+ AXIS2_ERROR_GET_MESSAGE(env->error));
printf("echo stub invoke FAILED!\n");
status = AXIS2_FAILURE;
}
@@ -196,12 +196,12 @@
axis2_status_t AXIS2_CALL
echo_callback_on_error(struct axis2_callback *callback,
- axis2_env_t **env,
+ const axis2_env_t *env,
int exception)
{
/** take necessary action on error */
printf("\necho client invike FAILED. Error code:%d ::%s", exception,
- AXIS2_ERROR_GET_MESSAGE((*env)->error));
+ AXIS2_ERROR_GET_MESSAGE(env->error));
isComplete = 1;
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org