Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 66461 invoked from network); 12 Jun 2006 10:31:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jun 2006 10:31:30 -0000 Received: (qmail 19750 invoked by uid 500); 12 Jun 2006 10:31:13 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 19411 invoked by uid 500); 12 Jun 2006 10:31:11 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 19380 invoked by uid 500); 12 Jun 2006 10:31:10 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 19024 invoked by uid 99); 12 Jun 2006 10:31:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2006 03:31:07 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2006 03:30:56 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 372511A986E; Mon, 12 Jun 2006 03:30:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413626 [15/18] - in /webservices/axis2/trunk/c/xml_schema: include/ samples/ src/ test/ Date: Mon, 12 Jun 2006 10:29:46 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060612103013.372511A986E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c?rev=413626&r1=413625&r2=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c Mon Jun 12 03:29:40 2006 @@ -14,90 +14,90 @@ * limitations under the License. */ -#include -#include +#include +#include /** - * @brief axis2_xml_schema_redefine_impl + * @brief xml_schema_redefine_impl */ -typedef struct axis2_xml_schema_redefine_impl +typedef struct xml_schema_redefine_impl { - axis2_xml_schema_redefine_t redefine; + xml_schema_redefine_t redefine; - axis2_xml_schema_external_t *external; + xml_schema_external_t *external; - axis2_xml_schema_obj_collection_t *items; + xml_schema_obj_collection_t *items; - axis2_xml_schema_obj_table_t *attr_groups; + xml_schema_obj_table_t *attr_groups; - axis2_xml_schema_obj_table_t *groups; + xml_schema_obj_table_t *groups; - axis2_xml_schema_obj_table_t *schema_types; + xml_schema_obj_table_t *schema_types; axis2_hash_t *methods; axis2_hash_t *ht_super; - axis2_xml_schema_types_t obj_type; + xml_schema_types_t obj_type; -}axis2_xml_schema_redefine_impl_t; +}xml_schema_redefine_impl_t; #define AXIS2_INTF_TO_IMPL(redefine) \ - ((axis2_xml_schema_redefine_impl_t *) redefine) + ((xml_schema_redefine_impl_t *) redefine) /********************* function prototypes ***********************************/ axis2_status_t AXIS2_CALL -axis2_xml_schema_redefine_free(void *redefine, +xml_schema_redefine_free(void *redefine, const axis2_env_t *env); -axis2_xml_schema_external_t *AXIS2_CALL -axis2_xml_schema_redefine_get_base_impl(void *redefine, +xml_schema_external_t *AXIS2_CALL +xml_schema_redefine_get_base_impl(void *redefine, const axis2_env_t *env); -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_redefine_get_type(void *redefine, +xml_schema_types_t AXIS2_CALL +xml_schema_redefine_get_type(void *redefine, const axis2_env_t *env); axis2_hash_t *AXIS2_CALL -axis2_xml_schema_redefine_super_objs(void *redefine, +xml_schema_redefine_super_objs(void *redefine, const axis2_env_t *env); -axis2_xml_schema_obj_table_t* AXIS2_CALL -axis2_xml_schema_redefine_get_attribute_group(void *redefine, +xml_schema_obj_table_t* AXIS2_CALL +xml_schema_redefine_get_attribute_group(void *redefine, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_xml_schema_redefine_set_attribute_group(void *redefine, +xml_schema_redefine_set_attribute_group(void *redefine, const axis2_env_t *env, - axis2_xml_schema_obj_table_t *group); + xml_schema_obj_table_t *group); -axis2_xml_schema_obj_collection_t* AXIS2_CALL -axis2_xml_schema_redefine_get_items(void *redefine, +xml_schema_obj_collection_t* AXIS2_CALL +xml_schema_redefine_get_items(void *redefine, const axis2_env_t *env); -axis2_xml_schema_obj_table_t* AXIS2_CALL -axis2_xml_schema_redefine_get_schema_types(void *redefine, +xml_schema_obj_table_t* AXIS2_CALL +xml_schema_redefine_get_schema_types(void *redefine, const axis2_env_t *env); -axis2_xml_schema_obj_table_t* AXIS2_CALL -axis2_xml_schema_redefine_get_group(void *redefine, +xml_schema_obj_table_t* AXIS2_CALL +xml_schema_redefine_get_group(void *redefine, const axis2_env_t *env); /********************* end function prototypes ********************************/ -AXIS2_EXTERN axis2_xml_schema_redefine_t * AXIS2_CALL -axis2_xml_schema_redefine_create(const axis2_env_t *env) +AXIS2_EXTERN xml_schema_redefine_t * AXIS2_CALL +xml_schema_redefine_create(const axis2_env_t *env) { - axis2_xml_schema_redefine_impl_t *redefine_impl = NULL; - axis2_xml_schema_annotated_t *annotated = NULL; + xml_schema_redefine_impl_t *redefine_impl = NULL; + xml_schema_annotated_t *annotated = NULL; axis2_status_t status = AXIS2_FAILURE; redefine_impl = AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_redefine_impl_t)); + sizeof(xml_schema_redefine_impl_t)); if(!redefine_impl) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); @@ -111,83 +111,83 @@ redefine_impl->groups = NULL; redefine_impl->schema_types = NULL; redefine_impl->items = NULL; - redefine_impl->obj_type = AXIS2_XML_SCHEMA_REDEFINE; + redefine_impl->obj_type = XML_SCHEMA_REDEFINE; redefine_impl->ht_super = NULL; redefine_impl->redefine.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_redefine_ops_t)); + sizeof(xml_schema_redefine_ops_t)); if(!redefine_impl->redefine.ops) { - axis2_xml_schema_redefine_free(&(redefine_impl->redefine), env); + xml_schema_redefine_free(&(redefine_impl->redefine), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } redefine_impl->redefine.ops->free = - axis2_xml_schema_redefine_free; + xml_schema_redefine_free; redefine_impl->redefine.ops->get_base_impl = - axis2_xml_schema_redefine_get_base_impl; + xml_schema_redefine_get_base_impl; redefine_impl->redefine.ops->get_type = - axis2_xml_schema_redefine_get_type; + xml_schema_redefine_get_type; redefine_impl->redefine.ops->super_objs = - axis2_xml_schema_redefine_super_objs; + xml_schema_redefine_super_objs; redefine_impl->redefine.ops->get_items = - axis2_xml_schema_redefine_get_items; + xml_schema_redefine_get_items; redefine_impl->redefine.ops->get_group = - axis2_xml_schema_redefine_get_group; + xml_schema_redefine_get_group; redefine_impl->redefine.ops->get_attribute_group = - axis2_xml_schema_redefine_get_attribute_group; + xml_schema_redefine_get_attribute_group; redefine_impl->redefine.ops->set_attribute_group = - axis2_xml_schema_redefine_set_attribute_group; + xml_schema_redefine_set_attribute_group; redefine_impl->redefine.ops->get_schema_types = - axis2_xml_schema_redefine_get_schema_types; + xml_schema_redefine_get_schema_types; redefine_impl->methods = axis2_hash_make(env); redefine_impl->ht_super = axis2_hash_make(env); if(!redefine_impl->methods || !redefine_impl->ht_super) { - axis2_xml_schema_redefine_free(&(redefine_impl->redefine), env); + xml_schema_redefine_free(&(redefine_impl->redefine), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } axis2_hash_set(redefine_impl->methods, "free", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_redefine_free); + xml_schema_redefine_free); axis2_hash_set(redefine_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_redefine_get_type); + xml_schema_redefine_get_type); axis2_hash_set(redefine_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_redefine_super_objs); + xml_schema_redefine_super_objs); axis2_hash_set(redefine_impl->methods, "get_items", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_redefine_get_items); + AXIS2_HASH_KEY_STRING, xml_schema_redefine_get_items); axis2_hash_set(redefine_impl->methods, "get_group", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_redefine_get_group); + AXIS2_HASH_KEY_STRING, xml_schema_redefine_get_group); - redefine_impl->external = axis2_xml_schema_external_create(env); + redefine_impl->external = xml_schema_external_create(env); if(!redefine_impl->external) { - axis2_xml_schema_redefine_free(&(redefine_impl->redefine), env); + xml_schema_redefine_free(&(redefine_impl->redefine), env); return NULL; } - axis2_hash_set(redefine_impl->ht_super, "AXIS2_XML_SCHEMA_REDEFINE", + axis2_hash_set(redefine_impl->ht_super, "XML_SCHEMA_REDEFINE", AXIS2_HASH_KEY_STRING, &(redefine_impl->redefine)); - axis2_hash_set(redefine_impl->ht_super, "AXIS2_XML_SCHEMA_EXTERNAL", + axis2_hash_set(redefine_impl->ht_super, "XML_SCHEMA_EXTERNAL", AXIS2_HASH_KEY_STRING, redefine_impl->external); - annotated = AXIS2_XML_SCHEMA_EXTERNAL_GET_BASE_IMPL(redefine_impl->external, env); + annotated = XML_SCHEMA_EXTERNAL_GET_BASE_IMPL(redefine_impl->external, env); if(NULL != redefine_impl->external) { - axis2_hash_set(redefine_impl->ht_super, "AXIS2_XML_SCHEMA_ANNOTATED", + axis2_hash_set(redefine_impl->ht_super, "XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING, annotated); - axis2_hash_set(redefine_impl->ht_super, "AXIS2_XML_SCHEMA_OBJ", + axis2_hash_set(redefine_impl->ht_super, "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING, - AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env)); + XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env)); } - status = axis2_xml_schema_external_resolve_methods( + status = xml_schema_external_resolve_methods( &(redefine_impl->redefine.base), env, redefine_impl->external, redefine_impl->methods); @@ -195,10 +195,10 @@ } axis2_status_t AXIS2_CALL -axis2_xml_schema_redefine_free(void *redefine, +xml_schema_redefine_free(void *redefine, const axis2_env_t *env) { - axis2_xml_schema_redefine_impl_t *redefine_impl = NULL; + xml_schema_redefine_impl_t *redefine_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); redefine_impl = AXIS2_INTF_TO_IMPL(redefine); @@ -216,7 +216,7 @@ if(NULL != redefine_impl->external) { - AXIS2_XML_SCHEMA_EXTERNAL_FREE(redefine_impl->external, env); + XML_SCHEMA_EXTERNAL_FREE(redefine_impl->external, env); redefine_impl->external = NULL; } @@ -235,11 +235,11 @@ return AXIS2_SUCCESS; } -axis2_xml_schema_external_t *AXIS2_CALL -axis2_xml_schema_redefine_get_base_impl(void *redefine, +xml_schema_external_t *AXIS2_CALL +xml_schema_redefine_get_base_impl(void *redefine, const axis2_env_t *env) { - axis2_xml_schema_redefine_impl_t *redefine_impl = NULL; + xml_schema_redefine_impl_t *redefine_impl = NULL; AXIS2_ENV_CHECK(env, NULL); redefine_impl = AXIS2_INTF_TO_IMPL(redefine); @@ -250,22 +250,22 @@ /* AXIS2_EXTERN axis2_status_t AXIS2_CALL -axis2_xml_schema_redefine_resolve_methods( - axis2_xml_schema_redefine_t *redefine, +xml_schema_redefine_resolve_methods( + xml_schema_redefine_t *redefine, const axis2_env_t *env, - axis2_xml_schema_redefine_t *redefine_impl, + xml_schema_redefine_t *redefine_impl, axis2_hash_t *methods) { - axis2_xml_schema_redefine_impl_t *redefine_impl_l = NULL; + xml_schema_redefine_impl_t *redefine_impl_l = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, redefine_impl, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE); - redefine_impl_l = (axis2_xml_schema_redefine_impl_t *) redefine_impl; + redefine_impl_l = (xml_schema_redefine_impl_t *) redefine_impl; redefine->ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_redefine_ops_t)); + sizeof(xml_schema_redefine_ops_t)); redefine->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); @@ -277,23 +277,23 @@ redefine->ops->get_items = redefine_impl_l->redefine.ops->get_items; - return axis2_xml_schema_external_resolve_methods(&(redefine->base), + return xml_schema_external_resolve_methods(&(redefine->base), env, redefine_impl_l->external, methods); } */ -axis2_xml_schema_obj_table_t* AXIS2_CALL -axis2_xml_schema_redefine_get_attribute_group(void *redefine, +xml_schema_obj_table_t* AXIS2_CALL +xml_schema_redefine_get_attribute_group(void *redefine, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(redefine)->attr_groups; } axis2_status_t AXIS2_CALL -axis2_xml_schema_redefine_set_attribute_group(void *redefine, +xml_schema_redefine_set_attribute_group(void *redefine, const axis2_env_t *env, - axis2_xml_schema_obj_table_t *group) + xml_schema_obj_table_t *group) { - axis2_xml_schema_redefine_impl_t *red_impl = NULL; + xml_schema_redefine_impl_t *red_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, group, AXIS2_FAILURE); red_impl = AXIS2_INTF_TO_IMPL(redefine); @@ -307,29 +307,29 @@ -axis2_xml_schema_obj_collection_t* AXIS2_CALL -axis2_xml_schema_redefine_get_items(void *redefine, +xml_schema_obj_collection_t* AXIS2_CALL +xml_schema_redefine_get_items(void *redefine, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(redefine)->items; } -axis2_xml_schema_obj_table_t* AXIS2_CALL -axis2_xml_schema_redefine_get_schema_types(void *redefine, +xml_schema_obj_table_t* AXIS2_CALL +xml_schema_redefine_get_schema_types(void *redefine, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(redefine)->schema_types; } -axis2_xml_schema_obj_table_t* AXIS2_CALL -axis2_xml_schema_redefine_get_group(void *redefine, +xml_schema_obj_table_t* AXIS2_CALL +xml_schema_redefine_get_group(void *redefine, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(redefine)->groups; } -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_redefine_get_type(void *redefine, +xml_schema_types_t AXIS2_CALL +xml_schema_redefine_get_type(void *redefine, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(redefine)->obj_type; @@ -337,7 +337,7 @@ axis2_hash_t *AXIS2_CALL -axis2_xml_schema_redefine_super_objs(void *redefine, +xml_schema_redefine_super_objs(void *redefine, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(redefine)->ht_super; Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c?rev=413626&r1=413625&r2=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c Mon Jun 12 03:29:40 2006 @@ -14,74 +14,74 @@ * limitations under the License. */ -#include +#include #include -typedef struct axis2_xml_schema_simple_content_impl - axis2_xml_schema_simple_content_impl_t; +typedef struct xml_schema_simple_content_impl + xml_schema_simple_content_impl_t; /** * @brief Other Extension Struct Impl * Axis2 Other Extension */ -struct axis2_xml_schema_simple_content_impl +struct xml_schema_simple_content_impl { - axis2_xml_schema_simple_content_t sim_content; + xml_schema_simple_content_t sim_content; - axis2_xml_schema_annotated_t *annotated; + xml_schema_annotated_t *annotated; axis2_hash_t *methods; void *content; - axis2_xml_schema_types_t obj_type; + xml_schema_types_t obj_type; axis2_hash_t *ht_super; }; #define AXIS2_INTF_TO_IMPL(sim_content) \ - ((axis2_xml_schema_simple_content_impl_t *) sim_content) + ((xml_schema_simple_content_impl_t *) sim_content) axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_free(void *sim_content, +xml_schema_simple_content_free(void *sim_content, const axis2_env_t *env); -axis2_xml_schema_annotated_t *AXIS2_CALL -axis2_xml_schema_simple_content_get_base_impl(void *sim_content, +xml_schema_annotated_t *AXIS2_CALL +xml_schema_simple_content_get_base_impl(void *sim_content, const axis2_env_t *env); void* AXIS2_CALL -axis2_xml_schema_simple_content_get_content(void *sim_content, +xml_schema_simple_content_get_content(void *sim_content, const axis2_env_t *env); -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_simple_content_get_type(void *sim_content, +xml_schema_types_t AXIS2_CALL +xml_schema_simple_content_get_type(void *sim_content, const axis2_env_t *env); axis2_hash_t* AXIS2_CALL -axis2_xml_schema_simple_content_super_objs(void *sim_content, +xml_schema_simple_content_super_objs(void *sim_content, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_set_content(void *sim_content, +xml_schema_simple_content_set_content(void *sim_content, const axis2_env_t *env, void* content); axis2_char_t* AXIS2_CALL -axis2_xml_schema_simple_content_to_string(void *sim_content, +xml_schema_simple_content_to_string(void *sim_content, const axis2_env_t *env, axis2_char_t *prefix, int tab); -AXIS2_EXTERN axis2_xml_schema_simple_content_t * AXIS2_CALL -axis2_xml_schema_simple_content_create(const axis2_env_t *env) +AXIS2_EXTERN xml_schema_simple_content_t * AXIS2_CALL +xml_schema_simple_content_create(const axis2_env_t *env) { - axis2_xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; + xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; axis2_status_t status = AXIS2_FAILURE; - sim_cnt_impl = (axis2_xml_schema_simple_content_impl_t*)AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_simple_content_impl_t)); + sim_cnt_impl = (xml_schema_simple_content_impl_t*)AXIS2_MALLOC(env->allocator, + sizeof(xml_schema_simple_content_impl_t)); if(!sim_cnt_impl) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); @@ -94,77 +94,77 @@ sim_cnt_impl->sim_content.base.ops = NULL; sim_cnt_impl->sim_content.ops = NULL; sim_cnt_impl->ht_super = NULL; - sim_cnt_impl->obj_type = AXIS2_XML_SCHEMA_SIMPLE_CONTENT; + sim_cnt_impl->obj_type = XML_SCHEMA_SIMPLE_CONTENT; sim_cnt_impl->sim_content.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_simple_content_ops_t)); + sizeof(xml_schema_simple_content_ops_t)); if(!sim_cnt_impl->sim_content.ops) { - axis2_xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); + xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } sim_cnt_impl->sim_content.ops->free = - axis2_xml_schema_simple_content_free; + xml_schema_simple_content_free; sim_cnt_impl->sim_content.ops->get_type = - axis2_xml_schema_simple_content_get_type; + xml_schema_simple_content_get_type; sim_cnt_impl->sim_content.ops->super_objs = - axis2_xml_schema_simple_content_super_objs; + xml_schema_simple_content_super_objs; sim_cnt_impl->sim_content.ops->get_base_impl = - axis2_xml_schema_simple_content_get_base_impl; + xml_schema_simple_content_get_base_impl; sim_cnt_impl->sim_content.ops->set_content = - axis2_xml_schema_simple_content_set_content; + xml_schema_simple_content_set_content; sim_cnt_impl->sim_content.ops->get_content = - axis2_xml_schema_simple_content_get_content; + xml_schema_simple_content_get_content; sim_cnt_impl->sim_content.ops->to_string = - axis2_xml_schema_simple_content_to_string; + xml_schema_simple_content_to_string; sim_cnt_impl->methods = axis2_hash_make(env); if(!sim_cnt_impl->methods) { - axis2_xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); + xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } axis2_hash_set(sim_cnt_impl->methods, "free", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_free); + xml_schema_simple_content_free); axis2_hash_set(sim_cnt_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_get_type); + xml_schema_simple_content_get_type); axis2_hash_set(sim_cnt_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_super_objs); + xml_schema_simple_content_super_objs); axis2_hash_set(sim_cnt_impl->methods, "get_content", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_get_content); + AXIS2_HASH_KEY_STRING, xml_schema_simple_content_get_content); axis2_hash_set(sim_cnt_impl->methods, "set_content", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_set_content); + AXIS2_HASH_KEY_STRING, xml_schema_simple_content_set_content); axis2_hash_set(sim_cnt_impl->methods, "to_string", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_to_string); + AXIS2_HASH_KEY_STRING, xml_schema_simple_content_to_string); sim_cnt_impl->ht_super = axis2_hash_make(env); if(!sim_cnt_impl->ht_super) { - axis2_xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); + xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); return NULL; } - sim_cnt_impl->annotated = axis2_xml_schema_annotated_create(env); + sim_cnt_impl->annotated = xml_schema_annotated_create(env); if(!sim_cnt_impl->annotated) { - axis2_xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); + xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); return NULL; } - axis2_hash_set(sim_cnt_impl->ht_super, "AXIS2_XML_SCHEMA_SIMPLE_CONTENT", + axis2_hash_set(sim_cnt_impl->ht_super, "XML_SCHEMA_SIMPLE_CONTENT", AXIS2_HASH_KEY_STRING, &(sim_cnt_impl->sim_content)); - axis2_hash_set(sim_cnt_impl->ht_super, "AXIS2_XML_SCHEMA_ANNOTATED", + axis2_hash_set(sim_cnt_impl->ht_super, "XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING, sim_cnt_impl->annotated); - axis2_hash_set(sim_cnt_impl->ht_super, "AXIS2_XML_SCHEMA_OBJ", + axis2_hash_set(sim_cnt_impl->ht_super, "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING, - AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_cnt_impl->annotated, env)); + XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_cnt_impl->annotated, env)); - status = axis2_xml_schema_annotated_resolve_methods( + status = xml_schema_annotated_resolve_methods( &(sim_cnt_impl->sim_content.base), env, sim_cnt_impl->annotated, sim_cnt_impl->methods); @@ -172,10 +172,10 @@ } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_free(void *sim_content, +xml_schema_simple_content_free(void *sim_content, const axis2_env_t *env) { - axis2_xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; + xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); sim_cnt_impl = AXIS2_INTF_TO_IMPL(sim_content); @@ -192,7 +192,7 @@ } if(NULL != sim_cnt_impl->annotated) { - AXIS2_XML_SCHEMA_ANNOTATED_FREE(sim_cnt_impl->annotated, env); + XML_SCHEMA_ANNOTATED_FREE(sim_cnt_impl->annotated, env); sim_cnt_impl->annotated = NULL; } if(NULL != sim_cnt_impl->ht_super) @@ -216,11 +216,11 @@ return AXIS2_SUCCESS; } -axis2_xml_schema_annotated_t *AXIS2_CALL -axis2_xml_schema_simple_content_get_base_impl(void *sim_content, +xml_schema_annotated_t *AXIS2_CALL +xml_schema_simple_content_get_base_impl(void *sim_content, const axis2_env_t *env) { - axis2_xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; + xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; AXIS2_ENV_CHECK(env, NULL); sim_cnt_impl = AXIS2_INTF_TO_IMPL(sim_content); @@ -228,7 +228,7 @@ } void* AXIS2_CALL -axis2_xml_schema_simple_content_get_content(void *sim_content, +xml_schema_simple_content_get_content(void *sim_content, const axis2_env_t *env) { AXIS2_ENV_CHECK(env, NULL); @@ -236,11 +236,11 @@ } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_set_content(void *sim_content, +xml_schema_simple_content_set_content(void *sim_content, const axis2_env_t *env, void *content) { - axis2_xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; + xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, content, AXIS2_FAILURE); @@ -257,12 +257,12 @@ } axis2_char_t* AXIS2_CALL -axis2_xml_schema_simple_content_to_string(void *sim_content, +xml_schema_simple_content_to_string(void *sim_content, const axis2_env_t *env, axis2_char_t *prefix, int tab) { - axis2_xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; + xml_schema_simple_content_impl_t *sim_cnt_impl = NULL; axis2_char_t *xml = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -274,15 +274,15 @@ return xml; } -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_simple_content_get_type(void *sim_content, +xml_schema_types_t AXIS2_CALL +xml_schema_simple_content_get_type(void *sim_content, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(sim_content)->obj_type; } axis2_hash_t* AXIS2_CALL -axis2_xml_schema_simple_content_super_objs(void *sim_content, +xml_schema_simple_content_super_objs(void *sim_content, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(sim_content)->ht_super; Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c?rev=413626&r1=413625&r2=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c Mon Jun 12 03:29:40 2006 @@ -14,28 +14,28 @@ * limitations under the License. */ -#include +#include #include -typedef struct axis2_xml_schema_simple_content_extension_impl - axis2_xml_schema_simple_content_extension_impl_t; +typedef struct xml_schema_simple_content_extension_impl + xml_schema_simple_content_extension_impl_t; /** - * @brief axis2_xml_schema_simple_content_extension_impl + * @brief xml_schema_simple_content_extension_impl */ -struct axis2_xml_schema_simple_content_extension_impl +struct xml_schema_simple_content_extension_impl { - axis2_xml_schema_simple_content_extension_t sim_content_ext; + xml_schema_simple_content_extension_t sim_content_ext; - axis2_xml_schema_annotated_t *annotated; + xml_schema_annotated_t *annotated; - axis2_xml_schema_obj_collection_t *attributes; + xml_schema_obj_collection_t *attributes; - axis2_xml_schema_any_attribute_t *any_attribute; + xml_schema_any_attribute_t *any_attribute; axis2_qname_t *base_type_name; - axis2_xml_schema_types_t obj_type; + xml_schema_types_t obj_type; axis2_hash_t *ht_super; @@ -44,66 +44,66 @@ }; #define AXIS2_INTF_TO_IMPL(sim_content_ext) \ - ((axis2_xml_schema_simple_content_extension_impl_t *) sim_content_ext) + ((xml_schema_simple_content_extension_impl_t *) sim_content_ext) axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_extension_free( +xml_schema_simple_content_extension_free( void *sim_content_ext, const axis2_env_t *env); -axis2_xml_schema_annotated_t *AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_base_impl( +xml_schema_annotated_t *AXIS2_CALL +xml_schema_simple_content_extension_get_base_impl( void *sim_content_ext, const axis2_env_t *env); -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_type( +xml_schema_types_t AXIS2_CALL +xml_schema_simple_content_extension_get_type( void *sim_content_ext, const axis2_env_t *env); axis2_hash_t *AXIS2_CALL -axis2_xml_schema_simple_content_extension_super_objs( +xml_schema_simple_content_extension_super_objs( void *sim_content_ext, const axis2_env_t *env); -axis2_xml_schema_any_attribute_t* AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_any_attribute( +xml_schema_any_attribute_t* AXIS2_CALL +xml_schema_simple_content_extension_get_any_attribute( void *sim_content_ext, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_extension_set_any_attribute( +xml_schema_simple_content_extension_set_any_attribute( void *sim_content_ext, const axis2_env_t *env, - axis2_xml_schema_any_attribute_t *any_attr); + xml_schema_any_attribute_t *any_attr); -axis2_xml_schema_obj_collection_t* AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_attributes( +xml_schema_obj_collection_t* AXIS2_CALL +xml_schema_simple_content_extension_get_attributes( void *sim_content_ext, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_extension_set_base_type_name( +xml_schema_simple_content_extension_set_base_type_name( void *sim_content_ext, const axis2_env_t *env, axis2_qname_t *base_type_name); axis2_qname_t* AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_base_type_name( +xml_schema_simple_content_extension_get_base_type_name( void *sim_content_ext, const axis2_env_t *env); /*************************** end function protos **********************************/ -AXIS2_EXTERN axis2_xml_schema_simple_content_extension_t * AXIS2_CALL -axis2_xml_schema_simple_content_extension_create(const axis2_env_t *env) +AXIS2_EXTERN xml_schema_simple_content_extension_t * AXIS2_CALL +xml_schema_simple_content_extension_create(const axis2_env_t *env) { - axis2_xml_schema_simple_content_extension_impl_t *sim_content_ext_impl = NULL; + xml_schema_simple_content_extension_impl_t *sim_content_ext_impl = NULL; - sim_content_ext_impl = (axis2_xml_schema_simple_content_extension_impl_t*) - AXIS2_MALLOC(env->allocator, sizeof(axis2_xml_schema_simple_content_extension_impl_t)); + sim_content_ext_impl = (xml_schema_simple_content_extension_impl_t*) + AXIS2_MALLOC(env->allocator, sizeof(xml_schema_simple_content_extension_impl_t)); if(!sim_content_ext_impl) { @@ -117,14 +117,14 @@ sim_content_ext_impl->attributes = NULL; sim_content_ext_impl->base_type_name = NULL; sim_content_ext_impl->any_attribute = NULL; - sim_content_ext_impl->obj_type = AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION; + sim_content_ext_impl->obj_type = XML_SCHEMA_SIMPLE_CONTENT_EXTENSION; sim_content_ext_impl->ht_super = NULL; sim_content_ext_impl->sim_content_ext.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_simple_content_extension_ops_t)); + sizeof(xml_schema_simple_content_extension_ops_t)); if(!sim_content_ext_impl->sim_content_ext.ops) { - axis2_xml_schema_simple_content_extension_free( + xml_schema_simple_content_extension_free( &(sim_content_ext_impl->sim_content_ext), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); @@ -132,94 +132,94 @@ } sim_content_ext_impl->sim_content_ext.ops->free = - axis2_xml_schema_simple_content_extension_free; + xml_schema_simple_content_extension_free; sim_content_ext_impl->sim_content_ext.ops->get_base_impl = - axis2_xml_schema_simple_content_extension_get_base_impl; + xml_schema_simple_content_extension_get_base_impl; sim_content_ext_impl->sim_content_ext.ops->get_type = - axis2_xml_schema_simple_content_extension_get_type; + xml_schema_simple_content_extension_get_type; sim_content_ext_impl->sim_content_ext.ops->super_objs = - axis2_xml_schema_simple_content_extension_super_objs; + xml_schema_simple_content_extension_super_objs; sim_content_ext_impl->sim_content_ext.ops->get_any_attribute = - axis2_xml_schema_simple_content_extension_get_any_attribute; + xml_schema_simple_content_extension_get_any_attribute; sim_content_ext_impl->sim_content_ext.ops->set_any_attribute = - axis2_xml_schema_simple_content_extension_set_any_attribute; + xml_schema_simple_content_extension_set_any_attribute; sim_content_ext_impl->sim_content_ext.ops->get_attributes = - axis2_xml_schema_simple_content_extension_get_attributes; + xml_schema_simple_content_extension_get_attributes; sim_content_ext_impl->sim_content_ext.ops->get_base_type_name = - axis2_xml_schema_simple_content_extension_get_base_type_name; + xml_schema_simple_content_extension_get_base_type_name; sim_content_ext_impl->sim_content_ext.ops->set_base_type_name = - axis2_xml_schema_simple_content_extension_set_base_type_name; + xml_schema_simple_content_extension_set_base_type_name; sim_content_ext_impl->ht_super = axis2_hash_make(env); sim_content_ext_impl->methods = axis2_hash_make(env); if(!sim_content_ext_impl->methods || !sim_content_ext_impl->ht_super) { - axis2_xml_schema_simple_content_extension_free( + xml_schema_simple_content_extension_free( &(sim_content_ext_impl->sim_content_ext), env); return NULL; } axis2_hash_set(sim_content_ext_impl->methods, "free", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_extension_free); + xml_schema_simple_content_extension_free); axis2_hash_set(sim_content_ext_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_extension_get_type); + xml_schema_simple_content_extension_get_type); axis2_hash_set(sim_content_ext_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_extension_super_objs); + xml_schema_simple_content_extension_super_objs); axis2_hash_set(sim_content_ext_impl->methods, "get_any_attribute", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_extension_get_any_attribute); + xml_schema_simple_content_extension_get_any_attribute); axis2_hash_set(sim_content_ext_impl->methods, "set_any_attribute", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_extension_set_any_attribute); + xml_schema_simple_content_extension_set_any_attribute); axis2_hash_set(sim_content_ext_impl->methods, "get_attributes", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_extension_get_attributes); + xml_schema_simple_content_extension_get_attributes); axis2_hash_set(sim_content_ext_impl->methods, "get_base_type_name", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_extension_get_base_type_name); + xml_schema_simple_content_extension_get_base_type_name); axis2_hash_set(sim_content_ext_impl->methods, "set_base_type_name", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_extension_set_base_type_name); + xml_schema_simple_content_extension_set_base_type_name); - sim_content_ext_impl->annotated = axis2_xml_schema_annotated_create(env); + sim_content_ext_impl->annotated = xml_schema_annotated_create(env); if(!sim_content_ext_impl->annotated) { - axis2_xml_schema_simple_content_extension_free( + xml_schema_simple_content_extension_free( &(sim_content_ext_impl->sim_content_ext), env); return NULL; } - sim_content_ext_impl->attributes = axis2_xml_schema_obj_collection_create(env); + sim_content_ext_impl->attributes = xml_schema_obj_collection_create(env); if(!sim_content_ext_impl->attributes) { - axis2_xml_schema_simple_content_extension_free(&(sim_content_ext_impl->sim_content_ext), + xml_schema_simple_content_extension_free(&(sim_content_ext_impl->sim_content_ext), env); return NULL; } - axis2_hash_set(sim_content_ext_impl->ht_super, "AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION", + axis2_hash_set(sim_content_ext_impl->ht_super, "XML_SCHEMA_SIMPLE_CONTENT_EXTENSION", AXIS2_HASH_KEY_STRING,&(sim_content_ext_impl->sim_content_ext)); - axis2_hash_set(sim_content_ext_impl->ht_super, "AXIS2_XML_SCHEMA_ANNOTATED", + axis2_hash_set(sim_content_ext_impl->ht_super, "XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING,(sim_content_ext_impl->annotated)); - axis2_hash_set(sim_content_ext_impl->ht_super, "AXIS2_XML_SCHEMA_OBJ", + axis2_hash_set(sim_content_ext_impl->ht_super, "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING, - AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_content_ext_impl->annotated, env)); + XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_content_ext_impl->annotated, env)); - axis2_xml_schema_annotated_resolve_methods(&(sim_content_ext_impl->sim_content_ext.base), + xml_schema_annotated_resolve_methods(&(sim_content_ext_impl->sim_content_ext.base), env, sim_content_ext_impl->annotated, sim_content_ext_impl->methods); return &(sim_content_ext_impl->sim_content_ext); } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_extension_free( +xml_schema_simple_content_extension_free( void *sim_content_ext_ext, const axis2_env_t *env) { - axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; + xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content_ext_ext); if(NULL != content_ext_impl->any_attribute) { - AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_ext_impl->any_attribute, env); + XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_ext_impl->any_attribute, env); content_ext_impl->any_attribute = NULL; } if(NULL != content_ext_impl->attributes) @@ -233,7 +233,7 @@ } if(NULL != content_ext_impl->annotated) { - AXIS2_XML_SCHEMA_ANNOTATED_FREE(content_ext_impl->annotated, env); + XML_SCHEMA_ANNOTATED_FREE(content_ext_impl->annotated, env); content_ext_impl->annotated = NULL; } if(NULL != content_ext_impl->sim_content_ext.base.ops) @@ -252,12 +252,12 @@ return AXIS2_SUCCESS; } -axis2_xml_schema_annotated_t *AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_base_impl( +xml_schema_annotated_t *AXIS2_CALL +xml_schema_simple_content_extension_get_base_impl( void *sim_content_ext, const axis2_env_t *env) { - axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; + xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; AXIS2_ENV_CHECK(env, NULL); content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content_ext); return content_ext_impl->annotated; @@ -265,65 +265,65 @@ -axis2_xml_schema_any_attribute_t* AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_any_attribute( +xml_schema_any_attribute_t* AXIS2_CALL +xml_schema_simple_content_extension_get_any_attribute( void *sim_content_ext, const axis2_env_t *env) { - axis2_xml_schema_simple_content_extension_impl_t *cnt_ext_impl = NULL; + xml_schema_simple_content_extension_impl_t *cnt_ext_impl = NULL; AXIS2_ENV_CHECK(env, NULL); cnt_ext_impl = AXIS2_INTF_TO_IMPL(sim_content_ext); return cnt_ext_impl->any_attribute; } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_extension_set_any_attribute( +xml_schema_simple_content_extension_set_any_attribute( void *sim_content_ext, const axis2_env_t *env, - axis2_xml_schema_any_attribute_t *any_attr) + xml_schema_any_attribute_t *any_attr) { - axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; + xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, any_attr, AXIS2_FAILURE); if(NULL != content_ext_impl->any_attribute) { - AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_ext_impl->any_attribute, env); + XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_ext_impl->any_attribute, env); content_ext_impl->any_attribute = NULL; } content_ext_impl->any_attribute = any_attr; return AXIS2_SUCCESS; } -axis2_xml_schema_obj_collection_t* AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_attributes( +xml_schema_obj_collection_t* AXIS2_CALL +xml_schema_simple_content_extension_get_attributes( void *sim_content, const axis2_env_t *env) { - axis2_xml_schema_simple_content_extension_impl_t *cnt_ext_impl = NULL; + xml_schema_simple_content_extension_impl_t *cnt_ext_impl = NULL; AXIS2_ENV_CHECK(env, NULL); cnt_ext_impl = AXIS2_INTF_TO_IMPL(sim_content); return cnt_ext_impl->attributes; } axis2_qname_t* AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_base_type_name( +xml_schema_simple_content_extension_get_base_type_name( void *sim_content, const axis2_env_t *env) { - axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; + xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; AXIS2_ENV_CHECK(env, NULL); content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content); return content_ext_impl->base_type_name; } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_extension_set_base_type_name( +xml_schema_simple_content_extension_set_base_type_name( void *sim_content, const axis2_env_t *env, axis2_qname_t *base_type_name) { - axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; + xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content); if(NULL != content_ext_impl->base_type_name) @@ -335,8 +335,8 @@ return AXIS2_SUCCESS; } -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_simple_content_extension_get_type( +xml_schema_types_t AXIS2_CALL +xml_schema_simple_content_extension_get_type( void *sim_content_ext, const axis2_env_t *env) { @@ -344,7 +344,7 @@ } axis2_hash_t *AXIS2_CALL -axis2_xml_schema_simple_content_extension_super_objs( +xml_schema_simple_content_extension_super_objs( void *sim_content_ext, const axis2_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c?rev=413626&r1=413625&r2=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c Mon Jun 12 03:29:40 2006 @@ -14,33 +14,33 @@ * limitations under the License. */ -#include +#include #include -typedef struct axis2_xml_schema_simple_content_restriction_impl - axis2_xml_schema_simple_content_restriction_impl_t; +typedef struct xml_schema_simple_content_restriction_impl + xml_schema_simple_content_restriction_impl_t; /** - * @brief axis2_xml_schema_simple_content_restriction_impl + * @brief xml_schema_simple_content_restriction_impl * */ -struct axis2_xml_schema_simple_content_restriction_impl +struct xml_schema_simple_content_restriction_impl { - axis2_xml_schema_simple_content_restriction_t sim_content_res; + xml_schema_simple_content_restriction_t sim_content_res; - axis2_xml_schema_annotated_t *annotated; + xml_schema_annotated_t *annotated; - axis2_xml_schema_obj_collection_t *attributes; + xml_schema_obj_collection_t *attributes; - axis2_xml_schema_obj_collection_t *facets; + xml_schema_obj_collection_t *facets; - axis2_xml_schema_any_attribute_t *any_attribute; + xml_schema_any_attribute_t *any_attribute; axis2_qname_t *base_type_name; - axis2_xml_schema_simple_type_t *base_type; + xml_schema_simple_type_t *base_type; - axis2_xml_schema_types_t obj_type; + xml_schema_types_t obj_type; axis2_hash_t *methods; @@ -48,96 +48,96 @@ }; #define AXIS2_INTF_TO_IMPL(sim_content_res) \ - ((axis2_xml_schema_simple_content_restriction_impl_t *) sim_content_res) + ((xml_schema_simple_content_restriction_impl_t *) sim_content_res) axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_free( +xml_schema_simple_content_restriction_free( void *sim_content_res, const axis2_env_t *env); -axis2_xml_schema_annotated_t *AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_base_impl( +xml_schema_annotated_t *AXIS2_CALL +xml_schema_simple_content_restriction_get_base_impl( void *sim_content_res, const axis2_env_t *env); -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_type( +xml_schema_types_t AXIS2_CALL +xml_schema_simple_content_restriction_get_type( void *sim_content_res, const axis2_env_t *env); axis2_hash_t *AXIS2_CALL -axis2_xml_schema_simple_content_restriction_super_objs( +xml_schema_simple_content_restriction_super_objs( void *sim_content_res, const axis2_env_t *env); -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_type( +xml_schema_types_t AXIS2_CALL +xml_schema_simple_content_restriction_get_type( void *sim_content_res, const axis2_env_t *env); axis2_hash_t *AXIS2_CALL -axis2_xml_schema_simple_content_restriction_super_objs( +xml_schema_simple_content_restriction_super_objs( void *sim_content_res, const axis2_env_t *env); -axis2_xml_schema_any_attribute_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_any_attribute( +xml_schema_any_attribute_t* AXIS2_CALL +xml_schema_simple_content_restriction_get_any_attribute( void *sim_content_res, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_set_any_attribute( +xml_schema_simple_content_restriction_set_any_attribute( void *sim_content_res, const axis2_env_t *env, - axis2_xml_schema_any_attribute_t *any_attr); + xml_schema_any_attribute_t *any_attr); -axis2_xml_schema_obj_collection_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_attributes( +xml_schema_obj_collection_t* AXIS2_CALL +xml_schema_simple_content_restriction_get_attributes( void *sim_content_res, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_set_base_type_name( +xml_schema_simple_content_restriction_set_base_type_name( void *sim_content_res, const axis2_env_t *env, axis2_qname_t *base_type_name); axis2_qname_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_base_type_name( +xml_schema_simple_content_restriction_get_base_type_name( void *sim_content_res, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_set_base_type( +xml_schema_simple_content_restriction_set_base_type( void *sim_content_res, const axis2_env_t *env, - axis2_xml_schema_simple_type_t *base_type); + xml_schema_simple_type_t *base_type); -axis2_xml_schema_simple_type_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_base_type( +xml_schema_simple_type_t* AXIS2_CALL +xml_schema_simple_content_restriction_get_base_type( void *sim_content_res, const axis2_env_t *env); -axis2_xml_schema_obj_collection_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_facets( +xml_schema_obj_collection_t* AXIS2_CALL +xml_schema_simple_content_restriction_get_facets( void *sim_content_res, const axis2_env_t *env); /*****************************************************************************/ -AXIS2_EXTERN axis2_xml_schema_simple_content_restriction_t * AXIS2_CALL -axis2_xml_schema_simple_content_restriction_create(const axis2_env_t *env) +AXIS2_EXTERN xml_schema_simple_content_restriction_t * AXIS2_CALL +xml_schema_simple_content_restriction_create(const axis2_env_t *env) { - axis2_xml_schema_simple_content_restriction_impl_t *sim_content_res_impl = NULL; + xml_schema_simple_content_restriction_impl_t *sim_content_res_impl = NULL; - sim_content_res_impl = (axis2_xml_schema_simple_content_restriction_impl_t*) - AXIS2_MALLOC(env->allocator, sizeof(axis2_xml_schema_simple_content_restriction_impl_t)); + sim_content_res_impl = (xml_schema_simple_content_restriction_impl_t*) + AXIS2_MALLOC(env->allocator, sizeof(xml_schema_simple_content_restriction_impl_t)); if(!sim_content_res_impl) { @@ -154,15 +154,15 @@ sim_content_res_impl->facets = NULL; sim_content_res_impl->base_type = NULL; sim_content_res_impl->ht_super = NULL; - sim_content_res_impl->obj_type = AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION; + sim_content_res_impl->obj_type = XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION; sim_content_res_impl->methods = NULL; sim_content_res_impl->sim_content_res.base.ops = NULL; sim_content_res_impl->sim_content_res.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_simple_content_restriction_ops_t)); + sizeof(xml_schema_simple_content_restriction_ops_t)); if(!sim_content_res_impl->sim_content_res.ops) { - axis2_xml_schema_simple_content_restriction_free( + xml_schema_simple_content_restriction_free( &(sim_content_res_impl->sim_content_res), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); @@ -171,132 +171,132 @@ sim_content_res_impl->sim_content_res.ops->free = - axis2_xml_schema_simple_content_restriction_free; + xml_schema_simple_content_restriction_free; sim_content_res_impl->sim_content_res.ops->get_type = - axis2_xml_schema_simple_content_restriction_get_type; + xml_schema_simple_content_restriction_get_type; sim_content_res_impl->sim_content_res.ops->super_objs = - axis2_xml_schema_simple_content_restriction_super_objs; + xml_schema_simple_content_restriction_super_objs; sim_content_res_impl->sim_content_res.ops->get_base_impl = - axis2_xml_schema_simple_content_restriction_get_base_impl; + xml_schema_simple_content_restriction_get_base_impl; sim_content_res_impl->sim_content_res.ops->get_any_attribute = - axis2_xml_schema_simple_content_restriction_get_any_attribute; + xml_schema_simple_content_restriction_get_any_attribute; sim_content_res_impl->sim_content_res.ops->set_any_attribute = - axis2_xml_schema_simple_content_restriction_set_any_attribute; + xml_schema_simple_content_restriction_set_any_attribute; sim_content_res_impl->sim_content_res.ops->get_attributes = - axis2_xml_schema_simple_content_restriction_get_attributes; + xml_schema_simple_content_restriction_get_attributes; sim_content_res_impl->sim_content_res.ops->get_base_type_name = - axis2_xml_schema_simple_content_restriction_get_base_type_name; + xml_schema_simple_content_restriction_get_base_type_name; sim_content_res_impl->sim_content_res.ops->set_base_type_name = - axis2_xml_schema_simple_content_restriction_set_base_type_name; + xml_schema_simple_content_restriction_set_base_type_name; sim_content_res_impl->sim_content_res.ops->set_base_type = - axis2_xml_schema_simple_content_restriction_set_base_type; + xml_schema_simple_content_restriction_set_base_type; sim_content_res_impl->sim_content_res.ops->get_base_type = - axis2_xml_schema_simple_content_restriction_get_base_type; + xml_schema_simple_content_restriction_get_base_type; sim_content_res_impl->sim_content_res.ops->get_facets = - axis2_xml_schema_simple_content_restriction_get_facets; + xml_schema_simple_content_restriction_get_facets; sim_content_res_impl->methods = axis2_hash_make(env); if(!sim_content_res_impl->methods) { - axis2_xml_schema_simple_content_restriction_free( + xml_schema_simple_content_restriction_free( &(sim_content_res_impl->sim_content_res), env); return NULL; } axis2_hash_set(sim_content_res_impl->methods, "free", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_free);; + xml_schema_simple_content_restriction_free);; axis2_hash_set(sim_content_res_impl->methods, "get_type", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_restriction_get_type); + AXIS2_HASH_KEY_STRING, xml_schema_simple_content_restriction_get_type); axis2_hash_set(sim_content_res_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_super_objs); + xml_schema_simple_content_restriction_super_objs); axis2_hash_set(sim_content_res_impl->methods, "get_any_attribute", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_get_any_attribute); + xml_schema_simple_content_restriction_get_any_attribute); axis2_hash_set(sim_content_res_impl->methods, "set_any_attribute", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_set_any_attribute); + xml_schema_simple_content_restriction_set_any_attribute); axis2_hash_set(sim_content_res_impl->methods, "get_attribute", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_get_attributes); + xml_schema_simple_content_restriction_get_attributes); axis2_hash_set(sim_content_res_impl->methods, "get_base_type_name", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_get_base_type_name); + xml_schema_simple_content_restriction_get_base_type_name); axis2_hash_set(sim_content_res_impl->methods, "set_base_type_name", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_set_base_type_name); + xml_schema_simple_content_restriction_set_base_type_name); axis2_hash_set(sim_content_res_impl->methods, "set_base_type", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_set_base_type); + xml_schema_simple_content_restriction_set_base_type); axis2_hash_set(sim_content_res_impl->methods, "get_base_type", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_get_base_type); + xml_schema_simple_content_restriction_get_base_type); axis2_hash_set(sim_content_res_impl->methods, "get_facets", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_content_restriction_get_facets); + xml_schema_simple_content_restriction_get_facets); - sim_content_res_impl->annotated = axis2_xml_schema_annotated_create(env); + sim_content_res_impl->annotated = xml_schema_annotated_create(env); if(!sim_content_res_impl->annotated) { - axis2_xml_schema_simple_content_restriction_free( + xml_schema_simple_content_restriction_free( &(sim_content_res_impl->sim_content_res), env); return NULL; } - sim_content_res_impl->attributes = axis2_xml_schema_obj_collection_create(env); - sim_content_res_impl->facets = axis2_xml_schema_obj_collection_create(env); + sim_content_res_impl->attributes = xml_schema_obj_collection_create(env); + sim_content_res_impl->facets = xml_schema_obj_collection_create(env); if(!sim_content_res_impl->attributes || !sim_content_res_impl->facets) { - axis2_xml_schema_simple_content_restriction_free( + xml_schema_simple_content_restriction_free( &(sim_content_res_impl->sim_content_res), env); return NULL; } sim_content_res_impl->ht_super = axis2_hash_make(env); axis2_hash_set(sim_content_res_impl->ht_super , - "AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION", AXIS2_HASH_KEY_STRING, + "XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION", AXIS2_HASH_KEY_STRING, &(sim_content_res_impl->sim_content_res)); axis2_hash_set(sim_content_res_impl->ht_super , - "AXIS2_XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING, + "XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING, sim_content_res_impl->annotated); axis2_hash_set(sim_content_res_impl->ht_super , - "AXIS2_XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING, - AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_content_res_impl->annotated, env)); + "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING, + XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_content_res_impl->annotated, env)); - axis2_xml_schema_annotated_resolve_methods(&(sim_content_res_impl->sim_content_res.base), + xml_schema_annotated_resolve_methods(&(sim_content_res_impl->sim_content_res.base), env, sim_content_res_impl->annotated, sim_content_res_impl->methods); return &(sim_content_res_impl->sim_content_res); } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_free( +xml_schema_simple_content_restriction_free( void *sim_content_res, const axis2_env_t *env) { - axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; + xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); content_res_impl = AXIS2_INTF_TO_IMPL(sim_content_res); if(NULL != content_res_impl->any_attribute) { - AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env); + XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env); content_res_impl->any_attribute = NULL; } if(NULL != content_res_impl->sim_content_res.base.ops) @@ -320,7 +320,7 @@ } if(NULL != content_res_impl->annotated) { - AXIS2_XML_SCHEMA_ANNOTATED_FREE(content_res_impl->annotated, env); + XML_SCHEMA_ANNOTATED_FREE(content_res_impl->annotated, env); content_res_impl->annotated = NULL; } if(NULL != content_res_impl->sim_content_res.ops) @@ -334,12 +334,12 @@ return AXIS2_SUCCESS; } -axis2_xml_schema_annotated_t *AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_base_impl( +xml_schema_annotated_t *AXIS2_CALL +xml_schema_simple_content_restriction_get_base_impl( void *sim_content_res, const axis2_env_t *env) { - axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; + xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; AXIS2_ENV_CHECK(env, NULL); content_res_impl = AXIS2_INTF_TO_IMPL(sim_content_res); return content_res_impl->annotated; @@ -347,65 +347,65 @@ -axis2_xml_schema_any_attribute_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_any_attribute( +xml_schema_any_attribute_t* AXIS2_CALL +xml_schema_simple_content_restriction_get_any_attribute( void *sim_content_res, const axis2_env_t *env) { - axis2_xml_schema_simple_content_restriction_impl_t *cnt_res_impl = NULL; + xml_schema_simple_content_restriction_impl_t *cnt_res_impl = NULL; AXIS2_ENV_CHECK(env, NULL); cnt_res_impl = AXIS2_INTF_TO_IMPL(sim_content_res); return cnt_res_impl->any_attribute; } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_set_any_attribute( +xml_schema_simple_content_restriction_set_any_attribute( void *sim_content_res, const axis2_env_t *env, - axis2_xml_schema_any_attribute_t *any_attr) + xml_schema_any_attribute_t *any_attr) { - axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; + xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, any_attr, AXIS2_FAILURE); if(NULL != content_res_impl->any_attribute) { - AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env); + XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env); content_res_impl->any_attribute = NULL; } content_res_impl->any_attribute = any_attr; return AXIS2_SUCCESS; } -axis2_xml_schema_obj_collection_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_attributes( +xml_schema_obj_collection_t* AXIS2_CALL +xml_schema_simple_content_restriction_get_attributes( void *sim_content, const axis2_env_t *env) { - axis2_xml_schema_simple_content_restriction_impl_t *cnt_res_impl = NULL; + xml_schema_simple_content_restriction_impl_t *cnt_res_impl = NULL; AXIS2_ENV_CHECK(env, NULL); cnt_res_impl = AXIS2_INTF_TO_IMPL(sim_content); return cnt_res_impl->attributes; } axis2_qname_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_base_type_name( +xml_schema_simple_content_restriction_get_base_type_name( void *sim_content, const axis2_env_t *env) { - axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; + xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; AXIS2_ENV_CHECK(env, NULL); content_res_impl = AXIS2_INTF_TO_IMPL(sim_content); return content_res_impl->base_type_name; } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_set_base_type_name( +xml_schema_simple_content_restriction_set_base_type_name( void *sim_content, const axis2_env_t *env, axis2_qname_t *base_type_name) { - axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; + xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); content_res_impl = AXIS2_INTF_TO_IMPL(sim_content); if(NULL != content_res_impl->base_type_name) @@ -418,18 +418,18 @@ } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_set_base_type( +xml_schema_simple_content_restriction_set_base_type( void *sim_content_res, const axis2_env_t *env, - axis2_xml_schema_simple_type_t *base_type) + xml_schema_simple_type_t *base_type) { - axis2_xml_schema_simple_content_restriction_impl_t *sim_cnt_res_impl = NULL; + xml_schema_simple_content_restriction_impl_t *sim_cnt_res_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, base_type, AXIS2_FAILURE); sim_cnt_res_impl = AXIS2_INTF_TO_IMPL(sim_content_res); if(NULL != sim_cnt_res_impl->base_type) { - AXIS2_XML_SCHEMA_SIMPLE_TYPE_FREE(sim_cnt_res_impl->base_type, env); + XML_SCHEMA_SIMPLE_TYPE_FREE(sim_cnt_res_impl->base_type, env); sim_cnt_res_impl->base_type = NULL; } sim_cnt_res_impl->base_type = base_type; @@ -437,8 +437,8 @@ } -axis2_xml_schema_simple_type_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_base_type( +xml_schema_simple_type_t* AXIS2_CALL +xml_schema_simple_content_restriction_get_base_type( void *sim_content_res, const axis2_env_t *env) { @@ -446,16 +446,16 @@ } -axis2_xml_schema_obj_collection_t* AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_facets( +xml_schema_obj_collection_t* AXIS2_CALL +xml_schema_simple_content_restriction_get_facets( void *sim_content_res, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(sim_content_res)->facets; } -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_simple_content_restriction_get_type( +xml_schema_types_t AXIS2_CALL +xml_schema_simple_content_restriction_get_type( void *sim_content_res, const axis2_env_t *env) { @@ -463,7 +463,7 @@ } axis2_hash_t *AXIS2_CALL -axis2_xml_schema_simple_content_restriction_super_objs( +xml_schema_simple_content_restriction_super_objs( void *sim_content_res, const axis2_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c?rev=413626&r1=413625&r2=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c Mon Jun 12 03:29:40 2006 @@ -14,83 +14,83 @@ * limitations under the License. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -typedef struct axis2_xml_schema_simple_type_impl - axis2_xml_schema_simple_type_impl_t; +typedef struct xml_schema_simple_type_impl + xml_schema_simple_type_impl_t; /** - * @brief axis2_xml_schema_simple_type_impl + * @brief xml_schema_simple_type_impl */ -struct axis2_xml_schema_simple_type_impl +struct xml_schema_simple_type_impl { - axis2_xml_schema_simple_type_t simple_type; + xml_schema_simple_type_t simple_type; /** parent type */ - axis2_xml_schema_type_t *schema_type; + xml_schema_type_t *schema_type; axis2_hash_t *methods; axis2_hash_t *ht_super; - axis2_xml_schema_types_t obj_type; + xml_schema_types_t obj_type; - axis2_xml_schema_simple_type_content_t *content; + xml_schema_simple_type_content_t *content; }; -#define AXIS2_INTF_TO_IMPL(simple_type) ((axis2_xml_schema_simple_type_impl_t *) simple_type) +#define AXIS2_INTF_TO_IMPL(simple_type) ((xml_schema_simple_type_impl_t *) simple_type) /************************** function prototypes ******************************/ axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_type_free(void *simple_type, +xml_schema_simple_type_free(void *simple_type, const axis2_env_t *env); -axis2_xml_schema_type_t *AXIS2_CALL -axis2_xml_schema_simple_type_get_base_impl(void *simple_type, +xml_schema_type_t *AXIS2_CALL +xml_schema_simple_type_get_base_impl(void *simple_type, const axis2_env_t *env); axis2_hash_t *AXIS2_CALL -axis2_xml_schema_simple_type_super_objs(void *simple_type, +xml_schema_simple_type_super_objs(void *simple_type, const axis2_env_t *env); -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_simple_type_get_type(void *simple_type, +xml_schema_types_t AXIS2_CALL +xml_schema_simple_type_get_type(void *simple_type, const axis2_env_t *env); -axis2_xml_schema_simple_type_content_t* AXIS2_CALL -axis2_xml_schema_simple_type_get_content(void *simple_type, +xml_schema_simple_type_content_t* AXIS2_CALL +xml_schema_simple_type_get_content(void *simple_type, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_type_set_content(void *simple_type, +xml_schema_simple_type_set_content(void *simple_type, const axis2_env_t *env, - axis2_xml_schema_simple_type_content_t *simple_content); + xml_schema_simple_type_content_t *simple_content); axis2_char_t* AXIS2_CALL -axis2_xml_schema_simple_type_to_string(void *simple_type, +xml_schema_simple_type_to_string(void *simple_type, const axis2_env_t *env, axis2_char_t *prefix, int tab); /************************** end ****************************************/ -AXIS2_EXTERN axis2_xml_schema_simple_type_t * AXIS2_CALL -axis2_xml_schema_simple_type_create(const axis2_env_t *env, - axis2_xml_schema_t *schema) +AXIS2_EXTERN xml_schema_simple_type_t * AXIS2_CALL +xml_schema_simple_type_create(const axis2_env_t *env, + xml_schema_t *schema) { - axis2_xml_schema_simple_type_impl_t *simple_type = NULL; - axis2_xml_schema_annotated_t *annotated = NULL; + xml_schema_simple_type_impl_t *simple_type = NULL; + xml_schema_annotated_t *annotated = NULL; axis2_status_t status = AXIS2_FAILURE; simple_type = AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_simple_type_impl_t)); + sizeof(xml_schema_simple_type_impl_t)); if(!simple_type) { AXIS2_ERROR_SET(env->error, @@ -104,90 +104,90 @@ simple_type->simple_type.ops = NULL; simple_type->simple_type.base.ops = NULL; simple_type->ht_super = NULL; - simple_type->obj_type = AXIS2_XML_SCHEMA_SIMPLE_TYPE; + simple_type->obj_type = XML_SCHEMA_SIMPLE_TYPE; simple_type->simple_type.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_simple_type_ops_t)); + sizeof(xml_schema_simple_type_ops_t)); if(!simple_type->simple_type.ops) { - axis2_xml_schema_simple_type_free(&(simple_type->simple_type), env); + xml_schema_simple_type_free(&(simple_type->simple_type), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - simple_type->schema_type = axis2_xml_schema_type_create(env, schema); + simple_type->schema_type = xml_schema_type_create(env, schema); if(!simple_type->schema_type) { - axis2_xml_schema_simple_type_free(&(simple_type->schema_type), env); + xml_schema_simple_type_free(&(simple_type->schema_type), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } simple_type->simple_type.ops->free = - axis2_xml_schema_simple_type_free; + xml_schema_simple_type_free; simple_type->simple_type.ops->get_base_impl = - axis2_xml_schema_simple_type_get_base_impl; + xml_schema_simple_type_get_base_impl; simple_type->simple_type.ops->get_content = - axis2_xml_schema_simple_type_get_content; + xml_schema_simple_type_get_content; simple_type->simple_type.ops->set_content = - axis2_xml_schema_simple_type_set_content; + xml_schema_simple_type_set_content; simple_type->simple_type.ops->get_type = - axis2_xml_schema_simple_type_get_type; + xml_schema_simple_type_get_type; simple_type->simple_type.ops->super_objs = - axis2_xml_schema_simple_type_super_objs; + xml_schema_simple_type_super_objs; simple_type->methods = axis2_hash_make(env); simple_type->ht_super = axis2_hash_make(env); if(!simple_type->methods || !simple_type->ht_super) { - axis2_xml_schema_simple_type_free(&(simple_type->simple_type), env); + xml_schema_simple_type_free(&(simple_type->simple_type), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } axis2_hash_set(simple_type->methods, "free", AXIS2_HASH_KEY_STRING, - axis2_xml_schema_simple_type_free); + xml_schema_simple_type_free); axis2_hash_set(simple_type->methods, "get_content", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_get_content); + AXIS2_HASH_KEY_STRING, xml_schema_simple_type_get_content); axis2_hash_set(simple_type->methods, "set_content", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_set_content); + AXIS2_HASH_KEY_STRING, xml_schema_simple_type_set_content); axis2_hash_set(simple_type->methods, "get_type", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_get_type); + AXIS2_HASH_KEY_STRING, xml_schema_simple_type_get_type); axis2_hash_set(simple_type->methods, "super_objs", - AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_super_objs); + AXIS2_HASH_KEY_STRING, xml_schema_simple_type_super_objs); - axis2_hash_set(simple_type->ht_super, "AXIS2_XML_SCHEMA_SIMPLE_TYPE", + axis2_hash_set(simple_type->ht_super, "XML_SCHEMA_SIMPLE_TYPE", AXIS2_HASH_KEY_STRING, &(simple_type->simple_type)); - axis2_hash_set(simple_type->ht_super, "AXIS2_XML_SCHEMA_TYPE", + axis2_hash_set(simple_type->ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING, simple_type->schema_type); - annotated = AXIS2_XML_SCHEMA_TYPE_GET_BASE_IMPL(simple_type->schema_type, env); + annotated = XML_SCHEMA_TYPE_GET_BASE_IMPL(simple_type->schema_type, env); if(NULL != annotated) { - axis2_hash_set(simple_type->ht_super, "AXIS2_XML_SCHEMA_ANNOTATED", + axis2_hash_set(simple_type->ht_super, "XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING, annotated); - axis2_hash_set(simple_type->ht_super, "AXIS2_XML_SCHEMA_OBJ", + axis2_hash_set(simple_type->ht_super, "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING, - AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env)); + XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env)); } - status = axis2_xml_schema_type_resolve_methods(&(simple_type->simple_type.base), + status = xml_schema_type_resolve_methods(&(simple_type->simple_type.base), env, simple_type->schema_type, simple_type->methods); return &(simple_type->simple_type); } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_type_free(void *simple_type, +xml_schema_simple_type_free(void *simple_type, const axis2_env_t *env) { - axis2_xml_schema_simple_type_impl_t *simple_type_impl = NULL; + xml_schema_simple_type_impl_t *simple_type_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); simple_type_impl = AXIS2_INTF_TO_IMPL(simple_type); @@ -204,7 +204,7 @@ } if(NULL != simple_type_impl->schema_type) { - AXIS2_XML_SCHEMA_TYPE_FREE(simple_type_impl->schema_type, env); + XML_SCHEMA_TYPE_FREE(simple_type_impl->schema_type, env); simple_type_impl->schema_type = NULL; } @@ -223,11 +223,11 @@ return AXIS2_SUCCESS; } -axis2_xml_schema_type_t *AXIS2_CALL -axis2_xml_schema_simple_type_get_base_impl(void *simple_type, +xml_schema_type_t *AXIS2_CALL +xml_schema_simple_type_get_base_impl(void *simple_type, const axis2_env_t *env) { - axis2_xml_schema_simple_type_impl_t *simple_type_impl = NULL; + xml_schema_simple_type_impl_t *simple_type_impl = NULL; AXIS2_ENV_CHECK(env, NULL); simple_type_impl = AXIS2_INTF_TO_IMPL(simple_type); @@ -236,22 +236,22 @@ } AXIS2_EXTERN axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_type_resolve_methods( - axis2_xml_schema_simple_type_t *simple_type, +xml_schema_simple_type_resolve_methods( + xml_schema_simple_type_t *simple_type, const axis2_env_t *env, - axis2_xml_schema_simple_type_t *simple_type_impl, + xml_schema_simple_type_t *simple_type_impl, axis2_hash_t *methods) { - axis2_xml_schema_simple_type_impl_t *type_impl_l = NULL; + xml_schema_simple_type_impl_t *type_impl_l = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, simple_type, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE); - type_impl_l = (axis2_xml_schema_simple_type_impl_t *) simple_type_impl; + type_impl_l = (xml_schema_simple_type_impl_t *) simple_type_impl; simple_type->ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_xml_schema_simple_type_ops_t)); + sizeof(xml_schema_simple_type_ops_t)); if(!simple_type->ops) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); @@ -267,31 +267,31 @@ simple_type->ops->set_content = type_impl_l->simple_type.ops->set_content; - return axis2_xml_schema_type_resolve_methods(&(simple_type->base), + return xml_schema_type_resolve_methods(&(simple_type->base), env, type_impl_l->schema_type , methods); } -axis2_xml_schema_simple_type_content_t* AXIS2_CALL -axis2_xml_schema_simple_type_get_content(void *simple_type, +xml_schema_simple_type_content_t* AXIS2_CALL +xml_schema_simple_type_get_content(void *simple_type, const axis2_env_t *env) { - axis2_xml_schema_simple_type_impl_t *simple_type_impl = NULL; + xml_schema_simple_type_impl_t *simple_type_impl = NULL; AXIS2_ENV_CHECK(env, NULL); simple_type_impl = AXIS2_INTF_TO_IMPL(simple_type); return simple_type_impl->content; } axis2_status_t AXIS2_CALL -axis2_xml_schema_simple_type_set_content(void *simple_type, +xml_schema_simple_type_set_content(void *simple_type, const axis2_env_t *env, - axis2_xml_schema_simple_type_content_t *simple_content) + xml_schema_simple_type_content_t *simple_content) { - axis2_xml_schema_simple_type_impl_t *simple_type_impl = NULL; + xml_schema_simple_type_impl_t *simple_type_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); simple_type_impl = AXIS2_INTF_TO_IMPL(simple_type); if(NULL != simple_type_impl->content) { - AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(simple_type_impl->content, env); + XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(simple_type_impl->content, env); simple_type_impl->content = NULL; } simple_type_impl->content = simple_content; @@ -299,12 +299,12 @@ } axis2_char_t* AXIS2_CALL -axis2_xml_schema_simple_type_to_string(void *simple_type, +xml_schema_simple_type_to_string(void *simple_type, const axis2_env_t *env, axis2_char_t *prefix, int tab) { - axis2_xml_schema_simple_type_impl_t *simple_type_impl = NULL; + xml_schema_simple_type_impl_t *simple_type_impl = NULL; AXIS2_ENV_CHECK(env, NULL); simple_type_impl = AXIS2_INTF_TO_IMPL(simple_type); /** TODO implement the method */ @@ -312,14 +312,14 @@ } axis2_hash_t *AXIS2_CALL -axis2_xml_schema_simple_type_super_objs(void *simple_type, +xml_schema_simple_type_super_objs(void *simple_type, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(simple_type)->ht_super; } -axis2_xml_schema_types_t AXIS2_CALL -axis2_xml_schema_simple_type_get_type(void *simple_type, +xml_schema_types_t AXIS2_CALL +xml_schema_simple_type_get_type(void *simple_type, const axis2_env_t *env) { return AXIS2_INTF_TO_IMPL(simple_type)->obj_type; --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org