Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 2742 invoked from network); 30 Mar 2007 18:30:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Mar 2007 18:30:34 -0000 Received: (qmail 97973 invoked by uid 500); 30 Mar 2007 18:30:25 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 97831 invoked by uid 500); 30 Mar 2007 18:30:24 -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 97688 invoked by uid 500); 30 Mar 2007 18:30:23 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 97455 invoked by uid 99); 30 Mar 2007 18:30:21 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Mar 2007 11:30:21 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Mar 2007 11:30:06 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E056C1A9885; Fri, 30 Mar 2007 11:28:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524225 [22/22] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ include/ modules/core/addr/ modules/core/clientapi/ modules/core/context/ modules... Date: Fri, 30 Mar 2007 18:28:34 -0000 To: axis2-cvs@ws.apache.org From: pini@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070330182851.E056C1A9885@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c Fri Mar 30 11:28:18 2007 @@ -16,7 +16,7 @@ */ #include -#include +#include typedef struct xml_schema_obj_table_impl xml_schema_obj_table_impl_t; @@ -28,7 +28,7 @@ { xml_schema_obj_table_t obj_table; - axis2_hash_t *collection; + axutil_hash_t *collection; axutil_array_list_t *names; @@ -85,7 +85,7 @@ const axutil_env_t *env, axis2_char_t *key); -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_obj_table_get_hash_table( xml_schema_obj_table_t *obj_table, const axutil_env_t *env); @@ -119,7 +119,7 @@ return NULL; } - obj_table_impl->collection = axis2_hash_make(env); + obj_table_impl->collection = axutil_hash_make(env); if (!obj_table_impl->collection) { @@ -171,7 +171,7 @@ if (obj_table_impl->collection) { - axis2_hash_free(obj_table_impl->collection, env); + axutil_hash_free(obj_table_impl->collection, env); obj_table_impl->collection = NULL; } @@ -195,7 +195,7 @@ obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table); if (obj_table_impl->collection) { - return axis2_hash_count(obj_table_impl->collection); + return axutil_hash_count(obj_table_impl->collection); } else return -1; @@ -217,7 +217,7 @@ name = axis2_qname_to_string((axis2_qname_t *)qname, env); if (name) { - return axis2_hash_get(obj_table_impl->collection, name, + return axutil_hash_get(obj_table_impl->collection, name, AXIS2_HASH_KEY_STRING); } return NULL; @@ -228,7 +228,7 @@ const axutil_env_t *env) { xml_schema_obj_table_impl_t *obj_table_impl = NULL; - axis2_hash_index_t *hi = NULL; + axutil_hash_index_t *hi = NULL; AXIS2_ENV_CHECK(env, NULL); obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table); @@ -246,13 +246,13 @@ return NULL; } - for (hi = axis2_hash_first(obj_table_impl->collection, env); hi; - hi = axis2_hash_next(env, hi)) + for (hi = axutil_hash_first(obj_table_impl->collection, env); hi; + hi = axutil_hash_next(env, hi)) { const void *val = NULL; axis2_qname_t *qname = NULL; - /*axis2_hash_this (hi, NULL, NULL, &val);*/ - axis2_hash_this(hi, &val, NULL, NULL); + /*axutil_hash_this (hi, NULL, NULL, &val);*/ + axutil_hash_this(hi, &val, NULL, NULL); qname = axis2_qname_create_from_string(env, val); axutil_array_list_add(obj_table_impl->names, env, qname); val = NULL; @@ -265,7 +265,7 @@ const axutil_env_t *env) { xml_schema_obj_table_impl_t *obj_table_impl = NULL; - axis2_hash_index_t *hi = NULL; + axutil_hash_index_t *hi = NULL; AXIS2_ENV_CHECK(env, NULL); obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table); @@ -282,11 +282,11 @@ return NULL; } - for (hi = axis2_hash_first(obj_table_impl->collection, env); hi; - hi = axis2_hash_next(env, hi)) + for (hi = axutil_hash_first(obj_table_impl->collection, env); hi; + hi = axutil_hash_next(env, hi)) { void *val = NULL; - axis2_hash_this(hi, NULL, NULL, &val); + axutil_hash_this(hi, NULL, NULL, &val); axutil_array_list_add(obj_table_impl->values, env, val); val = NULL; } @@ -308,7 +308,7 @@ name = axis2_qname_to_string(qname, env); if (name) { - value = axis2_hash_get(obj_table_impl->collection, name, + value = axutil_hash_get(obj_table_impl->collection, name, AXIS2_HASH_KEY_STRING); if (value) return AXIS2_TRUE; @@ -333,7 +333,7 @@ name = axis2_qname_to_string(qname, env); if (name) { - axis2_hash_set(obj_table_impl->collection, + axutil_hash_set(obj_table_impl->collection, name, AXIS2_HASH_KEY_STRING, value); return AXIS2_SUCCESS; } @@ -353,7 +353,7 @@ AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE); obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table); - axis2_hash_set(obj_table_impl->collection, key, AXIS2_HASH_KEY_STRING, + axutil_hash_set(obj_table_impl->collection, key, AXIS2_HASH_KEY_STRING, value); return AXIS2_SUCCESS; } @@ -368,10 +368,10 @@ AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, key, NULL); obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table); - return axis2_hash_get(obj_table_impl->collection, key, AXIS2_HASH_KEY_STRING); + return axutil_hash_get(obj_table_impl->collection, key, AXIS2_HASH_KEY_STRING); } -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_obj_table_get_hash_table( xml_schema_obj_table_t *obj_table, const axutil_env_t *env) Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c Fri Mar 30 11:28:18 2007 @@ -33,7 +33,7 @@ xml_schema_types_t obj_type; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; long max_occurs; @@ -55,7 +55,7 @@ void *particle, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_particle_super_objs( void *particle, const axutil_env_t *env); @@ -154,19 +154,19 @@ return NULL; } - particle_impl->ht_super = axis2_hash_make(env); + particle_impl->ht_super = axutil_hash_make(env); if (!particle_impl->ht_super) { xml_schema_particle_free(&(particle_impl->particle), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - axis2_hash_set(particle_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"), AXIS2_HASH_KEY_STRING, + axutil_hash_set(particle_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"), AXIS2_HASH_KEY_STRING, &(particle_impl->particle)); - axis2_hash_set(particle_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, + axutil_hash_set(particle_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, particle_impl->annotated); - axis2_hash_set(particle_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, + axutil_hash_set(particle_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(particle_impl->annotated, env)); status = xml_schema_annotated_resolve_methods( @@ -189,7 +189,7 @@ if (particle_impl->ht_super) { - axis2_hash_free(particle_impl->ht_super, env); + axutil_hash_free(particle_impl->ht_super, env); particle_impl->ht_super = NULL; } @@ -220,7 +220,7 @@ return AXIS2_SUCCESS; } -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_particle_super_objs(void *particle, const axutil_env_t *env) { @@ -300,13 +300,13 @@ const axutil_env_t *env) { xml_schema_particle_impl_t *particle_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ht_super = XML_SCHEMA_PARTICLE_SUPER_OBJS(particle, env); if (ht_super) { - particle_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + particle_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING)); if (!particle_impl) return AXIS2_FAILURE; @@ -320,13 +320,13 @@ long max_occurs) { xml_schema_particle_impl_t *particle_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ht_super = XML_SCHEMA_PARTICLE_SUPER_OBJS(particle, env); if (ht_super) { - particle_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + particle_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING)); if (!particle_impl) return AXIS2_FAILURE; @@ -341,13 +341,13 @@ const axutil_env_t *env) { xml_schema_particle_impl_t *particle_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ht_super = XML_SCHEMA_PARTICLE_SUPER_OBJS(particle, env); if (ht_super) { - particle_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + particle_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING)); if (!particle_impl) return AXIS2_FAILURE; @@ -362,13 +362,13 @@ long min_occurs) { xml_schema_particle_impl_t *particle_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ht_super = XML_SCHEMA_PARTICLE_SUPER_OBJS(particle, env); if (ht_super) { - particle_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + particle_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING)); if (!particle_impl) return AXIS2_FAILURE; 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?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c Fri Mar 30 11:28:18 2007 @@ -35,7 +35,7 @@ xml_schema_obj_table_t *schema_types; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_types_t obj_type; @@ -59,7 +59,7 @@ xml_schema_redefine_get_type(void *redefine, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_redefine_super_objs(void *redefine, const axutil_env_t *env); @@ -142,7 +142,7 @@ redefine_impl->redefine.ops->get_schema_types = xml_schema_redefine_get_schema_types; - redefine_impl->ht_super = axis2_hash_make(env); + redefine_impl->ht_super = axutil_hash_make(env); if (!redefine_impl->ht_super) { xml_schema_redefine_free(&(redefine_impl->redefine), env); @@ -158,18 +158,18 @@ } - axis2_hash_set(redefine_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_REDEFINE"), + axutil_hash_set(redefine_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_REDEFINE"), AXIS2_HASH_KEY_STRING, &(redefine_impl->redefine)); - axis2_hash_set(redefine_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_EXTERNAL"), + axutil_hash_set(redefine_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_EXTERNAL"), AXIS2_HASH_KEY_STRING, redefine_impl->external); annotated = XML_SCHEMA_EXTERNAL_GET_BASE_IMPL(redefine_impl->external, env); if (redefine_impl->external) { - axis2_hash_set(redefine_impl->ht_super, "XML_SCHEMA_ANNOTATED", + axutil_hash_set(redefine_impl->ht_super, "XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING, annotated); - axis2_hash_set(redefine_impl->ht_super, "XML_SCHEMA_OBJ", + axutil_hash_set(redefine_impl->ht_super, "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env)); } @@ -195,7 +195,7 @@ if (redefine_impl->ht_super) { - axis2_hash_free(redefine_impl->ht_super, env); + axutil_hash_free(redefine_impl->ht_super, env); redefine_impl->ht_super = NULL; } @@ -239,7 +239,7 @@ xml_schema_redefine_t *redefine, const axutil_env_t *env, xml_schema_redefine_t *redefine_impl, - axis2_hash_t *methods) + axutil_hash_t *methods) { xml_schema_redefine_impl_t *redefine_impl_l = NULL; @@ -252,7 +252,7 @@ redefine->ops = AXIS2_MALLOC(env->allocator, sizeof(xml_schema_redefine_ops_t)); - redefine->ops->free = axis2_hash_get(methods, "free", + redefine->ops->free = axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); redefine->ops->get_base_impl = @@ -319,7 +319,7 @@ } -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_redefine_super_objs(void *redefine, const axutil_env_t *env) { 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?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- 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 Fri Mar 30 11:28:18 2007 @@ -36,7 +36,7 @@ xml_schema_types_t obj_type; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; }; #define AXIS2_INTF_TO_IMPL(sim_content) \ @@ -58,7 +58,7 @@ xml_schema_simple_content_get_type(void *sim_content, const axutil_env_t *env); -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_simple_content_super_objs(void *sim_content, const axutil_env_t *env); @@ -120,7 +120,7 @@ sim_cnt_impl->sim_content.ops->to_string = xml_schema_simple_content_to_string; - sim_cnt_impl->ht_super = axis2_hash_make(env); + sim_cnt_impl->ht_super = axutil_hash_make(env); if (!sim_cnt_impl->ht_super) { xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); @@ -132,13 +132,13 @@ xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env); return NULL; } - axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_CONTENT"), + axutil_hash_set(sim_cnt_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_CONTENT"), AXIS2_HASH_KEY_STRING, &(sim_cnt_impl->sim_content)); - axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), + axutil_hash_set(sim_cnt_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, sim_cnt_impl->annotated); - axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), + axutil_hash_set(sim_cnt_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_cnt_impl->annotated, env)); @@ -173,7 +173,7 @@ } if (sim_cnt_impl->ht_super) { - axis2_hash_free(sim_cnt_impl->ht_super, env); + axutil_hash_free(sim_cnt_impl->ht_super, env); sim_cnt_impl->ht_super = NULL; } if (sim_cnt_impl->sim_content.base.ops) @@ -257,7 +257,7 @@ return AXIS2_INTF_TO_IMPL(sim_content)->obj_type; } -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_simple_content_super_objs(void *sim_content, const axutil_env_t *env) { 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?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- 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 Fri Mar 30 11:28:18 2007 @@ -38,7 +38,7 @@ xml_schema_types_t obj_type; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; }; @@ -60,7 +60,7 @@ void *sim_content_ext, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_simple_content_extension_super_objs( void *sim_content_ext, const axutil_env_t *env); @@ -150,7 +150,7 @@ sim_content_ext_impl->sim_content_ext.ops->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->ht_super = axutil_hash_make(env); if (!sim_content_ext_impl->ht_super) { xml_schema_simple_content_extension_free( @@ -172,15 +172,15 @@ env); return NULL; } - axis2_hash_set(sim_content_ext_impl->ht_super, + axutil_hash_set(sim_content_ext_impl->ht_super, axis2_strdup(env, "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, + axutil_hash_set(sim_content_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, (sim_content_ext_impl->annotated)); - axis2_hash_set(sim_content_ext_impl->ht_super, + axutil_hash_set(sim_content_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_content_ext_impl->annotated, env)); @@ -329,7 +329,7 @@ return AXIS2_INTF_TO_IMPL(sim_content_ext)->obj_type; } -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_simple_content_extension_super_objs( void *sim_content_ext, const axutil_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?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- 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 Fri Mar 30 11:28:18 2007 @@ -44,7 +44,7 @@ xml_schema_types_t obj_type; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; }; #define AXIS2_INTF_TO_IMPL(sim_content_res) \ @@ -65,7 +65,7 @@ void *sim_content_res, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_simple_content_restriction_super_objs( void *sim_content_res, const axutil_env_t *env); @@ -75,7 +75,7 @@ void *sim_content_res, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_simple_content_restriction_super_objs( void *sim_content_res, const axutil_env_t *env); @@ -220,17 +220,17 @@ &(sim_content_res_impl->sim_content_res), env); return NULL; } - sim_content_res_impl->ht_super = axis2_hash_make(env); + sim_content_res_impl->ht_super = axutil_hash_make(env); - axis2_hash_set(sim_content_res_impl->ht_super , + axutil_hash_set(sim_content_res_impl->ht_super , "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 , + axutil_hash_set(sim_content_res_impl->ht_super , "XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING, sim_content_res_impl->annotated); - axis2_hash_set(sim_content_res_impl->ht_super , + axutil_hash_set(sim_content_res_impl->ht_super , "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_content_res_impl->annotated, env)); @@ -420,7 +420,7 @@ return AXIS2_INTF_TO_IMPL(sim_content_res)->obj_type; } -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_simple_content_restriction_super_objs( void *sim_content_res, const axutil_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?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- 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 Fri Mar 30 11:28:18 2007 @@ -35,7 +35,7 @@ /** parent type */ xml_schema_type_t *schema_type; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_types_t obj_type; @@ -54,7 +54,7 @@ xml_schema_simple_type_get_base_impl(void *simple_type, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_simple_type_super_objs(void *simple_type, const axutil_env_t *env); @@ -140,7 +140,7 @@ simple_type->simple_type.ops->super_objs = xml_schema_simple_type_super_objs; - simple_type->ht_super = axis2_hash_make(env); + simple_type->ht_super = axutil_hash_make(env); if (!simple_type->ht_super) { xml_schema_simple_type_free(&(simple_type->simple_type), env); @@ -148,21 +148,21 @@ return NULL; } - axis2_hash_set(simple_type->ht_super, + axutil_hash_set(simple_type->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE"), AXIS2_HASH_KEY_STRING, &(simple_type->simple_type)); - axis2_hash_set(simple_type->ht_super, + axutil_hash_set(simple_type->ht_super, axis2_strdup(env, "XML_SCHEMA_TYPE"), AXIS2_HASH_KEY_STRING, simple_type->schema_type); annotated = XML_SCHEMA_TYPE_GET_BASE_IMPL(simple_type->schema_type, env); if (annotated) { - axis2_hash_set(simple_type->ht_super, + axutil_hash_set(simple_type->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, annotated); - axis2_hash_set(simple_type->ht_super, + axutil_hash_set(simple_type->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env)); @@ -188,7 +188,7 @@ if (simple_type_impl->ht_super) { - axis2_hash_free(simple_type_impl->ht_super, env); + axutil_hash_free(simple_type_impl->ht_super, env); simple_type_impl->ht_super = NULL; } if (simple_type_impl->schema_type) @@ -229,7 +229,7 @@ xml_schema_simple_type_t *simple_type, const axutil_env_t *env, xml_schema_simple_type_t *simple_type_impl, - axis2_hash_t *methods) + axutil_hash_t *methods) { xml_schema_simple_type_impl_t *type_impl_l = NULL; @@ -247,7 +247,7 @@ return AXIS2_FAILURE; } - simple_type->ops->free = axis2_hash_get(methods, "free", + simple_type->ops->free = axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); simple_type->ops->get_base_impl = type_impl_l->simple_type.ops->get_base_impl; @@ -303,7 +303,7 @@ return NULL; } -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_simple_type_super_objs(void *simple_type, const axutil_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c Fri Mar 30 11:28:18 2007 @@ -31,7 +31,7 @@ xml_schema_annotated_t *annotated; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_types_t obj_type; }; @@ -53,7 +53,7 @@ xml_schema_simple_type_content_get_type(void *sim_type_cont, const axutil_env_t *env); -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_simple_type_content_super_objs(void *sim_type_cont, const axutil_env_t *env); @@ -99,7 +99,7 @@ sim_type_cont_impl->sim_type_cont.ops->super_objs = xml_schema_simple_type_content_super_objs; - sim_type_cont_impl->ht_super = axis2_hash_make(env); + sim_type_cont_impl->ht_super = axutil_hash_make(env); if (!sim_type_cont_impl->ht_super) { xml_schema_simple_type_content_free(&(sim_type_cont_impl->sim_type_cont), env); @@ -114,15 +114,15 @@ return NULL; } - axis2_hash_set(sim_type_cont_impl->ht_super, + axutil_hash_set(sim_type_cont_impl->ht_super, axis2_strdup(env,"XML_SCHEMA_SIMPLE_TYPE_CONTENT"), AXIS2_HASH_KEY_STRING, &(sim_type_cont_impl->sim_type_cont)); - axis2_hash_set(sim_type_cont_impl->ht_super, + axutil_hash_set(sim_type_cont_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, sim_type_cont_impl->annotated); - axis2_hash_set(sim_type_cont_impl->ht_super, + axutil_hash_set(sim_type_cont_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_type_cont_impl->annotated, env)); @@ -149,7 +149,7 @@ if (sim_type_cont_impl->ht_super) { - axis2_hash_free(sim_type_cont_impl->ht_super, env); + axutil_hash_free(sim_type_cont_impl->ht_super, env); sim_type_cont_impl->ht_super = NULL; } @@ -229,7 +229,7 @@ return AXIS2_INTF_TO_IMPL(sim_type_cont)->obj_type; } -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_simple_type_content_super_objs(void *sim_type_cont, const axutil_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c Fri Mar 30 11:28:18 2007 @@ -33,7 +33,7 @@ xml_schema_types_t obj_type; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_simple_type_t *item_type; @@ -54,7 +54,7 @@ xml_schema_simple_type_list_get_base_impl(void *simple_type_list, const axutil_env_t *env); -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_simple_type_list_super_objs(void *simple_type_list, const axutil_env_t *env); @@ -135,7 +135,7 @@ simple_type_list_impl->simple_type_list.ops->set_item_type_name = xml_schema_simple_type_list_set_item_type_name; - simple_type_list_impl->ht_super = axis2_hash_make(env); + simple_type_list_impl->ht_super = axutil_hash_make(env); if (!simple_type_list_impl->ht_super) { xml_schema_simple_type_list_free( @@ -154,11 +154,11 @@ return NULL; } - axis2_hash_set(simple_type_list_impl->ht_super, + axutil_hash_set(simple_type_list_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_LIST"), AXIS2_HASH_KEY_STRING, &(simple_type_list_impl->simple_type_list)); - axis2_hash_set(simple_type_list_impl->ht_super, + axutil_hash_set(simple_type_list_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_CONTENT"), AXIS2_HASH_KEY_STRING, &(simple_type_list_impl->sim_type_content)); @@ -166,11 +166,11 @@ simple_type_list_impl->sim_type_content, env); if (annotated) { - axis2_hash_set(simple_type_list_impl->ht_super, + axutil_hash_set(simple_type_list_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, annotated); - axis2_hash_set(simple_type_list_impl->ht_super, + axutil_hash_set(simple_type_list_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env)); @@ -197,7 +197,7 @@ if (simple_type_list_impl->ht_super) { - axis2_hash_free(simple_type_list_impl->ht_super, env); + axutil_hash_free(simple_type_list_impl->ht_super, env); simple_type_list_impl->ht_super = NULL; } if (simple_type_list_impl->sim_type_content) @@ -246,7 +246,7 @@ xml_schema_simple_type_list_t *simple_type_list, const axutil_env_t *env, xml_schema_simple_type_list_t *simple_type_list_impl, - axis2_hash_t *methods) + axutil_hash_t *methods) { xml_schema_simple_type_list_impl_t *simple_type_list_impl_l = NULL; @@ -265,7 +265,7 @@ return AXIS2_FAILURE; } - simple_type_list->ops->free = axis2_hash_get(methods, "free", + simple_type_list->ops->free = axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); simple_type_list->ops->get_base_impl = simple_type_list_impl_l->simple_type_list.ops->get_base_impl; @@ -339,7 +339,7 @@ return AXIS2_SUCCESS; } -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_simple_type_list_super_objs(void *simple_type_list, const axutil_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c Fri Mar 30 11:28:18 2007 @@ -32,7 +32,7 @@ xml_schema_simple_type_content_t *sim_type_content; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_types_t obj_type; @@ -64,7 +64,7 @@ xml_schema_simple_type_restriction_get_type(void *simple_type_restriction, const axutil_env_t *env); -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_simple_type_restriction_super_objs(void *simple_type_restriction, const axutil_env_t *env); @@ -146,7 +146,7 @@ xml_schema_simple_type_restriction_get_facets; - simple_type_restriction_impl->ht_super = axis2_hash_make(env); + simple_type_restriction_impl->ht_super = axutil_hash_make(env); if (!simple_type_restriction_impl->ht_super) { xml_schema_simple_type_restriction_free(&(simple_type_restriction_impl->simple_type_restriction), env); @@ -167,12 +167,12 @@ return NULL; } - axis2_hash_set(simple_type_restriction_impl->ht_super, + axutil_hash_set(simple_type_restriction_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_RESTRICTION"), AXIS2_HASH_KEY_STRING, &(simple_type_restriction_impl->simple_type_restriction)); - axis2_hash_set(simple_type_restriction_impl->ht_super, + axutil_hash_set(simple_type_restriction_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_CONTENT"), AXIS2_HASH_KEY_STRING, simple_type_restriction_impl->sim_type_content); @@ -181,11 +181,11 @@ if (annotated) { - axis2_hash_set(simple_type_restriction_impl->ht_super, + axutil_hash_set(simple_type_restriction_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, annotated); - axis2_hash_set(simple_type_restriction_impl->ht_super, + axutil_hash_set(simple_type_restriction_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env)); @@ -212,7 +212,7 @@ if (simple_type_restriction_impl->ht_super) { - axis2_hash_free(simple_type_restriction_impl->ht_super, env); + axutil_hash_free(simple_type_restriction_impl->ht_super, env); simple_type_restriction_impl->ht_super = NULL; } @@ -263,7 +263,7 @@ xml_schema_simple_type_restriction_t *simple_type_restriction, const axutil_env_t *env, xml_schema_simple_type_restriction_t *simple_type_restriction_impl, - axis2_hash_t *methods) + axutil_hash_t *methods) { xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl_l = NULL; @@ -282,7 +282,7 @@ return AXIS2_FAILURE; } - simple_type_restriction->ops->free = axis2_hash_get(methods, "free", + simple_type_restriction->ops->free = axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); simple_type_restriction->ops->get_base_impl = simple_type_restriction_impl_l->simple_type_restriction.ops->get_base_impl; @@ -378,7 +378,7 @@ return AXIS2_INTF_TO_IMPL(simple_type_restriction)->obj_type; } -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_simple_type_restriction_super_objs(void *simple_type_restriction, const axutil_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c Fri Mar 30 11:28:18 2007 @@ -31,7 +31,7 @@ xml_schema_simple_type_content_t *sim_type_content; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_types_t obj_type; @@ -55,7 +55,7 @@ xml_schema_simple_type_union_get_type(void *simple_type_union, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_simple_type_union_super_objs(void *simple_type_union, const axutil_env_t *env); @@ -148,7 +148,7 @@ simple_type_union_impl->simple_type_union.ops->set_member_types_qnames = xml_schema_simple_type_union_set_member_types_qnames; - simple_type_union_impl->ht_super = axis2_hash_make(env); + simple_type_union_impl->ht_super = axutil_hash_make(env); if (!simple_type_union_impl->ht_super) { @@ -179,11 +179,11 @@ } - axis2_hash_set(simple_type_union_impl->ht_super, + axutil_hash_set(simple_type_union_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_UNION"), AXIS2_HASH_KEY_STRING, &(simple_type_union_impl->simple_type_union)); - axis2_hash_set(simple_type_union_impl->ht_super, + axutil_hash_set(simple_type_union_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_CONTENT"), AXIS2_HASH_KEY_STRING, simple_type_union_impl->sim_type_content); @@ -193,11 +193,11 @@ if (annotated) { - axis2_hash_set(simple_type_union_impl->ht_super, + axutil_hash_set(simple_type_union_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, annotated); - axis2_hash_set(simple_type_union_impl->ht_super, + axutil_hash_set(simple_type_union_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env)); @@ -224,7 +224,7 @@ if (simple_type_union_impl->ht_super) { - axis2_hash_free(simple_type_union_impl->ht_super, env); + axutil_hash_free(simple_type_union_impl->ht_super, env); simple_type_union_impl->ht_super = NULL; } if (simple_type_union_impl->sim_type_content) @@ -273,7 +273,7 @@ xml_schema_simple_type_union_t *simple_type_union, const axutil_env_t *env, xml_schema_simple_type_union_t *simple_type_union_impl, - axis2_hash_t *methods) + axutil_hash_t *methods) { xml_schema_simple_type_union_impl_t *simple_type_union_impl_l = NULL; @@ -292,7 +292,7 @@ return AXIS2_FAILURE; } - simple_type_union->ops->free = axis2_hash_get(methods, "free", + simple_type_union->ops->free = axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); simple_type_union->ops->get_base_impl = simple_type_union_impl_l->simple_type_union.ops->get_base_impl; @@ -369,7 +369,7 @@ return AXIS2_INTF_TO_IMPL(simple_type_union)->obj_type; } -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_simple_type_union_super_objs(void *simple_type_union, const axutil_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c Fri Mar 30 11:28:18 2007 @@ -55,7 +55,7 @@ axis2_qname_t *qname; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_types_t obj_type; }; @@ -77,7 +77,7 @@ xml_schema_type_get_type(void *type, const axutil_env_t *env); -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_type_super_objs(void *type, const axutil_env_t *env); @@ -220,21 +220,21 @@ xml_schema_type_free(&(type_impl->annotated), env); return NULL; } - type_impl->ht_super = axis2_hash_make(env); + type_impl->ht_super = axutil_hash_make(env); if (!type_impl->ht_super) { xml_schema_type_free(&(type_impl->annotated), env); return NULL; } - axis2_hash_set(type_impl->ht_super, + axutil_hash_set(type_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_TYPE"), AXIS2_HASH_KEY_STRING, &(type_impl->type)); - axis2_hash_set(type_impl->ht_super, + axutil_hash_set(type_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, type_impl->annotated); - axis2_hash_set(type_impl->ht_super, + axutil_hash_set(type_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(type_impl->annotated, env)); @@ -363,12 +363,12 @@ const axutil_env_t *env) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, NULL); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return NULL; @@ -381,12 +381,12 @@ const axutil_env_t *env) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, NULL); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return NULL; @@ -399,12 +399,12 @@ const axutil_env_t *env) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, NULL); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return NULL; @@ -417,12 +417,12 @@ const axutil_env_t *env) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, NULL); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return NULL; @@ -436,13 +436,13 @@ xml_schema_derivation_method_t *final_derivation) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, final_derivation, AXIS2_FAILURE); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return AXIS2_FAILURE; @@ -461,12 +461,12 @@ const axutil_env_t *env) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, NULL); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return NULL; @@ -480,12 +480,12 @@ const axutil_env_t *env) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return AXIS2_FAILURE; @@ -499,12 +499,12 @@ axis2_bool_t is_mixed) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return AXIS2_FAILURE; @@ -517,12 +517,12 @@ const axutil_env_t *env) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, NULL); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return NULL; @@ -536,13 +536,13 @@ axis2_char_t *name) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return AXIS2_FAILURE; @@ -565,13 +565,13 @@ const axutil_env_t *env) { xml_schema_type_impl_t *type_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; axis2_char_t *target_ns = NULL; AXIS2_ENV_CHECK(env, NULL); ht_super = XML_SCHEMA_TYPE_SUPER_OBJS(type, env); if (ht_super) { - type_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, + type_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING)); if (!type_impl) return NULL; @@ -603,7 +603,7 @@ return AXIS2_INTF_TO_IMPL(type)->obj_type; } -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_type_super_objs(void *type, const axutil_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c Fri Mar 30 11:28:18 2007 @@ -31,7 +31,7 @@ xml_schema_types_t obj_type; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; axutil_array_list_t *members; @@ -43,7 +43,7 @@ xml_schema_use_free(void *use, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_use_super_objs( void *use, const axutil_env_t *env); @@ -62,7 +62,7 @@ xml_schema_use_t *use, const axutil_env_t *env, xml_schema_use_t *use_impl, - axis2_hash_t *methods); + axutil_hash_t *methods); axutil_array_list_t * AXIS2_CALL xml_schema_use_get_values(void *use, @@ -119,18 +119,18 @@ use_impl->schema_enum = xml_schema_enum_create(env, value); - use_impl->ht_super = axis2_hash_make(env); + use_impl->ht_super = axutil_hash_make(env); if (!use_impl->ht_super) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - axis2_hash_set(use_impl->ht_super, + axutil_hash_set(use_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_USE"), AXIS2_HASH_KEY_STRING, &(use_impl->use)); - axis2_hash_set(use_impl->ht_super, + axutil_hash_set(use_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ENUM"), AXIS2_HASH_KEY_STRING, use_impl->schema_enum); @@ -180,7 +180,7 @@ if (use_impl->ht_super) { - axis2_hash_free(use_impl->ht_super, env); + axutil_hash_free(use_impl->ht_super, env); use_impl->ht_super = NULL; } @@ -202,7 +202,7 @@ return AXIS2_SUCCESS; } -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_use_super_objs( void *use, const axutil_env_t *env) @@ -241,10 +241,10 @@ const axutil_env_t *env) { xml_schema_use_impl_t *use_impl = NULL; - axis2_hash_t *super = NULL; + axutil_hash_t *super = NULL; super = XML_SCHEMA_USE_SUPER_OBJS(use, env); - use_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super, "XML_SCHEMA_USE", + use_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super, "XML_SCHEMA_USE", AXIS2_HASH_KEY_STRING)); if (use_impl) return use_impl->members; Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c Fri Mar 30 11:28:18 2007 @@ -31,7 +31,7 @@ axis2_char_t *x_path; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_types_t obj_type; }; @@ -50,7 +50,7 @@ xml_schema_xpath_get_type(void *xpath, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_xpath_super_objs(void *xpath, const axutil_env_t *env); @@ -93,23 +93,23 @@ xpath_impl->annotated = xml_schema_annotated_create(env); - xpath_impl->ht_super = axis2_hash_make(env); + xpath_impl->ht_super = axutil_hash_make(env); if (!xpath_impl->ht_super) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - axis2_hash_set(xpath_impl->ht_super, + axutil_hash_set(xpath_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_XPATH"), AXIS2_HASH_KEY_STRING, &(xpath_impl->xpath)); - axis2_hash_set(xpath_impl->ht_super, + axutil_hash_set(xpath_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING, xpath_impl->annotated); - axis2_hash_set(xpath_impl->ht_super, + axutil_hash_set(xpath_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(xpath_impl->annotated, env)); @@ -139,7 +139,7 @@ } if (xpath_impl->ht_super) { - axis2_hash_free(xpath_impl->ht_super, env); + axutil_hash_free(xpath_impl->ht_super, env); xpath_impl->ht_super = NULL; } @@ -181,7 +181,7 @@ xml_schema_xpath_t *xpath, const axutil_env_t *env, xml_schema_xpath_t *xpath_impl, - axis2_hash_t *methods) + axutil_hash_t *methods) { xml_schema_xpath_impl_t *xpath_impl_l = NULL; @@ -193,7 +193,7 @@ xpath->ops = AXIS2_MALLOC(env->allocator, sizeof(xml_schema_xpath_ops_t)); - xpath->ops->free = axis2_hash_get(methods, "free", + xpath->ops->free = axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); xpath->ops->get_base_impl = xpath_impl_l->xpath.ops->get_base_impl; @@ -247,7 +247,7 @@ return AXIS2_INTF_TO_IMPL(xpath)->obj_type; } -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_xpath_super_objs(void *xpath, const axutil_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c Fri Mar 30 11:28:18 2007 @@ -33,7 +33,7 @@ axutil_array_list_t *members; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_types_t type; }; @@ -53,7 +53,7 @@ xml_schema_severity_type_get_values(void *severity_type, const axutil_env_t *env); -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_severity_type_super_objs(void *severity_type, const axutil_env_t *env); @@ -121,7 +121,7 @@ return NULL; } - severity_type_impl->ht_super = axis2_hash_make(env); + severity_type_impl->ht_super = axutil_hash_make(env); if (!severity_type_impl->ht_super) { xml_schema_severity_type_free(&(severity_type_impl->severity_type), env); @@ -129,11 +129,11 @@ return NULL; } - axis2_hash_set(severity_type_impl->ht_super, + axutil_hash_set(severity_type_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SEVERITY_TYPE"), AXIS2_HASH_KEY_STRING, &(severity_type_impl->severity_type)); - axis2_hash_set(severity_type_impl->ht_super, + axutil_hash_set(severity_type_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ENUM"), AXIS2_HASH_KEY_STRING, severity_type_impl->schema_enum); @@ -215,12 +215,12 @@ { /* xml_schema_severity_type_impl_t *severity_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; ht_super = XML_SCHEMA_SEREVITY_TYPE_SUPER_OBJS(severity_type, env); if( ht_super) { severity_impl = (xml_schema_severity_type_impl_t*) - axis2_hash_get(ht_super, "XML_SCHEMA_SEVERITY_TYPE", AXIS2_HASH_KEY_STRING); + axutil_hash_get(ht_super, "XML_SCHEMA_SEVERITY_TYPE", AXIS2_HASH_KEY_STRING); return severity_impl->members; } */ @@ -228,7 +228,7 @@ } -axis2_hash_t *AXIS2_CALL +axutil_hash_t *AXIS2_CALL xml_schema_severity_type_super_objs(void *severity_type, const axutil_env_t *env) { Modified: webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c?view=diff&rev=524225&r1=524224&r2=524225 ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c Fri Mar 30 11:28:18 2007 @@ -32,7 +32,7 @@ axutil_array_list_t *members; - axis2_hash_t *ht_super; + axutil_hash_t *ht_super; xml_schema_types_t obj_type; }; @@ -58,7 +58,7 @@ xml_schema_tokenized_type_get_type(void *tokenized_type, const axutil_env_t *env); -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_tokenized_type_super_objs(void *tokenized_type, const axutil_env_t *env); @@ -141,7 +141,7 @@ tokenized_type_impl->schema_enum = xml_schema_enum_create(env, value); - tokenized_type_impl->ht_super = axis2_hash_make(env); + tokenized_type_impl->ht_super = axutil_hash_make(env); if (!tokenized_type_impl->ht_super) { xml_schema_tokenized_type_free(&(tokenized_type_impl->tokenized_type), env); @@ -149,10 +149,10 @@ return NULL; } - axis2_hash_set(tokenized_type_impl->ht_super , "XML_SCHEMA_TOKENIZED_TYPE", + axutil_hash_set(tokenized_type_impl->ht_super , "XML_SCHEMA_TOKENIZED_TYPE", AXIS2_HASH_KEY_STRING, &(tokenized_type_impl->tokenized_type)); - axis2_hash_set(tokenized_type_impl->ht_super, "XML_SCHEMA_ENUM", + axutil_hash_set(tokenized_type_impl->ht_super, "XML_SCHEMA_ENUM", AXIS2_HASH_KEY_STRING, tokenized_type_impl->schema_enum); status = xml_schema_enum_resolve_methods( @@ -225,12 +225,12 @@ { /* xml_schema_tokenized_type_impl_t *tokenized_impl = NULL; - axis2_hash_t *ht_super = NULL; + axutil_hash_t *ht_super = NULL; ht_super = XML_SCHEMA_TOKENIZED_TYPE_SUPER_OBJS(tokenized_type, env); if( ht_super) { tokenized_impl = (xml_schema_tokenized_type_impl_t*) - axis2_hash_get(tokenized_impl->ht_super, "XML_SCHEMA_TOKENIZED_TYPE", + axutil_hash_get(tokenized_impl->ht_super, "XML_SCHEMA_TOKENIZED_TYPE", AXIS2_HASH_KEY_STRING); if( tokenized_impl) { @@ -248,7 +248,7 @@ return AXIS2_INTF_TO_IMPL(tokenized_type)->obj_type; } -axis2_hash_t* AXIS2_CALL +axutil_hash_t* AXIS2_CALL xml_schema_tokenized_type_super_objs(void *tokenized_type, const axutil_env_t *env) { --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org