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 sa...@apache.org on 2006/06/01 07:18:49 UTC
svn commit: r410750 [5/11] - in /webservices/axis2/trunk/c:
woden/include/woden/wsdl20/ woden/include/woden/wsdl20/enumeration/
woden/include/woden/wsdl20/extensions/ woden/include/woden/wsdl20/xml/
woden/include/woden/xml/ woden/src/wsdl20/ woden/src/...
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h Wed May 31 22:18:45 2006
@@ -61,127 +61,127 @@
*/
axis2_status_t (AXIS2_CALL *
free) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *(AXIS2_CALL *
super_objs) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t (AXIS2_CALL *
type) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *(AXIS2_CALL *
get_base_impl) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *(AXIS2_CALL *
get_namespace) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix);
struct axis2_xml_schema_form *(AXIS2_CALL *
get_attr_form_default) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_attr_form_default) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_xml_schema_form *value);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
get_attr_groups) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
get_attrs) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_xml_schema_derivation_method *(AXIS2_CALL *
get_block_default) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_block_default) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_xml_schema_derivation_method *block_default);
struct axis2_xml_schema_form *(AXIS2_CALL *
get_element_form_default) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_element_form_default) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_xml_schema_form *element_form_default);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
get_elements) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_xml_schema_element *(AXIS2_CALL *
get_element_by_qname) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
struct axis2_xml_schema_type *(AXIS2_CALL *
get_type_by_qname) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
struct axis2_xml_schema_derivation_method *(AXIS2_CALL *
get_final_default) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_final_default) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_xml_schema_derivation_method *final_default);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
get_groups) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_collection *(AXIS2_CALL *
get_includes) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t (AXIS2_CALL *
is_compiled) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_collection *(AXIS2_CALL *
get_items) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
get_notations) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
get_schema_types) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *(AXIS2_CALL *
get_target_namespace) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_target_namespace) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *target_namespace);
axis2_char_t *(AXIS2_CALL *
get_version) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
compile) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
write_with_out) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *outstream);
axis2_status_t (AXIS2_CALL *
@@ -190,21 +190,21 @@
axis2_hash_t *(AXIS2_CALL *
get_prefix_to_namespace_map) (void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_prefix_to_namespace_map) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *map);
axis2_status_t (AXIS2_CALL *
add_type) (void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_xml_schema_type *type);
axis2_status_t (AXIS2_CALL *
set_schema_ns_prefix)(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *ns_prefix);
};
@@ -219,7 +219,7 @@
* Creates new Xml Schema
*/
AXIS2_EXTERN axis2_xml_schema_t * AXIS2_CALL
-axis2_xml_schema_create(axis2_env_t **env,
+axis2_xml_schema_create(const axis2_env_t *env,
axis2_char_t *namespc,
struct axis2_xml_schema_collection *parent);
@@ -229,7 +229,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_resolve_methods(
axis2_xml_schema_t *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t *schema_impl,
axis2_hash_t *methods);
Modified: webservices/axis2/trunk/c/xml_schema/src/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/om_util.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/om_util.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/om_util.c Wed May 31 22:18:45 2006
@@ -22,7 +22,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_first_child_element_with_uri(
axis2_om_node_t *ele_node,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *uri,
axis2_om_node_t **child)
{
@@ -30,7 +30,7 @@
if(!ele_node || !uri)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
return NULL;
}
@@ -66,14 +66,14 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_next_sibling_element_with_uri(
axis2_om_node_t *ele_node,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *uri,
axis2_om_node_t **next_node)
{
axis2_om_node_t *next_sib_node = NULL;
if(!ele_node || !uri)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
return NULL;
}
@@ -109,27 +109,27 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_first_child_element(axis2_om_element_t *ele,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_om_node_t **child_node)
{
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
return AXIS2_OM_ELEMENT_GET_FIRST_ELEMENT(ele, env, ele_node, child_node);
}
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_last_child_element(axis2_om_element_t *ele,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_om_node_t **child_node)
{
axis2_om_node_t *last_node = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
last_node = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
while(NULL != last_node)
@@ -148,13 +148,13 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_next_sibling_element(axis2_om_element_t *ele,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_om_node_t **next_node)
{
axis2_om_node_t *next_sibling = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
while(NULL != next_sibling)
@@ -172,7 +172,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_first_child_element_with_localname(axis2_om_element_t *ele,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *localname,
axis2_om_node_t **child_node)
@@ -182,9 +182,9 @@
axis2_char_t *child_localname = NULL;
axis2_om_element_t *om_ele = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, localname, NULL);
child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
if(NULL != child)
@@ -234,7 +234,7 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_last_child_element_with_localname(axis2_om_element_t *ele,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *localname,
axis2_om_node_t **child_node)
@@ -244,9 +244,9 @@
axis2_char_t *child_localname = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, localname, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
while(NULL != child)
@@ -286,7 +286,7 @@
axis2_char_t *ele_localname = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
while(NULL != next_sibling)
@@ -328,10 +328,10 @@
axis2_char_t *ns_uri = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
- AXIS2_PARAM_CHECK((*env)->error, uri, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, localname, NULL);
+ AXIS2_PARAM_CHECK(env->error, uri, NULL);
child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
if(!child)
@@ -410,10 +410,10 @@
axis2_char_t *ns_uri = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, uri, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, localname, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, uri, NULL);
child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
while(NULL != child)
@@ -460,7 +460,7 @@
axis2_om_namespace_t *ns = NULL;
axis2_char_t *ns_uri = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
while(NULL != next_sibling)
@@ -508,9 +508,9 @@
int size = 0;
int i = 0;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, names, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, names, NULL);
child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
if(NULL != child)
@@ -592,9 +592,9 @@
int i = 0;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, names, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, names, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
while(NULL != child)
@@ -641,9 +641,9 @@
int size = 0;
int i = 0;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, names, NULL);
- AXIS2_PARAM_CHECK((*env)->error, next_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, names, NULL);
+ AXIS2_PARAM_CHECK(env->error, next_node, NULL);
next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
@@ -697,11 +697,11 @@
axis2_char_t *om_attr_name = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
- AXIS2_PARAM_CHECK((*env)->error, attr_name, NULL);
- AXIS2_PARAM_CHECK((*env)->error, attr_value, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, localname, NULL);
+ AXIS2_PARAM_CHECK(env->error, attr_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, attr_value, NULL);
child = AXIS2_OM_NODE_GET_FIRST_CHILD(ele_node, env);
@@ -738,7 +738,7 @@
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
AXIS2_STRCMP(om_attr_value, attr_value) == 0)
{
- AXIS2_FREE((*env)->allocator, hi);
+ AXIS2_FREE(env->allocator, hi);
*child_node = child;
return om_ele;
}
@@ -828,9 +828,9 @@
axis2_hash_t *attr_ht = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, localname, NULL);
- AXIS2_PARAM_CHECK((*env)->error, child_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, localname, NULL);
+ AXIS2_PARAM_CHECK(env->error, child_node, NULL);
child = AXIS2_OM_NODE_GET_LAST_CHILD(ele_node, env);
while(NULL != child)
@@ -867,7 +867,7 @@
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
AXIS2_STRCMP(om_attr_value, attr_value) == 0)
{
- AXIS2_FREE((*env)->allocator, hi);
+ AXIS2_FREE(env->allocator, hi);
*child_node = child;
return om_ele;
}
@@ -907,7 +907,7 @@
axis2_hash_index_t *hi = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(ele_node, env);
@@ -944,7 +944,7 @@
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
AXIS2_STRCMP(om_attr_value, attr_value) == 0)
{
- AXIS2_FREE((*env)->allocator, hi);
+ AXIS2_FREE(env->allocator, hi);
*child_node = next_sibling;
return om_ele;
}
@@ -966,7 +966,7 @@
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
axis2_om_util_get_child_node_text(axis2_om_node_t *om_node,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_om_element_t *om_ele = NULL;
AXIS2_ENV_CHECK(env , NULL);
@@ -987,7 +987,7 @@
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
axis2_om_util_get_localname(axis2_om_node_t *node,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_om_element_t *om_ele = NULL;
@@ -1004,7 +1004,7 @@
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
axis2_om_util_get_node_namespace_uri(axis2_om_node_t *om_node,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_om_element_t *om_ele = NULL;
axis2_om_namespace_t *om_ns = NULL;
@@ -1024,13 +1024,13 @@
AXIS2_EXTERN axis2_om_child_element_iterator_t* AXIS2_CALL
axis2_om_util_get_child_elements(axis2_om_element_t *om_ele,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *om_node)
{
axis2_om_element_t *first_ele = NULL;
axis2_om_node_t *first_node = NULL;
- AXIS2_PARAM_CHECK((*env)->error, om_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, om_ele, NULL);
+ AXIS2_PARAM_CHECK(env->error, om_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, om_ele, NULL);
first_ele =
AXIS2_OM_ELEMENT_GET_FIRST_ELEMENT(om_ele, env, om_node, &first_node);
if(NULL != first_ele)
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema.c Wed May 31 22:18:45 2006
@@ -83,127 +83,127 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_free(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_super_objs(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_type(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_get_base_impl(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_get_namespace(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix);
axis2_xml_schema_form_t *AXIS2_CALL
axis2_xml_schema_get_attr_form_default(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_attr_form_default(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_form_t *value);
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_attr_groups(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_attrs(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_derivation_method_t *AXIS2_CALL
axis2_xml_schema_get_block_default(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_block_default(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_derivation_method_t *block_default);
axis2_xml_schema_form_t *AXIS2_CALL
axis2_xml_schema_get_element_form_default(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_element_form_default(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_form_t *element_form_default);
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_elements(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_element_t *AXIS2_CALL
axis2_xml_schema_get_element_by_qname(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_xml_schema_type_t *AXIS2_CALL
axis2_xml_schema_get_type_by_qname(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_xml_schema_derivation_method_t *AXIS2_CALL
axis2_xml_schema_get_final_default(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_final_default(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_derivation_method_t *final_default);
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_groups(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_collection_t *AXIS2_CALL
axis2_xml_schema_get_includes(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_xml_schema_is_compiled(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_collection_t *AXIS2_CALL
axis2_xml_schema_get_items(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_notations(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_schema_types(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_get_target_namespace(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_target_namespace(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *target_namespace);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_get_version(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_compile(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_write_with_out(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *outstream);
axis2_status_t AXIS2_CALL
@@ -212,26 +212,26 @@
static axis2_status_t
serialize_internal(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *writer);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_get_prefix_to_namespace_map(void *schema,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_prefix_to_namespace_map(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *map);
axis2_status_t AXIS2_CALL
axis2_xml_schema_add_type(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_type_t *type);
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_schema_ns_prefix(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *ns_prefix);
@@ -239,18 +239,18 @@
AXIS2_EXTERN axis2_xml_schema_t * AXIS2_CALL
-axis2_xml_schema_create(axis2_env_t **env,
+axis2_xml_schema_create(const axis2_env_t *env,
axis2_char_t *namespc,
axis2_xml_schema_collection_t *parent)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- schema_impl = AXIS2_MALLOC((*env)->allocator,
+ schema_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_impl_t));
if(!schema_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -282,11 +282,11 @@
schema_impl->target_namespace =
AXIS2_STRDUP(AXIS2_XML_SCHEMA_DEFAULT_TARGET_NS, env);
}
- schema_impl->schema.ops = AXIS2_MALLOC((*env)->allocator,
+ schema_impl->schema.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_ops_t));
if(!schema_impl->schema.ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_xml_schema_free(&(schema_impl->schema), env);
return NULL;
}
@@ -396,7 +396,7 @@
schema_impl->methods = axis2_hash_make(env);
if(!schema_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(schema_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -469,7 +469,7 @@
schema_impl->ht_super = axis2_hash_make(env);
if(!schema_impl->ht_super)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(schema_impl->ht_super, "AXIS2_XML_SCHEMA",
@@ -491,7 +491,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_free(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -518,13 +518,13 @@
if((&(schema_impl->schema))->ops)
{
- AXIS2_FREE((*env)->allocator, (&(schema_impl->schema))->ops);
+ AXIS2_FREE(env->allocator, (&(schema_impl->schema))->ops);
(&(schema_impl->schema))->ops = NULL;
}
if(schema_impl)
{
- AXIS2_FREE((*env)->allocator, schema_impl);
+ AXIS2_FREE(env->allocator, schema_impl);
schema_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -532,7 +532,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_type(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -544,7 +544,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_super_objs(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -556,7 +556,7 @@
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_get_base_impl(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -569,19 +569,19 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_resolve_methods(
axis2_xml_schema_t *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t *schema_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_impl_t *schema_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, schema_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, schema_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
schema_impl_l = (axis2_xml_schema_impl_t *) schema_impl;
- schema->ops = AXIS2_MALLOC((*env)->allocator,
+ schema->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_ops_t));
schema->ops->free = axis2_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
@@ -769,14 +769,14 @@
axis2_char_t *AXIS2_CALL
axis2_xml_schema_get_namespace(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, prefix, NULL);
+ AXIS2_PARAM_CHECK(env->error, prefix, NULL);
ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
if(NULL != ht_super)
{
@@ -799,7 +799,7 @@
axis2_xml_schema_form_t *AXIS2_CALL
axis2_xml_schema_get_attr_form_default(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -818,7 +818,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_attr_form_default(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_form_t *value)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -843,7 +843,7 @@
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_attr_groups(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -863,7 +863,7 @@
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_attrs(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -882,7 +882,7 @@
axis2_xml_schema_derivation_method_t *AXIS2_CALL
axis2_xml_schema_get_block_default(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -901,7 +901,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_block_default(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_derivation_method_t *block_default)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -927,7 +927,7 @@
axis2_xml_schema_form_t *AXIS2_CALL
axis2_xml_schema_get_element_form_default(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -946,12 +946,12 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_element_form_default(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_form_t *element_form_default)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
- AXIS2_PARAM_CHECK((*env)->error, element_form_default, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, element_form_default, AXIS2_FAILURE);
ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
if(NULL != ht_super)
{
@@ -971,7 +971,7 @@
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_elements(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -990,12 +990,12 @@
axis2_xml_schema_element_t *AXIS2_CALL
axis2_xml_schema_get_element_by_qname(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
if(NULL != ht_super)
@@ -1015,13 +1015,13 @@
axis2_xml_schema_type_t *AXIS2_CALL
axis2_xml_schema_get_type_by_qname(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error,qname, NULL);
+ AXIS2_PARAM_CHECK(env->error,qname, NULL);
ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
if(NULL != ht_super)
{
@@ -1040,7 +1040,7 @@
axis2_xml_schema_derivation_method_t *AXIS2_CALL
axis2_xml_schema_get_final_default(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1057,7 +1057,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_final_default(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_derivation_method_t *final_default)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -1079,7 +1079,7 @@
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_groups(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1096,7 +1096,7 @@
axis2_xml_schema_obj_collection_t *AXIS2_CALL
axis2_xml_schema_get_includes(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1114,7 +1114,7 @@
axis2_bool_t AXIS2_CALL
axis2_xml_schema_is_compiled(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1131,7 +1131,7 @@
axis2_xml_schema_obj_collection_t *AXIS2_CALL
axis2_xml_schema_get_items(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1148,7 +1148,7 @@
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_notations(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1165,7 +1165,7 @@
axis2_xml_schema_obj_table_t *AXIS2_CALL
axis2_xml_schema_get_schema_types(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1183,7 +1183,7 @@
axis2_char_t *AXIS2_CALL
axis2_xml_schema_get_target_namespace(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{ axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -1199,7 +1199,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_target_namespace(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *target_namespace)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -1215,7 +1215,7 @@
return AXIS2_FAILURE;
if(NULL != schema_impl->target_namespace)
{
- AXIS2_FREE((*env)->allocator, schema_impl->target_namespace);
+ AXIS2_FREE(env->allocator, schema_impl->target_namespace);
schema_impl->target_namespace = NULL;
}
@@ -1226,7 +1226,7 @@
axis2_char_t *AXIS2_CALL
axis2_xml_schema_get_version(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1243,7 +1243,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_compile(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/** TODO */
return AXIS2_SUCCESS;
@@ -1251,7 +1251,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_write_with_out(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *outstream)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -1274,7 +1274,7 @@
static axis2_status_t
serialize_internal(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *writer)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -1290,7 +1290,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_get_prefix_to_namespace_map(void *schema,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -1301,12 +1301,12 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_prefix_to_namespace_map(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *map)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, map, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, map, AXIS2_FAILURE);
schema_impl = AXIS2_INTF_TO_IMPL(schema);
if(NULL != schema_impl->namespaces_map)
{
@@ -1318,7 +1318,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_add_type(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_type_t *type)
{
@@ -1327,7 +1327,7 @@
axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, type, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, type, AXIS2_FAILURE);
ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
@@ -1351,15 +1351,15 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_set_schema_ns_prefix(void *schema,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *ns_prefix)
{
axis2_xml_schema_impl_t *sch_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, ns_prefix, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ns_prefix, AXIS2_FAILURE);
sch_impl = AXIS2_INTF_TO_IMPL(schema);
if(NULL != sch_impl->schema_ns_prefix)
{
- AXIS2_FREE((*env)->allocator, sch_impl->schema_ns_prefix);
+ AXIS2_FREE(env->allocator, sch_impl->schema_ns_prefix);
sch_impl->schema_ns_prefix = NULL;
}
sch_impl->schema_ns_prefix = AXIS2_STRDUP(ns_prefix, env);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c Wed May 31 22:18:45 2006
@@ -52,65 +52,65 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotated_free(
void *annotated,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_annotated_super_objs(
void *annotated,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_annotated_type(
void *annotated,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_t *AXIS2_CALL
axis2_xml_schema_annotated_get_base_impl(void *annotated,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_annotated_get_id(void *annotated,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotated_set_id(void *annotated,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *id);
axis2_xml_schema_annotation_t *AXIS2_CALL
axis2_xml_schema_annotated_get_annotation(void *annotated,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotated_set_annotation(void *annotated,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_annotation_t *
annotation);
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_annotated_get_unhandled_attrs(void *annotated,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotated_set_unhandled_attrs(void *annotated,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *
unhandled_attrs);
/******************* implementation functions ********************************/
AXIS2_EXTERN axis2_xml_schema_annotated_t * AXIS2_CALL
-axis2_xml_schema_annotated_create(axis2_env_t **env)
+axis2_xml_schema_annotated_create(const axis2_env_t *env)
{
axis2_xml_schema_annotated_impl_t *annotated_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
- annotated_impl = AXIS2_MALLOC((*env)->allocator,
+ annotated_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_annotated_impl_t));
if(!annotated_impl)
{
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -124,12 +124,12 @@
annotated_impl->annotated.ops = NULL;
annotated_impl->annotated.base.ops = NULL;
- annotated_impl->annotated.ops = AXIS2_MALLOC((*env)->allocator,
+ annotated_impl->annotated.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_annotated_ops_t));
if(!annotated_impl->annotated.ops)
{
axis2_xml_schema_annotated_free(&(annotated_impl->annotated), env);
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -157,7 +157,7 @@
annotated_impl->methods = axis2_hash_make(env);
if(!annotated_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(annotated_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -189,7 +189,7 @@
annotated_impl->ht_super = axis2_hash_make(env);
if(!annotated_impl->ht_super)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(annotated_impl->ht_super, "AXIS2_XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING,
@@ -206,7 +206,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotated_free(void *annotated,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_annotated_impl_t *annotated_impl = NULL;
@@ -215,7 +215,7 @@
if(NULL != annotated_impl->id)
{
- AXIS2_FREE((*env)->allocator, annotated_impl->id);
+ AXIS2_FREE(env->allocator, annotated_impl->id);
annotated_impl->id = NULL;
}
@@ -252,16 +252,16 @@
if(NULL != annotated_impl->annotated.ops)
{
- AXIS2_FREE((*env)->allocator, annotated_impl->annotated.ops);
+ AXIS2_FREE(env->allocator, annotated_impl->annotated.ops);
annotated_impl->annotated.ops = NULL;
}
if(NULL != annotated_impl->annotated.base.ops)
{
- AXIS2_FREE((*env)->allocator, annotated_impl->annotated.base.ops);
+ AXIS2_FREE(env->allocator, annotated_impl->annotated.base.ops);
annotated_impl->annotated.base.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, annotated_impl);
+ AXIS2_FREE(env->allocator, annotated_impl);
annotated_impl = NULL;
return AXIS2_SUCCESS;
}
@@ -269,7 +269,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_annotated_super_objs(
void *annotated,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(annotated)->ht_super;
}
@@ -277,14 +277,14 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_annotated_type(
void *annotated,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(annotated)->obj_type;
}
axis2_xml_schema_obj_t *AXIS2_CALL
axis2_xml_schema_annotated_get_base_impl(void *annotated,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(annotated)->schema_obj;
}
@@ -292,23 +292,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_annotated_resolve_methods(
axis2_xml_schema_annotated_t *annotated,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_annotated_t *annotated_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_annotated_impl_t *sch_annotated_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, annotated_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, annotated_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
sch_annotated_impl = (axis2_xml_schema_annotated_impl_t *) annotated_impl;
- annotated->ops = AXIS2_MALLOC((*env)->allocator,
+ annotated->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_annotated_ops_t));
if(!annotated->ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
annotated->ops->free = axis2_hash_get(methods, "free",
@@ -360,7 +360,7 @@
axis2_char_t *AXIS2_CALL
axis2_xml_schema_annotated_get_id(void *annotated,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_annotated_impl_t *annotated_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -381,14 +381,14 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotated_set_id(void *annotated,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *id)
{
axis2_xml_schema_annotated_impl_t *annotated_impl = NULL;
axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, id,AXIS2_FAILURE );
+ AXIS2_PARAM_CHECK(env->error, id,AXIS2_FAILURE );
ht_super = AXIS2_XML_SCHEMA_ANNOTATED_SUPER_OBJS(annotated, env);
if(NULL != ht_super)
@@ -401,7 +401,7 @@
}
if(annotated_impl->id)
{
- AXIS2_FREE((*env)->allocator, annotated_impl->id);
+ AXIS2_FREE(env->allocator, annotated_impl->id);
annotated_impl->id = NULL;
}
annotated_impl->id = AXIS2_STRDUP(id, env);
@@ -411,7 +411,7 @@
axis2_xml_schema_annotation_t *AXIS2_CALL
axis2_xml_schema_annotated_get_annotation(void *annotated,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_annotated_impl_t *annotated_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -429,7 +429,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotated_set_annotation(void *annotated,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_annotation_t *
annotation)
{
@@ -458,7 +458,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_annotated_get_unhandled_attrs(void *annotated,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_annotated_impl_t *annotated_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -477,7 +477,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotated_set_unhandled_attrs(void *annotated,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *
unhandled_attrs)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c Wed May 31 22:18:45 2006
@@ -48,39 +48,39 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotation_free(
void *annotation,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_annotation_super_objs(
void *annotation,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_annotation_type(
void *annotation,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_t *AXIS2_CALL
axis2_xml_schema_annotation_get_base_impl(void *annotation,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_collection_t * AXIS2_CALL
axis2_xml_schema_annotation_get_items(void *annotation,
- axis2_env_t **env);
+ const axis2_env_t *env);
/********************** end **************************************************/
AXIS2_EXTERN axis2_xml_schema_annotation_t * AXIS2_CALL
-axis2_xml_schema_annotation_create(axis2_env_t **env)
+axis2_xml_schema_annotation_create(const axis2_env_t *env)
{
axis2_xml_schema_annotation_impl_t *annotation_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- annotation_impl = AXIS2_MALLOC((*env)->allocator,
+ annotation_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_annotation_impl_t));
if(!annotation_impl)
{
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
annotation_impl->schema_obj = NULL;
@@ -91,12 +91,12 @@
annotation_impl->annotation.base.ops = NULL;
annotation_impl->annotation.ops = NULL;
- annotation_impl->annotation.ops = AXIS2_MALLOC((*env)->allocator,
+ annotation_impl->annotation.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_annotation_ops_t));
if(!annotation_impl->annotation.ops)
{
axis2_xml_schema_annotation_free(&(annotation_impl->annotation), env);
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -119,7 +119,7 @@
if(!annotation_impl->items)
{
axis2_xml_schema_annotation_free(&(annotation_impl->annotation), env);
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -127,7 +127,7 @@
if(!annotation_impl->methods)
{
axis2_xml_schema_annotation_free(&(annotation_impl->annotation), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -147,7 +147,7 @@
if(!annotation_impl->schema_obj)
{
axis2_xml_schema_annotation_free(&(annotation_impl->annotation), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -155,7 +155,7 @@
if(!annotation_impl->ht_super)
{
axis2_xml_schema_annotation_free(&(annotation_impl->annotation), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(annotation_impl->methods, "AXIS2_XML_SCHEMA_ANNOTATION",
@@ -172,7 +172,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_annotation_free(void *annotation,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_annotation_impl_t *annotation_impl = NULL;
@@ -205,17 +205,17 @@
if(NULL != annotation_impl->annotation.ops)
{
- AXIS2_FREE((*env)->allocator, annotation_impl->annotation.ops);
+ AXIS2_FREE(env->allocator, annotation_impl->annotation.ops);
annotation_impl->annotation.ops = NULL;
}
if(NULL != annotation_impl->annotation.base.ops)
{
- AXIS2_FREE((*env)->allocator, annotation_impl->annotation.base.ops);
+ AXIS2_FREE(env->allocator, annotation_impl->annotation.base.ops);
annotation_impl->annotation.base.ops = NULL;
}
if(annotation_impl)
{
- AXIS2_FREE((*env)->allocator, annotation_impl);
+ AXIS2_FREE(env->allocator, annotation_impl);
annotation_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -224,7 +224,7 @@
axis2_xml_schema_obj_t *AXIS2_CALL
axis2_xml_schema_annotation_get_base_impl(void *annotation,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_annotation_impl_t *annotation_impl = NULL;
annotation_impl = AXIS2_INTF_TO_IMPL(annotation);
@@ -233,7 +233,7 @@
axis2_xml_schema_obj_collection_t *AXIS2_CALL
axis2_xml_schema_annotation_get_items(void *annotation,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/*
axis2_xml_schema_annotation_impl_t *annotation_impl = NULL;
@@ -254,7 +254,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_annotation_super_objs(
void *annotation,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_annotation_impl_t *annotation_impl = NULL;
annotation_impl = AXIS2_INTF_TO_IMPL(annotation);
@@ -264,7 +264,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_annotation_type(
void *annotation,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_annotation_impl_t *annotation_impl = NULL;
annotation_impl = AXIS2_INTF_TO_IMPL(annotation);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c Wed May 31 22:18:45 2006
@@ -48,55 +48,55 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_free(
void *any,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_any_super_objs(
void *any,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_any_type(
void *any,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_particle_t *AXIS2_CALL
axis2_xml_schema_any_get_base_impl(void *any,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_any_get_namespace(void *any,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_set_namespace(void *any,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *namespc);
axis2_xml_schema_content_processing_t *AXIS2_CALL
axis2_xml_schema_any_get_process_content(void *any,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_set_process_content(
void *any,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_content_processing_t *process_content);
/************************ end function prototypes ******************************/
AXIS2_EXTERN axis2_xml_schema_any_t * AXIS2_CALL
-axis2_xml_schema_any_create(axis2_env_t **env)
+axis2_xml_schema_any_create(const axis2_env_t *env)
{
axis2_xml_schema_any_impl_t *any_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
axis2_xml_schema_annotated_t *annotated = NULL;
- any_impl = AXIS2_MALLOC((*env)->allocator,
+ any_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_any_impl_t));
if(!any_impl)
{
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
any_impl->any.base.ops = NULL;
@@ -107,13 +107,13 @@
any_impl->particle = NULL;
any_impl->process_content = NULL;
- any_impl->any.ops = AXIS2_MALLOC((*env)->allocator,
+ any_impl->any.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_any_ops_t));
if(!any_impl->any.ops)
{
axis2_xml_schema_any_free(&(any_impl->any), env);
- AXIS2_ERROR_SET((*env)->error ,
+ AXIS2_ERROR_SET(env->error ,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -147,7 +147,7 @@
any_impl->methods = axis2_hash_make(env);
if(!any_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(any_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -169,13 +169,13 @@
if(!any_impl->particle)
{
axis2_xml_schema_any_free(&(any_impl->any), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
any_impl->ht_super = axis2_hash_make(env);
if(!any_impl->ht_super)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(any_impl->ht_super, "AXIS_XML_SCHEMA_ANY", AXIS2_HASH_KEY_STRING,
@@ -201,7 +201,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_free(void *any,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_any_impl_t *any_impl = NULL;
@@ -210,7 +210,7 @@
if(NULL != any_impl->ns)
{
- AXIS2_FREE((*env)->allocator, any_impl->ns);
+ AXIS2_FREE(env->allocator, any_impl->ns);
any_impl->ns = NULL;
}
@@ -240,23 +240,23 @@
if(NULL != any_impl->any.ops)
{
- AXIS2_FREE((*env)->allocator, any_impl->any.ops);
+ AXIS2_FREE(env->allocator, any_impl->any.ops);
any_impl->any.ops = NULL;
}
if(NULL != any_impl->any.base.ops)
{
- AXIS2_FREE((*env)->allocator, any_impl->any.base.ops);
+ AXIS2_FREE(env->allocator, any_impl->any.base.ops);
any_impl->any.base.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, any_impl);
+ AXIS2_FREE(env->allocator, any_impl);
any_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_any_type(void *any,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_any_impl_t *any_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -267,7 +267,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_any_super_objs(
void *any,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_any_impl_t *any_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -277,7 +277,7 @@
axis2_xml_schema_particle_t *AXIS2_CALL
axis2_xml_schema_any_get_base_impl(void *any,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_any_impl_t *any_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -288,23 +288,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_any_resolve_methods(
axis2_xml_schema_any_t *any,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_any_t *any_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_any_impl_t *sch_any_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, any_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, any_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
sch_any_impl = (axis2_xml_schema_any_impl_t *) any_impl;
- any->ops = AXIS2_MALLOC((*env)->allocator,
+ any->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_any_ops_t));
if(!any->ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
any->ops->free = axis2_hash_get(methods, "free",
@@ -347,7 +347,7 @@
axis2_char_t *AXIS2_CALL
axis2_xml_schema_any_get_namespace(void *any,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_any_impl_t *any_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -365,12 +365,12 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_set_namespace(void *any,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *namespc)
{
axis2_xml_schema_any_impl_t *any_impl = NULL;
axis2_hash_t *ht_super = NULL;
- AXIS2_PARAM_CHECK((*env)->error, namespc, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
ht_super = AXIS2_XML_SCHEMA_ANY_SUPER_OBJS(any, env);
if(NULL != ht_super)
@@ -382,7 +382,7 @@
}
if(NULL != any_impl->ns)
{
- AXIS2_FREE((*env)->allocator, any_impl->ns);
+ AXIS2_FREE(env->allocator, any_impl->ns);
any_impl->ns = NULL;
}
any_impl->ns = AXIS2_STRDUP(any_impl->ns, env);
@@ -391,7 +391,7 @@
axis2_xml_schema_content_processing_t *AXIS2_CALL
axis2_xml_schema_any_get_process_content(void *any,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_any_impl_t *any_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -409,14 +409,14 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_set_process_content(void *any,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_content_processing_t *
process_content)
{
axis2_xml_schema_any_impl_t *any_impl = NULL;
axis2_hash_t *ht_super = NULL;
- AXIS2_PARAM_CHECK((*env)->error, process_content, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, process_content, AXIS2_FAILURE);
ht_super = AXIS2_XML_SCHEMA_ANY_SUPER_OBJS(any, env);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c Wed May 31 22:18:45 2006
@@ -50,51 +50,51 @@
/******************* function prototypes **********************************/
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_attribute_free(void *any_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_any_attribute_get_base_impl(void *any_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_any_attribute_type(void *any_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_any_attribute_super_objs(void *any_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_any_attribute_get_namespace(void *any_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_attribute_set_namespace(void *any_attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *ns);
axis2_xml_schema_content_processing_t *AXIS2_CALL
axis2_xml_schema_any_attribute_get_process_content(void *any_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_attribute_set_process_content(void *any_attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_content_processing_t *process_content);
/************************ end function prototypes ******************************/
AXIS2_EXTERN axis2_xml_schema_any_attribute_t * AXIS2_CALL
-axis2_xml_schema_any_attribute_create(axis2_env_t **env)
+axis2_xml_schema_any_attribute_create(const axis2_env_t *env)
{
axis2_xml_schema_any_attribute_impl_t *any_attr_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- any_attr_impl = AXIS2_MALLOC((*env)->allocator,
+ any_attr_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_any_attribute_impl_t));
if(!any_attr_impl)
{
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
any_attr_impl->any_attr.base.ops = NULL;
@@ -105,13 +105,13 @@
any_attr_impl->methods = NULL;
any_attr_impl->ht_super = NULL;
any_attr_impl->obj_type = AXIS2_XML_SCHEMA_ANY_ATTRIBUTE;
- any_attr_impl->any_attr.ops = AXIS2_MALLOC((*env)->allocator,
+ any_attr_impl->any_attr.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_any_attribute_ops_t));
if(!any_attr_impl->any_attr.ops)
{
axis2_xml_schema_any_attribute_free(&(any_attr_impl->any_attr), env);
- AXIS2_ERROR_SET((*env)->error ,
+ AXIS2_ERROR_SET(env->error ,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -149,7 +149,7 @@
any_attr_impl->methods = axis2_hash_make(env);
if(!any_attr_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(any_attr_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -171,7 +171,7 @@
if(!any_attr_impl->methods)
{
axis2_xml_schema_any_attribute_free(&(any_attr_impl->any_attr), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -179,7 +179,7 @@
if(!any_attr_impl->methods)
{
axis2_xml_schema_any_attribute_free(&(any_attr_impl->any_attr), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(any_attr_impl->ht_super, "AXIS2_XML_SCHEMA_ANY_ATTRIBUTE",
@@ -200,7 +200,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_attribute_free(void *any_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_any_attribute_impl_t *any_attr_impl = NULL;
@@ -209,7 +209,7 @@
if(NULL != any_attr_impl->ns)
{
- AXIS2_FREE((*env)->allocator, any_attr_impl->ns);
+ AXIS2_FREE(env->allocator, any_attr_impl->ns);
any_attr_impl->ns = NULL;
}
if(NULL != any_attr_impl->ht_super)
@@ -237,23 +237,23 @@
if(NULL != any_attr_impl->any_attr.ops)
{
- AXIS2_FREE((*env)->allocator, any_attr_impl->any_attr.ops);
+ AXIS2_FREE(env->allocator, any_attr_impl->any_attr.ops);
any_attr_impl->any_attr.ops = NULL;
}
if(NULL != any_attr_impl->any_attr.base.ops)
{
- AXIS2_FREE((*env)->allocator, any_attr_impl->any_attr.base.ops);
+ AXIS2_FREE(env->allocator, any_attr_impl->any_attr.base.ops);
any_attr_impl->any_attr.base.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, any_attr_impl);
+ AXIS2_FREE(env->allocator, any_attr_impl);
any_attr_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_any_attribute_get_base_impl(void *any_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_any_attribute_impl_t *any_attr_impl = NULL;
@@ -266,23 +266,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_any_attribute_resolve_methods(
axis2_xml_schema_any_attribute_t *any_attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_any_attribute_t *any_attr_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_any_attribute_impl_t *any_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, any_attr_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, any_attr_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
any_impl_l = (axis2_xml_schema_any_attribute_impl_t *) any_attr_impl;
- any_attr->ops = AXIS2_MALLOC((*env)->allocator,
+ any_attr->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_any_attribute_ops_t));
if(NULL != any_attr->ops)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -306,14 +306,14 @@
*/
axis2_char_t *AXIS2_CALL
axis2_xml_schema_any_attribute_get_namespace(void *any_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(any_attr)->ns;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_attribute_set_namespace(void *any_attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *namespc)
{
axis2_xml_schema_any_attribute_impl_t *any_attr_impl = NULL;
@@ -323,7 +323,7 @@
if(!any_attr_impl->ns)
{
- AXIS2_FREE((*env)->allocator, any_attr_impl->ns);
+ AXIS2_FREE(env->allocator, any_attr_impl->ns);
any_attr_impl->ns = NULL;
}
any_attr_impl->ns = AXIS2_STRDUP(any_attr_impl->ns, env);
@@ -332,14 +332,14 @@
axis2_xml_schema_content_processing_t *AXIS2_CALL
axis2_xml_schema_any_attribute_get_process_content(void *any_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(any_attr)->process_content;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_any_attribute_set_process_content(void *any_attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_content_processing_t *
process_content)
{
@@ -360,14 +360,14 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_any_attribute_type(void *any_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(any_attr)->obj_type;
}
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_any_attribute_super_objs(void *any_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(any_attr)->ht_super;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org