You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/30 20:28:34 UTC
svn commit: r524225 [4/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/...
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h Fri Mar 30 11:28:18 2007
@@ -355,14 +355,14 @@
axis2_status_t (AXIS2_CALL *
set_element2schema_qnamemap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *element2schema_qnamemap);
+ axutil_hash_t *element2schema_qnamemap);
/**
* getter for element2schema_qnamemap.
* @param schema_writer_meta_info pointer to schema_writer_meta_info struct
* @param env Environment. MUST NOT be NULL
* @param value for the element2schema_qnamemap
*/
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
get_element2schema_qnamemap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
@@ -377,14 +377,14 @@
axis2_status_t (AXIS2_CALL *
set_element2classmap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *element2classmap);
+ axutil_hash_t *element2classmap);
/**
* getter for element2classmap.
* @param schema_writer_meta_info pointer to schema_writer_meta_info struct
* @param env Environment. MUST NOT be NULL
* @param value for the element2classmap
*/
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
get_element2classmap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
@@ -399,14 +399,14 @@
axis2_status_t (AXIS2_CALL *
set_specialtype_flagmap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *specialtype_flagmap);
+ axutil_hash_t *specialtype_flagmap);
/**
* getter for specialtype_flagmap.
* @param schema_writer_meta_info pointer to schema_writer_meta_info struct
* @param env Environment. MUST NOT be NULL
* @param value for the specialtype_flagmap
*/
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
get_specialtype_flagmap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
@@ -421,14 +421,14 @@
axis2_status_t (AXIS2_CALL *
set_qname_maxoccurs_countmap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *qname_maxoccurs_countmap);
+ axutil_hash_t *qname_maxoccurs_countmap);
/**
* getter for qname_maxoccurs_countmap.
* @param schema_writer_meta_info pointer to schema_writer_meta_info struct
* @param env Environment. MUST NOT be NULL
* @param value for the qname_maxoccurs_countmap
*/
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
get_qname_maxoccurs_countmap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
@@ -443,14 +443,14 @@
axis2_status_t (AXIS2_CALL *
set_qname_minoccurs_countmap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *qname_minoccurs_countmap);
+ axutil_hash_t *qname_minoccurs_countmap);
/**
* getter for qname_minoccurs_countmap.
* @param schema_writer_meta_info pointer to schema_writer_meta_info struct
* @param env Environment. MUST NOT be NULL
* @param value for the qname_minoccurs_countmap
*/
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
get_qname_minoccurs_countmap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h Fri Mar 30 11:28:18 2007
@@ -25,7 +25,7 @@
#include <axis2_utils.h>
#include <axutil_array_list.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#ifdef __cplusplus
@@ -121,7 +121,7 @@
* @param env Environment. MUST NOT be NULL
* @param the qname 2 typename hash
*/
- axis2_hash_t* (AXIS2_CALL *
+ axutil_hash_t* (AXIS2_CALL *
get_all)(w2c_typemapper_t *typemapper,
const axutil_env_t *env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c Fri Mar 30 11:28:18 2007
@@ -25,7 +25,7 @@
#include <w2c_schema_property_loader.h>
#include <w2c_typemapper.h>
#include <xml_schema_includes.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <w2c_string.h>
#include <stdlib.h>
@@ -39,21 +39,21 @@
w2c_schema_compiler_options_t *compiler_options;
w2c_schema_writer_t *writer;
/** maps */
- axis2_hash_t *processed_type_map;
- axis2_hash_t *processed_element_map;
- axis2_hash_t *loaded_schema_map;
- axis2_hash_t *processed_anonymous_complex_typemap;
- axis2_hash_t *processed_ele_ref_map;
- axis2_hash_t *simple_type_map;
- axis2_hash_t *changed_type_map;
- axis2_hash_t *processed_type_meta_info_map;
- axis2_hash_t *available_schema_map;
+ axutil_hash_t *processed_type_map;
+ axutil_hash_t *processed_element_map;
+ axutil_hash_t *loaded_schema_map;
+ axutil_hash_t *processed_anonymous_complex_typemap;
+ axutil_hash_t *processed_ele_ref_map;
+ axutil_hash_t *simple_type_map;
+ axutil_hash_t *changed_type_map;
+ axutil_hash_t *processed_type_meta_info_map;
+ axutil_hash_t *available_schema_map;
w2c_typemapper_t *base_schema_type_mapper;
- axis2_hash_t *all_processed_anon_type;
+ axutil_hash_t *all_processed_anon_type;
/** virtual lists */
- axis2_hash_t *processed_ele_list;
- axis2_hash_t *nillable_ele_list;
+ axutil_hash_t *processed_ele_list;
+ axutil_hash_t *nillable_ele_list;
w2c_schema_property_loader_t *loader;
@@ -99,8 +99,8 @@
const axutil_env_t *env,
xml_schema_element_t *ele,
axis2_bool_t is_outer,
- axis2_hash_t *inner_element_map,
- axis2_hash_t *local_nillable_list,
+ axutil_hash_t *inner_element_map,
+ axutil_hash_t *local_nillable_list,
xml_schema_t *parent_schema);
axis2_status_t
@@ -286,7 +286,7 @@
axis2_char_t *language = NULL;
axis2_char_t *template_name = NULL;
axis2_char_t *typemapper_file = NULL;
- axis2_hash_t *base_schema_type_map = NULL;
+ axutil_hash_t *base_schema_type_map = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -300,19 +300,19 @@
}
compiler_impl->compiler_options = compiler_options;
/* creates empty hashes */
- compiler_impl->processed_type_map = axis2_hash_make( env);
- compiler_impl->processed_element_map = axis2_hash_make( env);
- compiler_impl->simple_type_map = axis2_hash_make( env);
- compiler_impl->processed_anonymous_complex_typemap = axis2_hash_make( env);
- compiler_impl->changed_type_map = axis2_hash_make( env);
- compiler_impl->processed_type_meta_info_map = axis2_hash_make( env);
- compiler_impl->processed_ele_ref_map = axis2_hash_make( env);
- compiler_impl->loaded_schema_map = axis2_hash_make( env);
- compiler_impl->available_schema_map = axis2_hash_make( env);
- compiler_impl->all_processed_anon_type = axis2_hash_make( env);
+ compiler_impl->processed_type_map = axutil_hash_make( env);
+ compiler_impl->processed_element_map = axutil_hash_make( env);
+ compiler_impl->simple_type_map = axutil_hash_make( env);
+ compiler_impl->processed_anonymous_complex_typemap = axutil_hash_make( env);
+ compiler_impl->changed_type_map = axutil_hash_make( env);
+ compiler_impl->processed_type_meta_info_map = axutil_hash_make( env);
+ compiler_impl->processed_ele_ref_map = axutil_hash_make( env);
+ compiler_impl->loaded_schema_map = axutil_hash_make( env);
+ compiler_impl->available_schema_map = axutil_hash_make( env);
+ compiler_impl->all_processed_anon_type = axutil_hash_make( env);
- compiler_impl->processed_ele_list = axis2_hash_make( env);
- compiler_impl->nillable_ele_list = axis2_hash_make( env);
+ compiler_impl->processed_ele_list = axutil_hash_make( env);
+ compiler_impl->nillable_ele_list = axutil_hash_make( env);
compiler_impl->base_schema_type_mapper = NULL;
compiler_impl->writer = NULL;
compiler_impl->loader = NULL;
@@ -377,35 +377,35 @@
}
if( schema_compiler_impl-> processed_type_map)
{
- axis2_hash_free( schema_compiler_impl-> processed_type_map, env);
+ axutil_hash_free( schema_compiler_impl-> processed_type_map, env);
}
if( schema_compiler_impl-> processed_element_map)
{
- axis2_hash_free( schema_compiler_impl-> processed_element_map, env);
+ axutil_hash_free( schema_compiler_impl-> processed_element_map, env);
}
if( schema_compiler_impl-> loaded_schema_map)
{
- axis2_hash_free( schema_compiler_impl-> loaded_schema_map, env);
+ axutil_hash_free( schema_compiler_impl-> loaded_schema_map, env);
}
if( schema_compiler_impl-> processed_anonymous_complex_typemap)
{
- axis2_hash_free( schema_compiler_impl-> processed_anonymous_complex_typemap, env);
+ axutil_hash_free( schema_compiler_impl-> processed_anonymous_complex_typemap, env);
}
if( schema_compiler_impl-> processed_ele_ref_map)
{
- axis2_hash_free( schema_compiler_impl-> processed_ele_ref_map, env);
+ axutil_hash_free( schema_compiler_impl-> processed_ele_ref_map, env);
}
if( schema_compiler_impl-> simple_type_map)
{
- axis2_hash_free( schema_compiler_impl-> simple_type_map, env);
+ axutil_hash_free( schema_compiler_impl-> simple_type_map, env);
}
if( schema_compiler_impl-> changed_type_map)
{
- axis2_hash_free( schema_compiler_impl-> changed_type_map, env);
+ axutil_hash_free( schema_compiler_impl-> changed_type_map, env);
}
if( schema_compiler_impl-> processed_type_meta_info_map)
{
- axis2_hash_free( schema_compiler_impl-> processed_type_meta_info_map, env);
+ axutil_hash_free( schema_compiler_impl-> processed_type_meta_info_map, env);
}
if( schema_compiler_impl-> base_schema_type_mapper)
{
@@ -413,15 +413,15 @@
}
if( schema_compiler_impl-> available_schema_map)
{
- axis2_hash_free( schema_compiler_impl-> available_schema_map, env);
+ axutil_hash_free( schema_compiler_impl-> available_schema_map, env);
}
if( schema_compiler_impl-> processed_ele_list)
{
- axis2_hash_free( schema_compiler_impl-> processed_ele_list, env);
+ axutil_hash_free( schema_compiler_impl-> processed_ele_list, env);
}
if( schema_compiler_impl-> nillable_ele_list)
{
- axis2_hash_free( schema_compiler_impl-> nillable_ele_list, env);
+ axutil_hash_free( schema_compiler_impl-> nillable_ele_list, env);
}
if ( schema_compiler_impl-> loader)
{
@@ -492,11 +492,11 @@
}
/** adding the schema to loaded schema map */
- schema_stored = axis2_hash_get( compiler_impl-> loaded_schema_map, target_ns,
+ schema_stored = axutil_hash_get( compiler_impl-> loaded_schema_map, target_ns,
AXIS2_HASH_KEY_STRING );
if( ! schema_stored)
{
- axis2_hash_set( compiler_impl-> loaded_schema_map, target_ns,
+ axutil_hash_set( compiler_impl-> loaded_schema_map, target_ns,
AXIS2_HASH_KEY_STRING, xml_schema);
}
@@ -581,7 +581,7 @@
w2c_schema_writer_meta_info_t *meta_inf = NULL;
axis2_char_t *class_name = NULL;
axis2_char_t *qname2str = NULL;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
xml_schema_particle_t *particle = NULL;
axis2_bool_t is_array = AXIS2_FALSE;
axis2_qname_t *type_qname = NULL;
@@ -593,14 +593,14 @@
qname = XML_SCHEMA_ELEMENT_GET_QNAME( element, env);
qname_str = w2c_string_make_key_from_qname( qname, env);
- existing = axis2_hash_get( compiler_impl->processed_element_map, qname_str, AXIS2_HASH_KEY_STRING);
+ existing = axutil_hash_get( compiler_impl->processed_element_map, qname_str, AXIS2_HASH_KEY_STRING);
if ( existing != NULL )
{
return AXIS2_SUCCESS;
}
meta_inf = w2c_schema_writer_meta_info_create( env);
base_hash = XML_SCHEMA_ELEMENT_SUPER_OBJS( element, env);
- particle = axis2_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
+ particle = axutil_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
is_array = w2c_schema_compiler_is_array( compiler_impl, env, particle);
schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE( element, env);
@@ -613,7 +613,7 @@
type_qname = XML_SCHEMA_TYPE_GET_QNAME(schema_type, env);
class_name = w2c_schema_compiler_find_class_name( compiler_impl, env, type_qname, is_array);
qname2str = w2c_string_make_key_from_qname( type_qname, env);
- changed_qname = axis2_hash_get( compiler_impl-> changed_type_map, qname2str, AXIS2_HASH_KEY_STRING);
+ changed_qname = axutil_hash_get( compiler_impl-> changed_type_map, qname2str, AXIS2_HASH_KEY_STRING);
/** this means the schema type actually returns a different QName */
if ( changed_qname == NULL )
{
@@ -640,7 +640,7 @@
if ( schema_type != NULL )
{
/* TODO: recheck getting the meta inf corrosponding to the element */
- meta_inf = axis2_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
+ meta_inf = axutil_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
qname_str, AXIS2_HASH_KEY_STRING);
if ( meta_inf) /* this is some extra to java */
{
@@ -659,7 +659,7 @@
}
}
- if ( axis2_hash_get( compiler_impl-> nillable_ele_list,
+ if ( axutil_hash_get( compiler_impl-> nillable_ele_list,
qname_str, AXIS2_HASH_KEY_STRING) )
{
W2C_SCHEMA_WRITER_META_INFO_REGISTER_NILLABLE_QNAME( meta_inf, env, qname);
@@ -668,7 +668,7 @@
written_classname =
W2C_SCHEMA_WRITER_WRITE_ELEMENT( compiler_impl-> writer, env, element,
compiler_impl->processed_type_map, meta_inf);
- axis2_hash_set( compiler_impl->processed_element_map, qname_str,
+ axutil_hash_set( compiler_impl->processed_element_map, qname_str,
AXIS2_HASH_KEY_STRING, written_classname );
/** registering the class is not done */
@@ -684,22 +684,22 @@
{
axis2_char_t *qname_str = NULL;
axis2_char_t *class_name = NULL;
- axis2_hash_t *base_schema_type_map = NULL;
+ axutil_hash_t *base_schema_type_map = NULL;
base_schema_type_map =
W2C_TYPEMAPPER_GET_ALL( compiler_impl-> base_schema_type_mapper, env);
qname_str = w2c_string_make_key_from_qname( qname, env);
- class_name = axis2_hash_get( compiler_impl->processed_type_map, qname_str,
+ class_name = axutil_hash_get( compiler_impl->processed_type_map, qname_str,
AXIS2_HASH_KEY_STRING);
if ( ! class_name )
{
- class_name = axis2_hash_get( compiler_impl->simple_type_map, qname_str,
+ class_name = axutil_hash_get( compiler_impl->simple_type_map, qname_str,
AXIS2_HASH_KEY_STRING);
}
if ( ! class_name )
{
- class_name = axis2_hash_get( base_schema_type_map, qname_str,
+ class_name = axutil_hash_get( base_schema_type_map, qname_str,
AXIS2_HASH_KEY_STRING);
}
if ( ! class_name )
@@ -741,8 +741,8 @@
const axutil_env_t *env,
xml_schema_element_t *ele,
axis2_bool_t is_outer,
- axis2_hash_t *inner_ele_map,
- axis2_hash_t *local_nillable_list,
+ axutil_hash_t *inner_ele_map,
+ axutil_hash_t *local_nillable_list,
xml_schema_t *parent_schema)
{
int processed = 0;
@@ -751,7 +751,7 @@
xml_schema_type_t *schema_type = NULL;
axis2_char_t *class_name = NULL;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
xml_schema_particle_t *particle = NULL;
axis2_bool_t is_array = AXIS2_FALSE;
@@ -781,7 +781,7 @@
if( qname != NULL)
{
qname_str = w2c_string_make_key_from_qname( qname, env);
- processed = (int)axis2_hash_get( compiler_impl-> processed_ele_list, qname_str,
+ processed = (int)axutil_hash_get( compiler_impl-> processed_ele_list, qname_str,
AXIS2_HASH_KEY_STRING );
if ( is_outer && processed != 0 )
{
@@ -790,7 +790,7 @@
}
}
base_hash = XML_SCHEMA_ELEMENT_SUPER_OBJS( ele, env);
- particle = axis2_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
+ particle = axutil_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
is_array = w2c_schema_compiler_is_array( compiler_impl, env, particle);
schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE( ele, env);
@@ -809,7 +809,7 @@
{
class_name = w2c_schema_compiler_find_class_name( compiler_impl, env, type_qname, is_array);
qname_str = w2c_string_make_key_from_qname( qname, env);
- axis2_hash_set( inner_ele_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
+ axutil_hash_set( inner_ele_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
/** not adding meta info to schema_type */
}
else
@@ -821,25 +821,25 @@
local_part = axis2_qname_get_localpart( generated_type_qname, env);
XML_SCHEMA_TYPE_SET_NAME( schema_type, env, local_part);
qname_str = w2c_string_make_key_from_qname( qname, env);
- meta_inf = axis2_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
+ meta_inf = axutil_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
qname_str, AXIS2_HASH_KEY_STRING);
/** remove this from anonymous list */
- axis2_hash_set( compiler_impl-> processed_anonymous_complex_typemap,
+ axutil_hash_set( compiler_impl-> processed_anonymous_complex_typemap,
qname_str, AXIS2_HASH_KEY_STRING, 0 );
/** this is just store anon generated types */
- axis2_hash_set( compiler_impl-> all_processed_anon_type,
+ axutil_hash_set( compiler_impl-> all_processed_anon_type,
local_part, AXIS2_HASH_KEY_STRING, local_part );
base_hash = XML_SCHEMA_TYPE_SUPER_OBJS( schema_type, env);
- complex_type = axis2_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
+ complex_type = axutil_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
w2c_schema_compiler_write_complex_type( compiler_impl, env, complex_type, meta_inf);
type_qname = XML_SCHEMA_TYPE_GET_QNAME( schema_type, env);
qname_str = w2c_string_make_key_from_qname( type_qname, env);
class_name = w2c_schema_compiler_find_class_name( compiler_impl, env, type_qname, is_array);
- axis2_hash_set( inner_ele_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
+ axutil_hash_set( inner_ele_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
/** not adding meta info to schema_type */
}
}
@@ -847,7 +847,7 @@
else
{
qname_str = w2c_string_make_key_from_qname( qname, env);
- axis2_hash_set( compiler_impl-> processed_ele_list, qname_str, AXIS2_HASH_KEY_STRING, (void*)1);
+ axutil_hash_set( compiler_impl-> processed_ele_list, qname_str, AXIS2_HASH_KEY_STRING, (void*)1);
}
}
else if ( ref_qname != NULL )
@@ -867,7 +867,7 @@
{
class_name = w2c_schema_compiler_find_class_name( compiler_impl, env, type_qname, is_array);
qname_str = w2c_string_make_key_from_qname( ref_ele_qname, env);
- axis2_hash_set( compiler_impl-> processed_ele_ref_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
+ axutil_hash_set( compiler_impl-> processed_ele_ref_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
/** ignore adding meta info */
}
else
@@ -879,26 +879,26 @@
{
local_part = axis2_qname_get_localpart( generated_type_qname, env);
XML_SCHEMA_TYPE_SET_NAME( ref_schema_type, env, local_part);
- meta_inf = axis2_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
+ meta_inf = axutil_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
qname_str, AXIS2_HASH_KEY_STRING);
/** remove this from anonymous list */
qname_str = w2c_string_make_key_from_qname( ref_ele_qname, env);
- axis2_hash_set( compiler_impl-> processed_anonymous_complex_typemap,
+ axutil_hash_set( compiler_impl-> processed_anonymous_complex_typemap,
qname_str, AXIS2_HASH_KEY_STRING, 0 );
/** this is just store anon generated types */
- axis2_hash_set( compiler_impl-> all_processed_anon_type,
+ axutil_hash_set( compiler_impl-> all_processed_anon_type,
local_part, AXIS2_HASH_KEY_STRING, local_part );
base_hash = XML_SCHEMA_TYPE_SUPER_OBJS( ref_schema_type, env);
- complex_type = axis2_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
+ complex_type = axutil_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
w2c_schema_compiler_write_complex_type( compiler_impl, env, complex_type, meta_inf);
type_qname = XML_SCHEMA_TYPE_GET_QNAME( ref_schema_type, env);
qname_str = w2c_string_make_key_from_qname( type_qname, env);
class_name = w2c_schema_compiler_find_class_name( compiler_impl, env, type_qname, is_array);
- axis2_hash_set( compiler_impl-> processed_ele_ref_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
+ axutil_hash_set( compiler_impl-> processed_ele_ref_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
/** not adding meta info to ref_schema_type */
}
}
@@ -916,11 +916,11 @@
{
class_name = w2c_schema_compiler_find_class_name( compiler_impl,
env, schema_type_qname, is_array);
- axis2_hash_set( inner_ele_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
+ axutil_hash_set( inner_ele_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
}
else
{
- axis2_hash_set( compiler_impl->processed_ele_list, qname_str,
+ axutil_hash_set( compiler_impl->processed_ele_list, qname_str,
AXIS2_HASH_KEY_STRING, (void*)1);
}
}
@@ -932,11 +932,11 @@
{
class_name = w2c_schema_compiler_find_class_name( compiler_impl,
env, schema_type_qname, is_array);
- axis2_hash_set( inner_ele_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
+ axutil_hash_set( inner_ele_map, qname_str, AXIS2_HASH_KEY_STRING, class_name);
}
else
{
- axis2_hash_set( compiler_impl->processed_ele_list, qname_str,
+ axutil_hash_set( compiler_impl->processed_ele_list, qname_str,
AXIS2_HASH_KEY_STRING, (void*)1);
}
}
@@ -947,12 +947,12 @@
{
if( is_outer)
{
- axis2_hash_set( compiler_impl-> nillable_ele_list,
+ axutil_hash_set( compiler_impl-> nillable_ele_list,
qname_str, AXIS2_HASH_KEY_STRING, (void*)1);
}
else
{
- axis2_hash_set( local_nillable_list,
+ axutil_hash_set( local_nillable_list,
qname_str, AXIS2_HASH_KEY_STRING, (void*)1);
}
}
@@ -970,7 +970,7 @@
xml_schema_t *schema = NULL;
axis2_char_t *ns = NULL;
axis2_char_t *mapper_package_name = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
axis2_qname_t *qname = NULL;
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
@@ -990,7 +990,7 @@
{
schema = (xml_schema_t*) axutil_array_list_get( schema_list, env, i);
ns = XML_SCHEMA_GET_TARGET_NAMESPACE( schema, env);
- axis2_hash_set( compiler_impl-> available_schema_map, ns,
+ axutil_hash_set( compiler_impl-> available_schema_map, ns,
AXIS2_HASH_KEY_STRING, schema);
if( 0 == i )
{
@@ -1014,30 +1014,30 @@
w2c_schema_compiler_finalize_compilation( compiler_impl, env);
/** this is just to allow indenting types files also */
- for (hi = axis2_hash_first( compiler_impl-> simple_type_map, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first( compiler_impl-> simple_type_map, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
qname = axis2_qname_create_from_string( env, key);
W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
env, qname, value);
axis2_qname_free( qname, env);
}
- for (hi = axis2_hash_first( compiler_impl-> all_processed_anon_type, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first( compiler_impl-> all_processed_anon_type, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
qname = axis2_qname_create_from_string( env, key);
W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
env, qname, value);
axis2_qname_free( qname, env);
}
- for (hi = axis2_hash_first( compiler_impl-> processed_type_map, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first( compiler_impl-> processed_type_map, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
qname = axis2_qname_create_from_string( env, key);
W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
env, qname, value);
@@ -1045,10 +1045,10 @@
}
/** the processed element set which is useful */
- for (hi = axis2_hash_first( compiler_impl-> processed_element_map, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first( compiler_impl-> processed_element_map, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
qname = axis2_qname_create_from_string( env, key);
W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
env, qname, value);
@@ -1068,13 +1068,13 @@
xml_schema_t *schema = NULL;
target_ns = axis2_qname_get_uri( schema_type_qname, env);
- loaded_schema = (xml_schema_t*)axis2_hash_get( compiler_impl-> loaded_schema_map,
+ loaded_schema = (xml_schema_t*)axutil_hash_get( compiler_impl-> loaded_schema_map,
target_ns, AXIS2_HASH_KEY_STRING );
if ( loaded_schema != NULL )
{
return loaded_schema;
}
- schema = (xml_schema_t*)axis2_hash_get( compiler_impl-> available_schema_map,
+ schema = (xml_schema_t*)axutil_hash_get( compiler_impl-> available_schema_map,
target_ns, AXIS2_HASH_KEY_STRING );
if ( schema != NULL )
{
@@ -1122,13 +1122,13 @@
axis2_qname_t *qname )
{
axis2_char_t *qname_str = w2c_string_make_key_from_qname( qname, env );
- axis2_hash_t *base_schema_type_map = NULL;
+ axutil_hash_t *base_schema_type_map = NULL;
base_schema_type_map =
W2C_TYPEMAPPER_GET_ALL( compiler_impl-> base_schema_type_mapper, env);
- return axis2_hash_get( compiler_impl-> processed_type_map, qname_str, AXIS2_HASH_KEY_STRING ) ||
- axis2_hash_get( compiler_impl-> simple_type_map, qname_str, AXIS2_HASH_KEY_STRING ) ||
- axis2_hash_get( base_schema_type_map, qname_str, AXIS2_HASH_KEY_STRING );
+ return axutil_hash_get( compiler_impl-> processed_type_map, qname_str, AXIS2_HASH_KEY_STRING ) ||
+ axutil_hash_get( compiler_impl-> simple_type_map, qname_str, AXIS2_HASH_KEY_STRING ) ||
+ axutil_hash_get( base_schema_type_map, qname_str, AXIS2_HASH_KEY_STRING );
}
axis2_char_t*
@@ -1142,7 +1142,7 @@
qname_str = w2c_string_make_key_from_qname( qname, env);
class_name = (axis2_char_t*)
- axis2_hash_get( compiler_impl-> processed_ele_ref_map, qname_str, AXIS2_HASH_KEY_STRING);
+ axutil_hash_get( compiler_impl-> processed_ele_ref_map, qname_str, AXIS2_HASH_KEY_STRING);
if ( is_array)
{
/* TODO: do something in language independent manner */
@@ -1160,12 +1160,12 @@
{
xml_schema_complex_type_t *complex_type = NULL;
xml_schema_simple_type_t *simple_type = NULL;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
if( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( schema_type, env) )
{
base_hash = XML_SCHEMA_TYPE_SUPER_OBJS( schema_type, env);
- complex_type = axis2_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
+ complex_type = axutil_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
if ( XML_SCHEMA_TYPE_GET_NAME( schema_type, env ) != NULL )
{
w2c_schema_compiler_process_named_complex_schema_type(
@@ -1180,7 +1180,7 @@
else if ( XML_SCHEMA_SIMPLE_TYPE == XML_SCHEMA_TYPE_GET_TYPE( schema_type, env) )
{
base_hash = XML_SCHEMA_TYPE_SUPER_OBJS( schema_type, env);
- simple_type = axis2_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE", AXIS2_HASH_KEY_STRING);
+ simple_type = axutil_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE", AXIS2_HASH_KEY_STRING);
w2c_schema_compiler_process_simple_schema_type( compiler_impl, env, simple_type, ele, parent_schema );
}
return AXIS2_SUCCESS;
@@ -1202,7 +1202,7 @@
qname = XML_SCHEMA_ELEMENT_GET_QNAME( ele, env);
qname_str = w2c_string_make_key_from_qname( qname, env);
- axis2_hash_set( compiler_impl-> processed_anonymous_complex_typemap, qname_str,
+ axutil_hash_set( compiler_impl-> processed_anonymous_complex_typemap, qname_str,
AXIS2_HASH_KEY_STRING, meta_info);
return AXIS2_SUCCESS;
}
@@ -1215,23 +1215,23 @@
xml_schema_t *parent_schema )
{
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
xml_schema_type_t *schema_type = NULL;
axis2_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
axis2_char_t *fully_qualified_class_name = NULL;
w2c_schema_writer_meta_info_t *meta_info = NULL;
- axis2_hash_t *base_schema_type_map = NULL;
+ axutil_hash_t *base_schema_type_map = NULL;
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( complex_type, env);
- schema_type = axis2_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
+ schema_type = axutil_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
qname = XML_SCHEMA_TYPE_GET_QNAME( schema_type, env);
qname_str = w2c_string_make_key_from_qname( qname, env);
base_schema_type_map =
W2C_TYPEMAPPER_GET_ALL( compiler_impl-> base_schema_type_mapper, env);
- if( axis2_hash_get( compiler_impl-> processed_type_map, qname_str, AXIS2_HASH_KEY_STRING) ||
- axis2_hash_get( base_schema_type_map, qname_str, AXIS2_HASH_KEY_STRING) )
+ if( axutil_hash_get( compiler_impl-> processed_type_map, qname_str, AXIS2_HASH_KEY_STRING) ||
+ axutil_hash_get( base_schema_type_map, qname_str, AXIS2_HASH_KEY_STRING) )
{
return AXIS2_SUCCESS;
}
@@ -1239,7 +1239,7 @@
/* Must do this up front to support recursive types */
fully_qualified_class_name = W2C_SCHEMA_WRITER_MAKE_FULLY_QUALIFIED_CLASS_NAME(
compiler_impl-> writer, env, qname);
- axis2_hash_set( compiler_impl-> processed_type_map, qname_str,
+ axutil_hash_set( compiler_impl-> processed_type_map, qname_str,
AXIS2_HASH_KEY_STRING, fully_qualified_class_name );
/* ignoring adding meta info */
@@ -1264,19 +1264,19 @@
xml_schema_complex_type_t *complex_type,
w2c_schema_writer_meta_info_t *meta_info )
{
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
xml_schema_type_t *schema_type = NULL;
axis2_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( complex_type, env);
- schema_type = axis2_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
+ schema_type = axutil_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
qname = XML_SCHEMA_TYPE_GET_QNAME( schema_type, env);
qname_str = w2c_string_make_key_from_qname( qname, env);
W2C_SCHEMA_WRITER_WRITE_COMPLEX_TYPE( compiler_impl-> writer, env, complex_type,
compiler_impl-> processed_type_map, meta_info);
- axis2_hash_set( compiler_impl-> processed_type_meta_info_map, qname_str,
+ axutil_hash_set( compiler_impl-> processed_type_meta_info_map, qname_str,
AXIS2_HASH_KEY_STRING, meta_info);
return AXIS2_SUCCESS;
}
@@ -1375,7 +1375,7 @@
xml_schema_complex_content_restriction_t *restriction = NULL;
axis2_qname_t *base_type_qname = NULL;
xml_schema_type_t *type = NULL;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
xml_schema_complex_type_t *complex_type = NULL;
xml_schema_simple_type_t *simple_type = NULL;
axis2_char_t *name = NULL;
@@ -1398,7 +1398,7 @@
if ( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( type, env ) )
{
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( type, env);
- complex_type = axis2_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
+ complex_type = axutil_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
name = XML_SCHEMA_TYPE_GET_NAME( type, env);
if ( NULL != name )
{
@@ -1416,7 +1416,7 @@
{
/* process simple type */
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( type, env);
- simple_type = axis2_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE", AXIS2_HASH_KEY_STRING);
+ simple_type = axutil_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE", AXIS2_HASH_KEY_STRING);
w2c_schema_compiler_process_simple_schema_type( compiler_impl,
env, simple_type, NULL, parent_schema);
}
@@ -1450,7 +1450,7 @@
if ( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( type, env ) )
{
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( type, env);
- complex_type = axis2_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
+ complex_type = axutil_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
name = XML_SCHEMA_TYPE_GET_NAME( type, env);
if ( NULL != name )
{
@@ -1498,7 +1498,7 @@
{
xml_schema_type_t *type = NULL;
axis2_char_t *qname_str = NULL;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
xml_schema_complex_type_t *complex_type = NULL;
void *content_model = NULL;
xml_schema_complex_content_t *complex_content = NULL;
@@ -1510,7 +1510,7 @@
qname_str = w2c_string_make_key_from_qname( base_type_qname, env);
type = XML_SCHEMA_GET_TYPE_BY_QNAME( parent_schema, env, base_type_qname);
- meta_info = axis2_hash_get( compiler_impl-> processed_type_meta_info_map, qname_str,
+ meta_info = axutil_hash_get( compiler_impl-> processed_type_meta_info_map, qname_str,
AXIS2_HASH_KEY_STRING);
if ( meta_info != NULL )
@@ -1518,7 +1518,7 @@
if ( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( type, env ) )
{
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( type, env);
- complex_type = axis2_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
+ complex_type = axutil_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
content_model = XML_SCHEMA_COMPLEX_TYPE_GET_CONTENT_MODEL( complex_type, env);
if ( content_model != NULL)
{
@@ -1580,7 +1580,7 @@
xml_schema_simple_content_restriction_t *restriction = NULL;
axis2_qname_t *base_type_qname = NULL;
xml_schema_type_t *type = NULL;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
xml_schema_complex_type_t *complex_type = NULL;
xml_schema_simple_type_t *simple_type = NULL;
axis2_char_t *name = NULL;
@@ -1611,7 +1611,7 @@
if ( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( type, env ) )
{
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( type, env);
- complex_type = axis2_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
+ complex_type = axutil_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
name = XML_SCHEMA_TYPE_GET_NAME( type, env);
if ( NULL != name )
{
@@ -1629,7 +1629,7 @@
{
/* process simple type */
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( type, env);
- simple_type = axis2_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE", AXIS2_HASH_KEY_STRING);
+ simple_type = axutil_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE", AXIS2_HASH_KEY_STRING);
w2c_schema_compiler_process_simple_schema_type( compiler_impl,
env, simple_type, NULL, parent_schema);
}
@@ -1671,7 +1671,7 @@
if ( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( type, env ) )
{
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( type, env);
- complex_type = axis2_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
+ complex_type = axutil_hash_get( base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
name = XML_SCHEMA_TYPE_GET_NAME( type, env);
if ( NULL != name )
{
@@ -1689,7 +1689,7 @@
{
/* process simple type */
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( type, env);
- simple_type = axis2_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE", AXIS2_HASH_KEY_STRING);
+ simple_type = axutil_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE", AXIS2_HASH_KEY_STRING);
w2c_schema_compiler_process_simple_schema_type( compiler_impl,
env, simple_type, NULL, parent_schema);
}
@@ -1720,7 +1720,7 @@
class_name = w2c_schema_compiler_find_class_name( compiler_impl, env,
ext_base_type, AXIS2_FALSE);
- changed_qname = axis2_hash_get( compiler_impl-> changed_type_map, qname_str,
+ changed_qname = axutil_hash_get( compiler_impl-> changed_type_map, qname_str,
AXIS2_HASH_KEY_STRING);
if ( changed_qname == NULL )
@@ -1749,7 +1749,7 @@
class_name = w2c_schema_compiler_find_class_name( compiler_impl, env,
res_base_type, AXIS2_FALSE);
- changed_qname = axis2_hash_get( compiler_impl-> changed_type_map, qname_str,
+ changed_qname = axutil_hash_get( compiler_impl-> changed_type_map, qname_str,
AXIS2_HASH_KEY_STRING);
if ( changed_qname == NULL )
@@ -1779,7 +1779,7 @@
xml_schema_facet_t *facet = NULL;
axis2_char_t *facet_value = NULL;
long facet_lvalue = 0;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
count = XML_SCHEMA_OBJ_COLLECTION_GET_COUNT( facets, env);
for ( i = 0; i < count; i ++)
@@ -1788,14 +1788,14 @@
if( XML_SCHEMA_PATTERN_FACET == XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- facet = (xml_schema_facet_t*)axis2_hash_get( base_hash, "XML_SCHEMA_FACETS", AXIS2_HASH_KEY_STRING);
+ facet = (xml_schema_facet_t*)axutil_hash_get( base_hash, "XML_SCHEMA_FACETS", AXIS2_HASH_KEY_STRING);
facet_value = XML_SCHEMA_FACET_GET_VALUE( facet, env);
W2C_SCHEMA_WRITER_META_INFO_SET_PATTERN_FACET( meta_info, env, facet_value);
}
else if( XML_SCHEMA_ENUMARATION_FACET == XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- facet = (xml_schema_facet_t*)axis2_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
+ facet = (xml_schema_facet_t*)axutil_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
facet_value = XML_SCHEMA_FACET_GET_VALUE( facet, env);
if ( !enum_start )
{
@@ -1810,7 +1810,7 @@
else if( XML_SCHEMA_LENGTH_FACET == XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- facet = (xml_schema_facet_t*)axis2_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
+ facet = (xml_schema_facet_t*)axutil_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
facet_value = XML_SCHEMA_FACET_GET_VALUE( facet, env);
facet_lvalue = atol( facet_value);
W2C_SCHEMA_WRITER_META_INFO_SET_LENGTH_FACET( meta_info, env, facet_lvalue);
@@ -1818,7 +1818,7 @@
else if( XML_SCHEMA_MAX_EXCLUSIVE_FACET== XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- facet = (xml_schema_facet_t*)axis2_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
+ facet = (xml_schema_facet_t*)axutil_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
facet_value = XML_SCHEMA_FACET_GET_VALUE( facet, env);
facet_lvalue = atol( facet_value);
W2C_SCHEMA_WRITER_META_INFO_SET_MAXEXCLUSIVE_FACET( meta_info, env, facet_lvalue);
@@ -1826,7 +1826,7 @@
else if( XML_SCHEMA_MIN_EXCLUSIVE_FACET== XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- facet = (xml_schema_facet_t*)axis2_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
+ facet = (xml_schema_facet_t*)axutil_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
facet_value = XML_SCHEMA_FACET_GET_VALUE( facet, env);
facet_lvalue = atol( facet_value);
W2C_SCHEMA_WRITER_META_INFO_SET_MINEXCLUSIVE_FACET( meta_info, env, facet_lvalue);
@@ -1834,7 +1834,7 @@
else if( XML_SCHEMA_MAX_INCLUSIVE_FACET== XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- facet = (xml_schema_facet_t*)axis2_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
+ facet = (xml_schema_facet_t*)axutil_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
facet_value = XML_SCHEMA_FACET_GET_VALUE( facet, env);
facet_lvalue = atol( facet_value);
W2C_SCHEMA_WRITER_META_INFO_SET_MAXINCLUSIVE_FACET( meta_info, env, facet_lvalue);
@@ -1842,7 +1842,7 @@
else if( XML_SCHEMA_MIN_INCLUSIVE_FACET== XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- facet = (xml_schema_facet_t*)axis2_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
+ facet = (xml_schema_facet_t*)axutil_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
facet_value = XML_SCHEMA_FACET_GET_VALUE( facet, env);
facet_lvalue = atol( facet_value);
W2C_SCHEMA_WRITER_META_INFO_SET_MININCLUSIVE_FACET( meta_info, env, facet_lvalue);
@@ -1850,7 +1850,7 @@
else if( XML_SCHEMA_MAX_LENGTH_FACET== XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- facet = (xml_schema_facet_t*)axis2_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
+ facet = (xml_schema_facet_t*)axutil_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
facet_value = XML_SCHEMA_FACET_GET_VALUE( facet, env);
facet_lvalue = atol( facet_value);
W2C_SCHEMA_WRITER_META_INFO_SET_MAXLENGTH_FACET( meta_info, env, facet_lvalue);
@@ -1858,7 +1858,7 @@
else if( XML_SCHEMA_MIN_LENGTH_FACET== XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- facet = (xml_schema_facet_t*)axis2_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
+ facet = (xml_schema_facet_t*)axutil_hash_get( base_hash, "XML_SCHEMA_FACET", AXIS2_HASH_KEY_STRING);
facet_value = XML_SCHEMA_FACET_GET_VALUE( facet, env);
facet_lvalue = atol( facet_value);
W2C_SCHEMA_WRITER_META_INFO_SET_MINLENGTH_FACET( meta_info, env, facet_lvalue);
@@ -1901,13 +1901,13 @@
axis2_char_t *mapped_name = NULL; /* class_name*/
axis2_char_t *qname_str = NULL;
axis2_qname_t *attr_qname = NULL;
- axis2_hash_t *base_schema_type_map = NULL;
+ axutil_hash_t *base_schema_type_map = NULL;
base_schema_type_map =
W2C_TYPEMAPPER_GET_ALL( compiler_impl-> base_schema_type_mapper, env);
schema_type_name = XML_SCHEMA_ATTRIBUTE_GET_SCHEMA_TYPE_NAME( attri, env);
qname_str = w2c_string_make_key_from_qname( schema_type_name, env);
- mapped_name = axis2_hash_get( base_schema_type_map, qname_str,
+ mapped_name = axutil_hash_get( base_schema_type_map, qname_str,
AXIS2_HASH_KEY_STRING);
/* for now we assume (!!!) that attributes refer to standard types only */
if ( mapped_name != NULL )
@@ -1971,10 +1971,10 @@
axis2_bool_t order,
xml_schema_t *parent_schema )
{
- axis2_hash_t *processed_element_array_status_map = NULL;
- axis2_hash_t *processed_element_type_map = NULL;
- axis2_hash_t *element_order_map = NULL;
- axis2_hash_t *local_nillable_list = NULL;
+ axutil_hash_t *processed_element_array_status_map = NULL;
+ axutil_hash_t *processed_element_type_map = NULL;
+ axutil_hash_t *element_order_map = NULL;
+ axutil_hash_t *local_nillable_list = NULL;
int i = 0;
int count = 0;
@@ -1985,7 +1985,7 @@
xml_schema_any_t *any = NULL;
void *key = NULL;
int value = 0;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
int starting_item_number_order = 0;
axis2_char_t *class_name = NULL;
@@ -1999,7 +1999,7 @@
axis2_qname_t *any_element_field_qname = NULL;
xml_schema_obj_t *schema_obj = NULL;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
axis2_char_t *default_array = NULL;
axis2_char_t *default_class = NULL;
@@ -2007,10 +2007,10 @@
long max_occurs = 0;
long min_occurs = 0;
- processed_element_array_status_map = axis2_hash_make( env);
- element_order_map = axis2_hash_make( env);
- processed_element_type_map = axis2_hash_make( env);
- local_nillable_list = axis2_hash_make( env);
+ processed_element_array_status_map = axutil_hash_make( env);
+ element_order_map = axutil_hash_make( env);
+ processed_element_type_map = axutil_hash_make( env);
+ local_nillable_list = axutil_hash_make( env);
default_array =
W2C_SCHEMA_PROPERTY_LOADER_GET_DEFAULT_ARRAY( compiler_impl-> loader, env);
default_class =
@@ -2023,44 +2023,44 @@
if( XML_SCHEMA_ELEMENT == XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- ele = (xml_schema_element_t*)axis2_hash_get( base_hash, "XML_SCHEMA_ELEMENT", AXIS2_HASH_KEY_STRING);
- particle = axis2_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
+ ele = (xml_schema_element_t*)axutil_hash_get( base_hash, "XML_SCHEMA_ELEMENT", AXIS2_HASH_KEY_STRING);
+ particle = axutil_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
is_array = w2c_schema_compiler_is_array( compiler_impl, env, particle);
w2c_schema_compiler_process_element( compiler_impl, env, ele,
AXIS2_FALSE, processed_element_type_map,local_nillable_list, parent_schema);
/** CHECK: putting a pointer to hash key*/
- axis2_hash_set( processed_element_array_status_map, ele, sizeof(void*), (void*)(is_array?1:-1));
+ axutil_hash_set( processed_element_array_status_map, ele, sizeof(void*), (void*)(is_array?1:-1));
if ( order)
{
- axis2_hash_set( element_order_map, ele, sizeof(void*), (void*)i );
+ axutil_hash_set( element_order_map, ele, sizeof(void*), (void*)i );
}
}
else if( XML_SCHEMA_ANY == XML_SCHEMA_OBJ_GET_TYPE( schema_obj, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
- any = (xml_schema_any_t*)axis2_hash_get( base_hash, "XML_SCHEMA_ANY", AXIS2_HASH_KEY_STRING);
+ any = (xml_schema_any_t*)axutil_hash_get( base_hash, "XML_SCHEMA_ANY", AXIS2_HASH_KEY_STRING);
qname = axis2_qname_create( env, W2C_SCHEMA_CONSTS_ANY_ELEMENT_FIELD_NAME,
NULL, NULL );
qname_str = w2c_string_make_key_from_qname( qname, env);
/** CHECK: putting a pointer to hash key*/
- axis2_hash_set( processed_element_type_map, qname_str,
+ axutil_hash_set( processed_element_type_map, qname_str,
AXIS2_HASH_KEY_STRING, any);
- axis2_hash_set( processed_element_array_status_map, any, sizeof(void*), (void*)(is_array?1:-1));
+ axutil_hash_set( processed_element_array_status_map, any, sizeof(void*), (void*)(is_array?1:-1));
/* any can also be inside a sequence */
if ( order)
{
- axis2_hash_set( element_order_map, any, sizeof(void*), (void*)i );
+ axutil_hash_set( element_order_map, any, sizeof(void*), (void*)i );
}
}
}
/* loop through the processed items and add them to the matainf object */
starting_item_number_order = W2C_SCHEMA_WRITER_META_INFO_GET_ORDER_START_POINT( meta_info, env);
- for (hi = axis2_hash_first( processed_element_array_status_map, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first( processed_element_array_status_map, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if( XML_SCHEMA_ELEMENT == XML_SCHEMA_OBJ_GET_TYPE( key, env) )
{
ele = (xml_schema_element_t*) key;
@@ -2068,7 +2068,7 @@
if ( qname != NULL )
{
qname_str = w2c_string_make_key_from_qname( qname, env);
- class_name = (axis2_char_t*)axis2_hash_get( processed_element_type_map,
+ class_name = (axis2_char_t*)axutil_hash_get( processed_element_type_map,
qname_str, AXIS2_HASH_KEY_STRING);
/* always get the schema type name from the schema it-self */
schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE( ele, env);
@@ -2106,7 +2106,7 @@
}
/* register the occurence counts */
base_hash = XML_SCHEMA_ELEMENT_SUPER_OBJS( ele, env);
- particle = axis2_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
+ particle = axutil_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
max_occurs = XML_SCHEMA_PARTICLE_GET_MAX_OCCURS( particle, env);
min_occurs = XML_SCHEMA_PARTICLE_GET_MIN_OCCURS( particle, env);
@@ -2117,7 +2117,7 @@
/* we need the order to be preserved. So record the order also */
if ( order)
{
- index = (int)axis2_hash_get( element_order_map, ele, sizeof(void*));
+ index = (int)axutil_hash_get( element_order_map, ele, sizeof(void*));
W2C_SCHEMA_WRITER_META_INFO_REGISTER_QNAME_INDEX( meta_info, env, referenced_qname,
index+ starting_item_number_order);
}
@@ -2125,7 +2125,7 @@
{
qname_str = w2c_string_make_key_from_qname( qname, env);
/* get the nillable state and register that on the metainf holder */
- if ( axis2_hash_get( local_nillable_list, qname_str, AXIS2_HASH_KEY_STRING) != NULL)
+ if ( axutil_hash_get( local_nillable_list, qname_str, AXIS2_HASH_KEY_STRING) != NULL)
{
W2C_SCHEMA_WRITER_META_INFO_REGISTER_NILLABLE_QNAME( meta_info, env, qname);
}
@@ -2141,7 +2141,7 @@
if( XML_SCHEMA_ANY == XML_SCHEMA_OBJ_GET_TYPE( key, env) )
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( key, env);
- any = (xml_schema_any_t*)axis2_hash_get( base_hash, "XML_SCHEMA_ANY", AXIS2_HASH_KEY_STRING);
+ any = (xml_schema_any_t*)axutil_hash_get( base_hash, "XML_SCHEMA_ANY", AXIS2_HASH_KEY_STRING);
any_element_field_qname = axis2_qname_create( env, W2C_SCHEMA_CONSTS_ANY_ELEMENT_FIELD_NAME,
NULL, NULL );
W2C_SCHEMA_WRITER_META_INFO_REGISTER_MAPPING(meta_info, env,
@@ -2150,7 +2150,7 @@
/* register the occurence counts */
base_hash = XML_SCHEMA_ANY_SUPER_OBJS( any, env);
- particle = axis2_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
+ particle = axutil_hash_get( base_hash, "XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING);
max_occurs = XML_SCHEMA_PARTICLE_GET_MAX_OCCURS( particle, env);
min_occurs = XML_SCHEMA_PARTICLE_GET_MIN_OCCURS( particle, env);
@@ -2161,7 +2161,7 @@
/* we need the order to be preserved. So record the order also */
if ( order)
{
- index = (int)axis2_hash_get( element_order_map, ele, sizeof(void*));
+ index = (int)axutil_hash_get( element_order_map, ele, sizeof(void*));
W2C_SCHEMA_WRITER_META_INFO_REGISTER_QNAME_INDEX( meta_info, env, referenced_qname,
index+ starting_item_number_order);
}
@@ -2221,9 +2221,9 @@
axis2_char_t *class_name = NULL;
axis2_qname_t *type_qname = NULL;
xml_schema_simple_type_t *rest_base_type = NULL;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
xml_schema_type_t *type = NULL;
- axis2_hash_t *base_schema_type_map = NULL;
+ axutil_hash_t *base_schema_type_map = NULL;
xml_schema_simple_type_t *base_type = NULL;
axis2_char_t* nsuri = NULL;
static int counter = 0;
@@ -2240,7 +2240,7 @@
XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_TYPE( content , env ) )
{
/*base_hash = XML_SCHEMA_SIMPLE_TYPE_CONTENT_SUPER_OBJS( content, env);
- restriction = axis2_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE_RESTRICTION", AXIS2_HASH_KEY_STRING);*/
+ restriction = axutil_hash_get( base_hash, "XML_SCHEMA_SIMPLE_TYPE_RESTRICTION", AXIS2_HASH_KEY_STRING);*/
/** TODO: check xml schema about this: so simple content extensions are not fully supported */
@@ -2256,7 +2256,7 @@
qname_str = w2c_string_add_string( qname_str, "|", env);
qname_str = w2c_string_add_string( qname_str, nsuri, env);
}
- class_name = axis2_hash_get( base_schema_type_map, qname_str, AXIS2_HASH_KEY_STRING);
+ class_name = axutil_hash_get( base_schema_type_map, qname_str, AXIS2_HASH_KEY_STRING);
}
else /* TRY with this */
{
@@ -2264,7 +2264,7 @@
if( base_type != NULL)
{
base_hash = XML_SCHEMA_SIMPLE_TYPE_SUPER_OBJS( base_type, env);
- type = axis2_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
+ type = axutil_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
base_type_qname = XML_SCHEMA_TYPE_GET_QNAME ( type, env);
}
@@ -2273,7 +2273,7 @@
if ( class_name != NULL )
{
base_hash = XML_SCHEMA_SIMPLE_TYPE_SUPER_OBJS( simple_type, env);
- type = axis2_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
+ type = axutil_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
type_qname = XML_SCHEMA_TYPE_GET_QNAME ( type, env);
if ( type_qname != NULL)
@@ -2289,10 +2289,10 @@
sprintf(qname_str, "type%d", counter++);
XML_SCHEMA_TYPE_SET_NAME( type, env, qname_str);
}
- axis2_hash_set( compiler_impl-> simple_type_map, qname_str,
+ axutil_hash_set( compiler_impl-> simple_type_map, qname_str,
AXIS2_HASH_KEY_STRING, class_name);
/* set the old schema type QName and the new schema type QName */
- axis2_hash_set( compiler_impl-> changed_type_map, qname_str,
+ axutil_hash_set( compiler_impl-> changed_type_map, qname_str,
AXIS2_HASH_KEY_STRING, base_type_qname);
/* add the class name to the meta info map */
/** TODO:meta_info ignored */
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c Fri Mar 30 11:28:18 2007
@@ -31,7 +31,7 @@
axis2_bool_t helper_mode;
axis2_bool_t write_out;
axis2_bool_t wrap_classes;
- axis2_hash_t *ns2package_map;
+ axutil_hash_t *ns2package_map;
axis2_char_t *language;
W2C_ENGINE_CONFIGURATION_NAMEMAKER maker_func;
@@ -101,14 +101,14 @@
const axutil_env_t *env,
axis2_bool_t wrap_classes);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_schema_compiler_options_get_ns2package_map( w2c_schema_compiler_options_t *compiler_options,
const axutil_env_t *env);
axis2_status_t AXIS2_CALL
w2c_schema_compiler_options_set_ns2package_map( w2c_schema_compiler_options_t *compiler_options,
const axutil_env_t *env,
- axis2_hash_t *ns2package_map);
+ axutil_hash_t *ns2package_map);
axis2_char_t* AXIS2_CALL
w2c_schema_compiler_options_get_language( w2c_schema_compiler_options_t *compiler_options,
@@ -249,7 +249,7 @@
}
if (schema_compiler_options_impl-> ns2package_map)
{
- axis2_hash_free(schema_compiler_options_impl-> ns2package_map, env);
+ axutil_hash_free(schema_compiler_options_impl-> ns2package_map, env);
}
if (schema_compiler_options_impl-> language)
{
@@ -457,7 +457,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_schema_compiler_options_get_ns2package_map( w2c_schema_compiler_options_t *compiler_options,
const axutil_env_t *env)
{
@@ -474,7 +474,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_compiler_options_set_ns2package_map( w2c_schema_compiler_options_t *compiler_options,
const axutil_env_t *env,
- axis2_hash_t *ns2package_map)
+ axutil_hash_t *ns2package_map)
{
w2c_schema_compiler_options_impl_t *compiler_options_impl = NULL;
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c Fri Mar 30 11:28:18 2007
@@ -20,7 +20,7 @@
#include <axutil_array_list.h>
#include <axis2_string.h>
#include <w2c_string.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <stdlib.h>
#include <w2c_messages.h>
#include <w2c_class_loader.h>
@@ -425,8 +425,8 @@
w2c_schema_property_loader_impl_t *obj_impl,
const axutil_env_t *env)
{
- axis2_hash_t *prop_hash = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_t *prop_hash = NULL;
+ axutil_hash_index_t *hi = NULL;
axis2_char_t *key= NULL;
axis2_char_t *val= NULL;
int index = 0;
@@ -443,10 +443,10 @@
*/
if ( language)
{
- for (hi = axis2_hash_first(prop_hash, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(prop_hash, env); hi;
+ hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&val);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&val);
if ( w2c_string_indexof_cs ( key, language) == 0 &&
(index = w2c_string_indexof ( key, '.')) == axis2_strlen(language))
{
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c Fri Mar 30 11:28:18 2007
@@ -41,12 +41,12 @@
axis2_qname_t *extension_basetype;
axis2_qname_t *restriction_basetype;
axis2_qname_t *ownqname;
- axis2_hash_t *element2schema_qnamemap;
- axis2_hash_t *element2classmap;
- axis2_hash_t *specialtype_flagmap;
- axis2_hash_t *qname_maxoccurs_countmap;
- axis2_hash_t *qname_minoccurs_countmap;
- axis2_hash_t *qname_orderlist;
+ axutil_hash_t *element2schema_qnamemap;
+ axutil_hash_t *element2classmap;
+ axutil_hash_t *specialtype_flagmap;
+ axutil_hash_t *qname_maxoccurs_countmap;
+ axutil_hash_t *qname_minoccurs_countmap;
+ axutil_hash_t *qname_orderlist;
long length_facet;
long maxexclusive_facet;
@@ -56,7 +56,7 @@
long maxlength_facet;
long minlength_facet;
- axis2_hash_t *nillable_qnamelist;
+ axutil_hash_t *nillable_qnamelist;
w2c_schema_writer_meta_info_t *parent;
@@ -177,40 +177,40 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_element2schema_qnamemap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *element2schema_qnamemap);
-axis2_hash_t *AXIS2_CALL
+ axutil_hash_t *element2schema_qnamemap);
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_element2schema_qnamemap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_element2classmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *element2classmap);
-axis2_hash_t *AXIS2_CALL
+ axutil_hash_t *element2classmap);
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_element2classmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_specialtype_flagmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *specialtype_flagmap);
-axis2_hash_t *AXIS2_CALL
+ axutil_hash_t *specialtype_flagmap);
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_specialtype_flagmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_qname_maxoccurs_countmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *qname_maxoccurs_countmap);
-axis2_hash_t *AXIS2_CALL
+ axutil_hash_t *qname_maxoccurs_countmap);
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_qname_maxoccurs_countmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_qname_minoccurs_countmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *qname_minoccurs_countmap);
-axis2_hash_t *AXIS2_CALL
+ axutil_hash_t *qname_minoccurs_countmap);
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_qname_minoccurs_countmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
@@ -426,18 +426,18 @@
writer_meta_info_impl-> own_classname = NULL;
writer_meta_info_impl-> enum_facet = NULL;
writer_meta_info_impl-> pattern_facet = NULL;
- writer_meta_info_impl-> nillable_qnamelist = axis2_hash_make( env);
+ writer_meta_info_impl-> nillable_qnamelist = axutil_hash_make( env);
writer_meta_info_impl-> parent = NULL;
writer_meta_info_impl-> extension_basetype = NULL;
writer_meta_info_impl-> restriction_basetype = NULL;
writer_meta_info_impl-> ownqname = NULL;
- writer_meta_info_impl-> element2schema_qnamemap = axis2_hash_make(env);
- writer_meta_info_impl-> element2classmap= axis2_hash_make(env);
- writer_meta_info_impl-> specialtype_flagmap = axis2_hash_make(env);
- writer_meta_info_impl-> qname_maxoccurs_countmap = axis2_hash_make(env);
- writer_meta_info_impl-> qname_minoccurs_countmap = axis2_hash_make(env);
- writer_meta_info_impl-> qname_orderlist = axis2_hash_make(env);
+ writer_meta_info_impl-> element2schema_qnamemap = axutil_hash_make(env);
+ writer_meta_info_impl-> element2classmap= axutil_hash_make(env);
+ writer_meta_info_impl-> specialtype_flagmap = axutil_hash_make(env);
+ writer_meta_info_impl-> qname_maxoccurs_countmap = axutil_hash_make(env);
+ writer_meta_info_impl-> qname_minoccurs_countmap = axutil_hash_make(env);
+ writer_meta_info_impl-> qname_orderlist = axutil_hash_make(env);
writer_meta_info_impl->length_facet = -1;
writer_meta_info_impl->maxexclusive_facet = -1;
@@ -619,7 +619,7 @@
const axutil_env_t *env)
{
w2c_schema_writer_meta_info_impl_t *schema_writer_meta_info_impl = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
axis2_char_t *key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -644,36 +644,36 @@
}
if (schema_writer_meta_info_impl->element2classmap)
{
- axis2_hash_free(schema_writer_meta_info_impl->element2classmap, env);
+ axutil_hash_free(schema_writer_meta_info_impl->element2classmap, env);
}
if (schema_writer_meta_info_impl->element2schema_qnamemap)
{
- axis2_hash_free(schema_writer_meta_info_impl->element2schema_qnamemap, env);
+ axutil_hash_free(schema_writer_meta_info_impl->element2schema_qnamemap, env);
}
if (schema_writer_meta_info_impl->specialtype_flagmap)
{
- axis2_hash_free(schema_writer_meta_info_impl->specialtype_flagmap, env);
+ axutil_hash_free(schema_writer_meta_info_impl->specialtype_flagmap, env);
}
if (schema_writer_meta_info_impl->qname_maxoccurs_countmap)
{
- axis2_hash_free(schema_writer_meta_info_impl->qname_maxoccurs_countmap, env);
+ axutil_hash_free(schema_writer_meta_info_impl->qname_maxoccurs_countmap, env);
}
if (schema_writer_meta_info_impl->qname_minoccurs_countmap)
{
- axis2_hash_free(schema_writer_meta_info_impl->qname_minoccurs_countmap, env);
+ axutil_hash_free(schema_writer_meta_info_impl->qname_minoccurs_countmap, env);
}
if (schema_writer_meta_info_impl->qname_orderlist)
{
- for (hi = axis2_hash_first( schema_writer_meta_info_impl-> qname_orderlist, env);
- hi; hi = axis2_hash_next(env, hi) )
+ for (hi = axutil_hash_first( schema_writer_meta_info_impl-> qname_orderlist, env);
+ hi; hi = axutil_hash_next(env, hi) )
{
- axis2_hash_this(hi, (void*)&key, NULL, NULL);
+ axutil_hash_this(hi, (void*)&key, NULL, NULL);
if ( key!= NULL ) /* apperently true */
{
AXIS2_FREE( env-> allocator, key);
}
}
- axis2_hash_free(schema_writer_meta_info_impl->qname_orderlist, env);
+ axutil_hash_free(schema_writer_meta_info_impl->qname_orderlist, env);
}
/*if (schema_writer_meta_info_impl-> pattern_facet)
{
@@ -694,7 +694,7 @@
}
if (schema_writer_meta_info_impl->nillable_qnamelist)
{
- axis2_hash_free(schema_writer_meta_info_impl->nillable_qnamelist, env);
+ axutil_hash_free(schema_writer_meta_info_impl->nillable_qnamelist, env);
}
if (schema_writer_meta_info_impl->parent)
{
@@ -993,7 +993,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_element2schema_qnamemap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *element2schema_qnamemap)
+ axutil_hash_t *element2schema_qnamemap)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1001,7 +1001,7 @@
writer_meta_info_impl-> element2schema_qnamemap = element2schema_qnamemap;
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_element2schema_qnamemap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env)
{
@@ -1014,7 +1014,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_element2classmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *element2classmap)
+ axutil_hash_t *element2classmap)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1022,7 +1022,7 @@
writer_meta_info_impl-> element2classmap = element2classmap;
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_element2classmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env)
{
@@ -1035,7 +1035,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_specialtype_flagmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *specialtype_flagmap)
+ axutil_hash_t *specialtype_flagmap)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1043,7 +1043,7 @@
writer_meta_info_impl-> specialtype_flagmap = specialtype_flagmap;
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_specialtype_flagmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env)
{
@@ -1056,7 +1056,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_qname_maxoccurs_countmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *qname_maxoccurs_countmap)
+ axutil_hash_t *qname_maxoccurs_countmap)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1064,7 +1064,7 @@
writer_meta_info_impl-> qname_maxoccurs_countmap = qname_maxoccurs_countmap;
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_qname_maxoccurs_countmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env)
{
@@ -1077,7 +1077,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_qname_minoccurs_countmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_hash_t *qname_minoccurs_countmap)
+ axutil_hash_t *qname_minoccurs_countmap)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1085,7 +1085,7 @@
writer_meta_info_impl-> qname_minoccurs_countmap = qname_minoccurs_countmap;
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_qname_minoccurs_countmap( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env)
{
@@ -1291,7 +1291,7 @@
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- axis2_hash_set( writer_meta_info_impl-> nillable_qnamelist, qname_str,
+ axutil_hash_set( writer_meta_info_impl-> nillable_qnamelist, qname_str,
AXIS2_HASH_KEY_STRING, (void*)1);
return AXIS2_SUCCESS;
@@ -1310,7 +1310,7 @@
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- return (axis2_bool_t)axis2_hash_get( writer_meta_info_impl-> nillable_qnamelist, qname_str,
+ return (axis2_bool_t)axutil_hash_get( writer_meta_info_impl-> nillable_qnamelist, qname_str,
AXIS2_HASH_KEY_STRING);
@@ -1331,9 +1331,9 @@
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- axis2_hash_set( writer_meta_info_impl-> element2classmap, qname_str,
+ axutil_hash_set( writer_meta_info_impl-> element2classmap, qname_str,
AXIS2_HASH_KEY_STRING, class_name);
- axis2_hash_set( writer_meta_info_impl-> element2schema_qnamemap, qname_str,
+ axutil_hash_set( writer_meta_info_impl-> element2schema_qnamemap, qname_str,
AXIS2_HASH_KEY_STRING, schema_name);
w2c_schema_writer_meta_info_add_status( schema_writer_meta_info, env, qname, type);
return AXIS2_SUCCESS;
@@ -1353,7 +1353,7 @@
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- ret_qname = (axis2_qname_t*)axis2_hash_get( writer_meta_info_impl-> element2schema_qnamemap, qname_str,
+ ret_qname = (axis2_qname_t*)axutil_hash_get( writer_meta_info_impl-> element2schema_qnamemap, qname_str,
AXIS2_HASH_KEY_STRING);
return ret_qname;
}
@@ -1371,7 +1371,7 @@
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- ret_name = (axis2_char_t*)axis2_hash_get( writer_meta_info_impl-> element2classmap, qname_str,
+ ret_name = (axis2_char_t*)axutil_hash_get( writer_meta_info_impl-> element2classmap, qname_str,
AXIS2_HASH_KEY_STRING);
return ret_name;
}
@@ -1388,7 +1388,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- state = (int)axis2_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
+ state = (int)axutil_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
AXIS2_HASH_KEY_STRING);
if ( state != 0 )
{
@@ -1410,7 +1410,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- state = (int)axis2_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
+ state = (int)axutil_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
AXIS2_HASH_KEY_STRING);
if ( state != 0 )
{
@@ -1432,7 +1432,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- state = (int)axis2_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
+ state = (int)axutil_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
AXIS2_HASH_KEY_STRING);
if ( state != 0 )
{
@@ -1454,7 +1454,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- state = (int)axis2_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
+ state = (int)axutil_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
AXIS2_HASH_KEY_STRING);
if ( state != 0 )
{
@@ -1492,7 +1492,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- axis2_hash_set( writer_meta_info_impl-> qname_minoccurs_countmap, qname_str,
+ axutil_hash_set( writer_meta_info_impl-> qname_minoccurs_countmap, qname_str,
AXIS2_HASH_KEY_STRING, (void*)min_occurs);
return AXIS2_SUCCESS;
}
@@ -1509,7 +1509,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- axis2_hash_set( writer_meta_info_impl-> qname_maxoccurs_countmap, qname_str,
+ axutil_hash_set( writer_meta_info_impl-> qname_maxoccurs_countmap, qname_str,
AXIS2_HASH_KEY_STRING, (void*)max_occurs);
return AXIS2_SUCCESS;
}
@@ -1528,7 +1528,7 @@
sprintf( index_str, "%d", index);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
- axis2_hash_set( writer_meta_info_impl-> qname_orderlist, (void*)index_str, AXIS2_HASH_KEY_STRING, (void*)qname);
+ axutil_hash_set( writer_meta_info_impl-> qname_orderlist, (void*)index_str, AXIS2_HASH_KEY_STRING, (void*)qname);
return AXIS2_SUCCESS;
}
@@ -1545,7 +1545,7 @@
AXIS2_ENV_CHECK(env, 0);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- min_occurs = (int)axis2_hash_get( writer_meta_info_impl-> qname_minoccurs_countmap, qname_str,
+ min_occurs = (int)axutil_hash_get( writer_meta_info_impl-> qname_minoccurs_countmap, qname_str,
AXIS2_HASH_KEY_STRING);
return min_occurs?min_occurs:1; /* default to 1 */
}
@@ -1562,7 +1562,7 @@
AXIS2_ENV_CHECK(env, 0);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- max_occurs = (int)axis2_hash_get( writer_meta_info_impl-> qname_maxoccurs_countmap, qname_str,
+ max_occurs = (int)axutil_hash_get( writer_meta_info_impl-> qname_maxoccurs_countmap, qname_str,
AXIS2_HASH_KEY_STRING);
return max_occurs?max_occurs:1; /* default to 1 */
}
@@ -1573,7 +1573,7 @@
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
axutil_array_list_t *arr_list = NULL;
axis2_qname_t *qname = NULL;
int i = 0;
@@ -1582,10 +1582,10 @@
AXIS2_ENV_CHECK(env, NULL);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
arr_list = axutil_array_list_create( env, 10 );
- for (hi = axis2_hash_first( writer_meta_info_impl-> element2classmap, env), i = 0;
- hi; hi = axis2_hash_next(env, hi), i++)
+ for (hi = axutil_hash_first( writer_meta_info_impl-> element2classmap, env), i = 0;
+ hi; hi = axutil_hash_next(env, hi), i++)
{
- axis2_hash_this(hi, (void*)&qname_str, NULL, NULL);
+ axutil_hash_this(hi, (void*)&qname_str, NULL, NULL);
if (qname_str)
{
qname = axis2_qname_create_from_string( env, qname_str);
@@ -1620,7 +1620,7 @@
for ( i = 0, real_index = 0; i < size; i ++ )
{
sprintf(index_str, "%d", i);
- qname = (axis2_qname_t*) axis2_hash_get(
+ qname = (axis2_qname_t*) axutil_hash_get(
writer_meta_info_impl-> qname_orderlist, index_str, AXIS2_HASH_KEY_STRING );
if ( qname != NULL )
{
@@ -1655,15 +1655,15 @@
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
int count = 0;
axis2_char_t *x = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
AXIS2_ENV_CHECK(env, 0);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
- for (count = 0, hi = axis2_hash_first( writer_meta_info_impl-> qname_orderlist, env);
- hi; hi = axis2_hash_next(env, hi) )
+ for (count = 0, hi = axutil_hash_first( writer_meta_info_impl-> qname_orderlist, env);
+ hi; hi = axutil_hash_next(env, hi) )
{
- axis2_hash_this(hi, (void*)&x, NULL, NULL);
+ axutil_hash_this(hi, (void*)&x, NULL, NULL);
if ( x!= NULL ) /* apperently true */
{
count ++;
@@ -1686,15 +1686,15 @@
AXIS2_ENV_CHECK(env, 0);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( type, env);
- status = (int)axis2_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
+ status = (int)axutil_hash_get( writer_meta_info_impl-> specialtype_flagmap, qname_str,
AXIS2_HASH_KEY_STRING);
if ( status != 0 )
{
- axis2_hash_set( writer_meta_info_impl-> specialtype_flagmap, qname_str,
+ axutil_hash_set( writer_meta_info_impl-> specialtype_flagmap, qname_str,
AXIS2_HASH_KEY_STRING, (void*)(status | mask));
}
- axis2_hash_set( writer_meta_info_impl-> specialtype_flagmap, qname_str,
+ axutil_hash_set( writer_meta_info_impl-> specialtype_flagmap, qname_str,
AXIS2_HASH_KEY_STRING, (void*)mask);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c Fri Mar 30 11:28:18 2007
@@ -16,7 +16,7 @@
*/
#include <w2c_extension.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axutil_array_list.h>
#include <xml_schema.h>
#include <stdio.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org