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 [21/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/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Fri Mar 30 11:28:18 2007
@@ -244,7 +244,7 @@
xml_schema_builder_t *builder,
const axutil_env_t *env,
axiom_node_t *ele_node,
- axis2_hash_t* ele_to_ns_map);
+ axutil_hash_t* ele_to_ns_map);
*/
static xml_schema_identity_constraint_t*
handle_constraint(
@@ -315,7 +315,7 @@
static axis2_bool_t
value_exist_in_hash(
const axutil_env_t *env,
- axis2_hash_t *ht,
+ axutil_hash_t *ht,
axis2_char_t *value);
static xml_schema_form_t*
@@ -478,9 +478,9 @@
{
xml_schema_builder_impl_t *builder_impl = NULL;
- axis2_hash_t *ht_sch2schemas = NULL;
+ axutil_hash_t *ht_sch2schemas = NULL;
axutil_array_list_t *schemas = NULL;
- axis2_hash_t *namespaces = NULL;
+ axutil_hash_t *namespaces = NULL;
axis2_char_t *target_ns = NULL;
/** element form default */
@@ -508,7 +508,7 @@
if (ht_sch2schemas)
{
- axis2_hash_set(ht_sch2schemas, uri,
+ axutil_hash_set(ht_sch2schemas, uri,
AXIS2_HASH_KEY_STRING, builder_impl->schema);
}
}
@@ -527,11 +527,11 @@
if (namespaces && NULL != target_ns)
{
void *val = NULL;
- val = axis2_hash_get(namespaces, target_ns, AXIS2_HASH_KEY_STRING);
+ val = axutil_hash_get(namespaces, target_ns, AXIS2_HASH_KEY_STRING);
if (!val)
{
/** value does not exist */
- axis2_hash_set(namespaces, target_ns,
+ axutil_hash_set(namespaces, target_ns,
AXIS2_HASH_KEY_STRING, builder_impl->schema);
}
@@ -941,11 +941,11 @@
{
xml_schema_builder_impl_t *builder_impl = NULL;
axiom_node_t* parent_node = NULL;
- axis2_hash_t *ht_ns = NULL;
- axis2_hash_index_t *hi_ns = NULL;
+ axutil_hash_t *ht_ns = NULL;
+ axutil_hash_index_t *hi_ns = NULL;
axiom_element_t *om_ele = NULL;
- axis2_hash_t *ht_sch_ns = NULL;
+ axutil_hash_t *ht_sch_ns = NULL;
axis2_qname_t *target_ns_qn = NULL;
axis2_char_t *contain = NULL;
@@ -976,11 +976,11 @@
if (!ht_sch_ns)
return AXIS2_FAILURE;
- for (hi_ns = axis2_hash_first(ht_ns, env); hi_ns;
- hi_ns = axis2_hash_next(env, hi_ns))
+ for (hi_ns = axutil_hash_first(ht_ns, env); hi_ns;
+ hi_ns = axutil_hash_next(env, hi_ns))
{
void *val = NULL;
- axis2_hash_this(hi_ns, NULL, NULL, &val);
+ axutil_hash_this(hi_ns, NULL, NULL, &val);
if (val)
{
axis2_char_t *uri = NULL;
@@ -991,7 +991,7 @@
if (prefix && axis2_strcmp(prefix, "") != 0)
{
- axis2_hash_set(ht_sch_ns, prefix,
+ axutil_hash_set(ht_sch_ns, prefix,
AXIS2_HASH_KEY_STRING, uri);
if (uri && axis2_strcmp(uri, XML_SCHEMA_NS) == 0)
@@ -1002,7 +1002,7 @@
else
{
/** default namespace [xmlns=""] */
- axis2_hash_set(ht_sch_ns, "", AXIS2_HASH_KEY_STRING, uri);
+ axutil_hash_set(ht_sch_ns, "", AXIS2_HASH_KEY_STRING, uri);
}
}
}
@@ -1040,7 +1040,7 @@
axis2_char_t *ns)
{
xml_schema_builder_impl_t *builder_impl = NULL;
- axis2_hash_t *ht_sch_ns = NULL;
+ axutil_hash_t *ht_sch_ns = NULL;
builder_impl = AXIS2_INTF_TO_IMPL(builder);
AXIS2_PARAM_CHECK(env->error, prefix, AXIS2_FAILURE);
@@ -1048,15 +1048,15 @@
ht_sch_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- if (axis2_hash_get(ht_sch_ns, prefix, AXIS2_HASH_KEY_STRING))
+ if (axutil_hash_get(ht_sch_ns, prefix, AXIS2_HASH_KEY_STRING))
{
/** key already exist */
axis2_char_t *gen_prefix = AXIS2_MALLOC(env->allocator, sizeof(10));
sprintf(gen_prefix, "gen%d", builder_impl->gen_no++);
- axis2_hash_set(ht_sch_ns, gen_prefix, AXIS2_HASH_KEY_STRING, ns);
+ axutil_hash_set(ht_sch_ns, gen_prefix, AXIS2_HASH_KEY_STRING, ns);
}
- axis2_hash_set(ht_sch_ns, prefix, AXIS2_HASH_KEY_STRING, ns);
+ axutil_hash_set(ht_sch_ns, prefix, AXIS2_HASH_KEY_STRING, ns);
return AXIS2_SUCCESS;
}
@@ -1167,7 +1167,7 @@
if (attribute_value)
{
axutil_array_list_t *temp_list = NULL;
- axis2_hash_t *ht_ns = NULL;
+ axutil_hash_t *ht_ns = NULL;
axis2_char_t *namesp = NULL;
axutil_array_list_t *last_list = NULL;
axis2_char_t *name = NULL;
@@ -1181,7 +1181,7 @@
}
ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- namesp = axis2_hash_get(ht_ns, namesp, AXIS2_HASH_KEY_STRING);
+ namesp = axutil_hash_get(ht_ns, namesp, AXIS2_HASH_KEY_STRING);
last_list = axis2_last_token(env, attribute_value, ':');
@@ -1259,7 +1259,7 @@
axis2_qname_t *item_type_qn = NULL;
axis2_char_t *ns = NULL;
axis2_char_t *key = NULL;
- axis2_hash_t *ht_ns = NULL;
+ axutil_hash_t *ht_ns = NULL;
namespaces_form_ele = axis2_tokenize(env, attr_value, ':');
ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
@@ -1267,7 +1267,7 @@
{
axis2_char_t *result = NULL;
key = axutil_array_list_get(namespaces_form_ele, env, 0);
- result = axis2_hash_get(ht_ns, key, AXIS2_HASH_KEY_STRING);
+ result = axutil_hash_get(ht_ns, key, AXIS2_HASH_KEY_STRING);
if (! result)
{
/**TODO set error */
@@ -1332,7 +1332,7 @@
{
axutil_array_list_t *tokens = NULL;
axutil_array_list_t *v = NULL;
- axis2_hash_t *ht_namespaces = NULL;
+ axutil_hash_t *ht_namespaces = NULL;
int i = 0;
XML_SCHEMA_SIMPLE_TYPE_UNION_SET_MEMBER_TYPES_SOURCE(sch_union,
env, attr_value);
@@ -1365,7 +1365,7 @@
{
localname = mem_dup;
}
- uri = axis2_hash_get(ht_namespaces, prefix, AXIS2_HASH_KEY_STRING);
+ uri = axutil_hash_get(ht_namespaces, prefix, AXIS2_HASH_KEY_STRING);
qn = axis2_qname_create(env, localname, uri, prefix);
/*
AXIS2_FREE(env->allocator, mem_dup);
@@ -1761,7 +1761,7 @@
axutil_array_list_t *list = NULL;
- axis2_hash_t *namespaces = NULL;
+ axutil_hash_t *namespaces = NULL;
axis2_char_t *result = NULL;
@@ -1779,7 +1779,7 @@
namespaces = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- result = axis2_hash_get(namespaces, ns_from_ele, AXIS2_HASH_KEY_STRING);
+ result = axutil_hash_get(namespaces, ns_from_ele, AXIS2_HASH_KEY_STRING);
if (! result)
{
@@ -1905,7 +1905,7 @@
{
axis2_char_t *ns_from_ele = "";
axutil_array_list_t *list = NULL;
- axis2_hash_t *namespaces = NULL;
+ axutil_hash_t *namespaces = NULL;
axis2_char_t *result = NULL;
axutil_array_list_t* last_list = NULL;
axis2_char_t *name = NULL;
@@ -1920,7 +1920,7 @@
namespaces = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- result = axis2_hash_get(namespaces, ns_from_ele, AXIS2_HASH_KEY_STRING);
+ result = axutil_hash_get(namespaces, ns_from_ele, AXIS2_HASH_KEY_STRING);
if (! result)
{
@@ -2007,7 +2007,7 @@
{
axis2_char_t *prefix = "";
axutil_array_list_t *list = NULL;
- axis2_hash_t *namespaces = NULL;
+ axutil_hash_t *namespaces = NULL;
axis2_char_t *result = NULL;
axutil_array_list_t* last_list = NULL;
axis2_char_t *name = NULL;
@@ -2021,7 +2021,7 @@
namespaces = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- result = axis2_hash_get(namespaces, prefix, AXIS2_HASH_KEY_STRING);
+ result = axutil_hash_get(namespaces, prefix, AXIS2_HASH_KEY_STRING);
if (! result)
{
@@ -2125,7 +2125,7 @@
{
axis2_char_t *ns_from_ele = "";
axutil_array_list_t *list = NULL;
- axis2_hash_t *namespaces = NULL;
+ axutil_hash_t *namespaces = NULL;
axis2_char_t *result = NULL;
axutil_array_list_t* last_list = NULL;
axis2_char_t *name = NULL;
@@ -2140,7 +2140,7 @@
namespaces = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- result = axis2_hash_get(namespaces, ns_from_ele, AXIS2_HASH_KEY_STRING);
+ result = axutil_hash_get(namespaces, ns_from_ele, AXIS2_HASH_KEY_STRING);
if (! result)
{
@@ -2243,7 +2243,7 @@
{
axutil_array_list_t *parts = NULL;
axis2_char_t *prefix = NULL;
- axis2_hash_t *ht_ns = NULL;
+ axutil_hash_t *ht_ns = NULL;
axis2_char_t *uri = NULL;
axis2_char_t *ref = NULL;
axutil_array_list_t *last_list = NULL;
@@ -2256,7 +2256,7 @@
ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(
AXIS2_INTF_TO_IMPL(builder)->schema, env);
- uri = axis2_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
+ uri = axutil_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
if (! uri)
{
/** TODO set error code */
@@ -2766,7 +2766,7 @@
axiom_element_t *ele1 = NULL;
axiom_node_t *node1 = NULL;
- axis2_hash_t *ht_ns = NULL;
+ axutil_hash_t *ht_ns = NULL;
group = xml_schema_group_ref_create(env);
@@ -2801,7 +2801,7 @@
if (axutil_array_list_size(parts, env) > 1)
prefix = (axis2_char_t*)axutil_array_list_get(parts, env, 1);
- result = axis2_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
+ result = axutil_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
if (! result)
{
@@ -2899,13 +2899,13 @@
if (axutil_array_list_size(args, env) > 1)
{
- axis2_hash_t *ht_ns = NULL;
+ axutil_hash_t *ht_ns = NULL;
axiom_namespace_t *ns = NULL;
ht_ns = axiom_element_get_namespaces(attr_ele, env);
prefix = axutil_array_list_get(args, env, 0);
if (ht_ns)
{
- ns = axis2_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
+ ns = axutil_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
if (ns)
{
namesp = axiom_namespace_get_uri(ns, env);
@@ -2993,7 +2993,7 @@
if (axutil_array_list_size(ns_list, env) > 1)
{
axis2_char_t *result = NULL;
- axis2_hash_t *ns_hash = NULL;
+ axutil_hash_t *ns_hash = NULL;
axis2_char_t *prefix = NULL;
axis2_char_t *xml_prefix = NULL;
prefix = axutil_array_list_get(ns_list, env, 1);
@@ -3001,7 +3001,7 @@
ns_hash = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- result = axis2_hash_get(ns_hash, prefix, AXIS2_HASH_KEY_STRING);
+ result = axutil_hash_get(ns_hash, prefix, AXIS2_HASH_KEY_STRING);
if (! result && xml_prefix && axis2_strcmp(xml_prefix, XML_SCHEMANS_PREFIX))
result = XML_SCHEMANS_URI;
if (! result)
@@ -3209,13 +3209,13 @@
if (axutil_array_list_size(args, env) > 1)
{
- axis2_hash_t *ht_ns = NULL;
+ axutil_hash_t *ht_ns = NULL;
axiom_namespace_t *ns = NULL;
ht_ns = axiom_element_get_namespaces(om_ele, env);
prefix = axutil_array_list_get(args, env, 0);
if (ht_ns)
{
- ns = axis2_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
+ ns = axutil_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
if (ns)
namesp = axiom_namespace_get_uri(ns, env);
}
@@ -3271,7 +3271,7 @@
axis2_char_t *ref_name = NULL;
axis2_char_t *args0 = NULL;
axis2_char_t *namesp = NULL;
- axis2_hash_t *ht_ns = NULL;
+ axutil_hash_t *ht_ns = NULL;
axis2_qname_t *qn = NULL;
args = axis2_tokenize(env, attr_value, ':');
@@ -3282,7 +3282,7 @@
axis2_char_t *result = NULL;
args0 = axutil_array_list_get(args, env, 0);
- result = axis2_hash_get(ht_ns, args0, AXIS2_HASH_KEY_STRING);
+ result = axutil_hash_get(ht_ns, args0, AXIS2_HASH_KEY_STRING);
if (!result)
{
/**TODO set error */
@@ -3355,7 +3355,7 @@
axis2_char_t *ref_name = NULL;
axis2_char_t *args0 = NULL;
axis2_char_t *namesp = NULL;
- axis2_hash_t *ht_ns = NULL;
+ axutil_hash_t *ht_ns = NULL;
axis2_qname_t *qn = NULL;
args = axis2_tokenize(env, attr_val, ':');
@@ -3366,7 +3366,7 @@
axis2_char_t *result = NULL;
args0 = axutil_array_list_get(args, env, 0);
- result = axis2_hash_get(ht_ns, args0, AXIS2_HASH_KEY_STRING);
+ result = axutil_hash_get(ht_ns, args0, AXIS2_HASH_KEY_STRING);
if (!result)
{
/**TODO set error */
@@ -3464,10 +3464,10 @@
xml_schema_builder_t *builder,
const axutil_env_t *env,
axiom_node_t *ele_node,
- axis2_hash_t* ele_to_ns_map)
+ axutil_hash_t* ele_to_ns_map)
{
axiom_element_t *ele = NULL;
- axis2_hash_t *ns_hash = NULL;
+ axutil_hash_t *ns_hash = NULL;
AXIS2_PARAM_CHECK(env->error, ele_node, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ele_to_ns_map, AXIS2_FAILURE);
@@ -3477,12 +3477,12 @@
if( ns_hash)
{
- axis2_hash_index_t *hi = NULL;
- for(hi = axis2_hash_first(ns_hash, env);
- hi; hi = axis2_hash_next(env, hi))
+ axutil_hash_index_t *hi = NULL;
+ for(hi = axutil_hash_first(ns_hash, 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);
if( val)
{
axiom_namespace_t *ns = NULL;
@@ -3492,7 +3492,7 @@
uri = axiom_namespace_get_uri(ns, env);
prefix = axiom_namespace_get_prefix(ns, env);
- axis2_hash_set(ele_to_ns_map, axis2_strdup(prefix, env),
+ axutil_hash_set(ele_to_ns_map, axis2_strdup(prefix, env),
AXIS2_HASH_KEY_STRING, axis2_strdup(uri, env));
}
}
@@ -3561,13 +3561,13 @@
{
axis2_char_t *ns1 = NULL;
- axis2_hash_t *namespaces_ht = NULL;
+ axutil_hash_t *namespaces_ht = NULL;
ns1 = axutil_array_list_get(ns_from_ele, env, 0);
namespaces_ht =
XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- ns = axis2_hash_get(namespaces_ht, ns1, AXIS2_HASH_KEY_STRING);
+ ns = axutil_hash_get(namespaces_ht, ns1, AXIS2_HASH_KEY_STRING);
}
else
{
@@ -3984,17 +3984,17 @@
static axis2_bool_t
value_exist_in_hash(
const axutil_env_t *env,
- axis2_hash_t *ht,
+ axutil_hash_t *ht,
axis2_char_t *value)
{
void *val = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
if (!value || !ht)
return AXIS2_FALSE;
- for (hi = axis2_hash_first(ht, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(ht, env); hi;
+ hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
if (val)
{
axis2_char_t *htvalue = NULL;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Fri Mar 30 11:28:18 2007
@@ -16,7 +16,7 @@
*/
#include <xml_schema_includes.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
typedef struct xml_schema_collection_impl
xml_schema_collection_impl_t;
@@ -25,19 +25,19 @@
{
xml_schema_collection_t collection;
- axis2_hash_t *namespaces;
+ axutil_hash_t *namespaces;
axis2_char_t *base_uri;
- axis2_hash_t *in_scope_namespaces;
+ axutil_hash_t *in_scope_namespaces;
- axis2_hash_t *systemid2_schemas;
+ axutil_hash_t *systemid2_schemas;
xml_schema_t *xsd;
axutil_array_list_t *schemas;
- axis2_hash_t *unresolved_types;
+ axutil_hash_t *unresolved_types;
axutil_array_list_t *builder_list;
};
@@ -147,7 +147,7 @@
xml_schema_t* schema,
axis2_char_t *type_name);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_collection_get_systemid2_schemas(
xml_schema_collection_t *collection,
const axutil_env_t *env);
@@ -163,7 +163,7 @@
const axutil_env_t *env,
axutil_array_list_t *schemas);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_collection_get_namespaces(
xml_schema_collection_t *collection,
const axutil_env_t *env);
@@ -275,11 +275,11 @@
return NULL;
}
- collection_impl->namespaces = axis2_hash_make(env);
- collection_impl->in_scope_namespaces = axis2_hash_make(env);
- collection_impl->systemid2_schemas = axis2_hash_make(env);
+ collection_impl->namespaces = axutil_hash_make(env);
+ collection_impl->in_scope_namespaces = axutil_hash_make(env);
+ collection_impl->systemid2_schemas = axutil_hash_make(env);
collection_impl->schemas = axutil_array_list_create(env, 10);
- collection_impl->unresolved_types = axis2_hash_make(env);
+ collection_impl->unresolved_types = axutil_hash_make(env);
collection_impl->builder_list = axutil_array_list_create(env, 10);
if (!collection_impl->namespaces || !collection_impl->in_scope_namespaces ||
@@ -437,7 +437,7 @@
add_simple_type(env, collection_impl->xsd, XML_SCHEMA_XSD_LANGUAGE);
add_simple_type(env, collection_impl->xsd, XML_SCHEMA_XSD_TOKEN);
- axis2_hash_set(collection_impl->namespaces, XML_SCHEMA_NS,
+ axutil_hash_set(collection_impl->namespaces, XML_SCHEMA_NS,
AXIS2_HASH_KEY_STRING, collection_impl->xsd);
return AXIS2_SUCCESS;
@@ -567,7 +567,7 @@
uri = axis2_qname_get_uri(qname, env);
if (collec_impl->namespaces)
- schema = axis2_hash_get(collec_impl->namespaces, uri, AXIS2_HASH_KEY_STRING);
+ schema = axutil_hash_get(collec_impl->namespaces, uri, AXIS2_HASH_KEY_STRING);
if (!schema)
return NULL;
@@ -594,7 +594,7 @@
uri = axis2_qname_get_uri(schema_type_qname, env);
if (collecion_impl->namespaces && NULL != uri)
- schema = axis2_hash_get(collecion_impl->namespaces, uri, AXIS2_HASH_KEY_STRING);
+ schema = axutil_hash_get(collecion_impl->namespaces, uri, AXIS2_HASH_KEY_STRING);
if (!schema)
return NULL;
@@ -622,13 +622,13 @@
if (collection_impl->unresolved_types &&
qn_string)
{
- receivers = axis2_hash_get(collection_impl->unresolved_types,
+ receivers = axutil_hash_get(collection_impl->unresolved_types,
qn_string, AXIS2_HASH_KEY_STRING);
if (!receivers)
{
receivers = axutil_array_list_create(env, 10);
- axis2_hash_set(collection_impl->unresolved_types, qn_string,
+ axutil_hash_set(collection_impl->unresolved_types, qn_string,
AXIS2_HASH_KEY_STRING, receivers);
}
}
@@ -655,7 +655,7 @@
qn_string = axis2_qname_to_string(type_qname, env);
if (qn_string && NULL != collection_impl->unresolved_types)
{
- receivers = axis2_hash_get(collection_impl->unresolved_types,
+ receivers = axutil_hash_get(collection_impl->unresolved_types,
qn_string, AXIS2_HASH_KEY_STRING);
if (receivers)
@@ -677,7 +677,7 @@
return AXIS2_FAILURE;
}
if (collection_impl->unresolved_types)
- axis2_hash_set(collection_impl->unresolved_types, qn_string,
+ axutil_hash_set(collection_impl->unresolved_types, qn_string,
AXIS2_HASH_KEY_STRING, NULL);
}
return AXIS2_SUCCESS;
@@ -696,7 +696,7 @@
if (collection_impl->in_scope_namespaces)
{
axis2_char_t *ns = NULL;
- ns = (axis2_char_t *)axis2_hash_get(
+ ns = (axis2_char_t *)axutil_hash_get(
collection_impl->in_scope_namespaces,
prefix, AXIS2_HASH_KEY_STRING);
return ns;
@@ -716,7 +716,7 @@
collection_impl = AXIS2_INTF_TO_IMPL(collection);
if (collection_impl->in_scope_namespaces)
{
- axis2_hash_set(collection_impl->in_scope_namespaces, prefix,
+ axutil_hash_set(collection_impl->in_scope_namespaces, prefix,
AXIS2_HASH_KEY_STRING, namespc_uri);
return AXIS2_SUCCESS;
}
@@ -736,7 +736,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_collection_get_systemid2_schemas(
xml_schema_collection_t *collection,
const axutil_env_t *env)
@@ -773,7 +773,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_collection_get_namespaces(
xml_schema_collection_t *collection,
const axutil_env_t *env)
@@ -792,7 +792,7 @@
xml_schema_collection_impl_t *collection_impl = NULL;
AXIS2_PARAM_CHECK(env->error, system_id, NULL);
collection_impl = AXIS2_INTF_TO_IMPL(collection);
- return axis2_hash_get(collection_impl->systemid2_schemas,
+ return axutil_hash_get(collection_impl->systemid2_schemas,
system_id, AXIS2_HASH_KEY_STRING);
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c Fri Mar 30 11:28:18 2007
@@ -31,13 +31,13 @@
xml_schema_annotated_t *annotated;
- axis2_hash_t *methods;
+ axutil_hash_t *methods;
void *content;
xml_schema_types_t obj_type;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
axis2_bool_t mixed;
};
@@ -60,7 +60,7 @@
void *complex_content,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_complex_content_super_objs(
void *complex_content,
const axutil_env_t *env);
@@ -146,8 +146,8 @@
complex_content_impl->complex_content.ops->set_mixed =
xml_schema_complex_content_set_mixed;
- complex_content_impl->methods = axis2_hash_make(env);
- complex_content_impl->ht_super = axis2_hash_make(env);
+ complex_content_impl->methods = axutil_hash_make(env);
+ complex_content_impl->ht_super = axutil_hash_make(env);
if (!complex_content_impl->methods || !complex_content_impl->ht_super)
{
@@ -155,17 +155,17 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(complex_content_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(complex_content_impl->methods, "free", AXIS2_HASH_KEY_STRING,
xml_schema_complex_content_free);
- axis2_hash_set(complex_content_impl->methods, "get_content",
+ axutil_hash_set(complex_content_impl->methods, "get_content",
AXIS2_HASH_KEY_STRING, xml_schema_complex_content_get_content);
- axis2_hash_set(complex_content_impl->methods, "set_content",
+ axutil_hash_set(complex_content_impl->methods, "set_content",
AXIS2_HASH_KEY_STRING, xml_schema_complex_content_set_content);
- axis2_hash_set(complex_content_impl->methods, "get_type",
+ axutil_hash_set(complex_content_impl->methods, "get_type",
AXIS2_HASH_KEY_STRING, xml_schema_complex_content_get_type);
- axis2_hash_set(complex_content_impl->methods, "super_objs",
+ axutil_hash_set(complex_content_impl->methods, "super_objs",
AXIS2_HASH_KEY_STRING, xml_schema_complex_content_super_objs);
- axis2_hash_set(complex_content_impl->methods, "to_string",
+ axutil_hash_set(complex_content_impl->methods, "to_string",
AXIS2_HASH_KEY_STRING, xml_schema_complex_content_to_string);
complex_content_impl->annotated = xml_schema_annotated_create(env);
@@ -174,13 +174,13 @@
xml_schema_complex_content_free(&(complex_content_impl->complex_content), env);
return NULL;
}
- axis2_hash_set(complex_content_impl->ht_super,
+ axutil_hash_set(complex_content_impl->ht_super,
"XML_SCHEMA_COMPLEX_CONTENT", AXIS2_HASH_KEY_STRING,
&(complex_content_impl->complex_content));
- axis2_hash_set(complex_content_impl->ht_super,
+ axutil_hash_set(complex_content_impl->ht_super,
"XML_SCHEMA_ANNOTATED", AXIS2_HASH_KEY_STRING,
(complex_content_impl->annotated));
- axis2_hash_set(complex_content_impl->ht_super,
+ axutil_hash_set(complex_content_impl->ht_super,
"XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(complex_content_impl->annotated, env));
@@ -210,12 +210,12 @@
}
if (complex_content_impl->ht_super)
{
- axis2_hash_free(complex_content_impl->ht_super, env);
+ axutil_hash_free(complex_content_impl->ht_super, env);
complex_content_impl->ht_super = NULL;
}
if (complex_content_impl->methods)
{
- axis2_hash_free(complex_content_impl->methods, env);
+ axutil_hash_free(complex_content_impl->methods, env);
complex_content_impl->methods = NULL;
}
if (complex_content_impl->annotated)
@@ -363,7 +363,7 @@
return AXIS2_INTF_TO_IMPL(complex_content)->obj_type;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_complex_content_super_objs(
void *complex_content,
const axutil_env_t *env)
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c Fri Mar 30 11:28:18 2007
@@ -39,7 +39,7 @@
xml_schema_particle_t *particle;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
xml_schema_types_t obj_type;
};
@@ -62,7 +62,7 @@
void *cmp_cnt_ext,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_complex_content_extension_super_objs(
void *cmp_cnt_ext,
const axutil_env_t *env);
@@ -175,7 +175,7 @@
cmp_cnt_ext_impl->cmp_cnt_ext.ops->to_string =
xml_schema_complex_content_extension_to_string;
- cmp_cnt_ext_impl->ht_super = axis2_hash_make(env);
+ cmp_cnt_ext_impl->ht_super = axutil_hash_make(env);
if (!cmp_cnt_ext_impl->ht_super)
{
xml_schema_complex_content_extension_free(
@@ -198,11 +198,11 @@
xml_schema_complex_content_extension_free(&(cmp_cnt_ext_impl->cmp_cnt_ext), env);
return NULL;
}
- axis2_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_COMPLEX_CONTENT_EXTENSION"),
+ axutil_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_COMPLEX_CONTENT_EXTENSION"),
AXIS2_HASH_KEY_STRING, &(cmp_cnt_ext_impl->cmp_cnt_ext));
- axis2_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
+ axutil_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, cmp_cnt_ext_impl->annotated);
- axis2_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
+ axutil_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(cmp_cnt_ext_impl->annotated, env));
@@ -381,7 +381,7 @@
return AXIS2_INTF_TO_IMPL(cmp_cnt_ext)->obj_type;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_complex_content_extension_super_objs(
void *cmp_cnt_ext,
const axutil_env_t *env)
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c Fri Mar 30 11:28:18 2007
@@ -39,7 +39,7 @@
xml_schema_particle_t *particle;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
xml_schema_types_t obj_type;
};
@@ -57,7 +57,7 @@
void *cmp_content_res,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_complex_content_restriction_super_objs(
void *cmp_content_res,
const axutil_env_t *env);
@@ -187,7 +187,7 @@
cmp_content_res_impl->cmp_content_res.ops->to_string =
xml_schema_complex_content_restriction_to_string;
- cmp_content_res_impl->ht_super = axis2_hash_make(env);
+ cmp_content_res_impl->ht_super = axutil_hash_make(env);
if (!cmp_content_res_impl->ht_super)
{
xml_schema_complex_content_restriction_free(
@@ -210,12 +210,12 @@
return NULL;
}
- axis2_hash_set(cmp_content_res_impl->ht_super,
+ axutil_hash_set(cmp_content_res_impl->ht_super,
axis2_strdup(env, "XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION"),
AXIS2_HASH_KEY_STRING, &(cmp_content_res_impl->cmp_content_res));
- axis2_hash_set(cmp_content_res_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
+ axutil_hash_set(cmp_content_res_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, cmp_content_res_impl->annotated);
- axis2_hash_set(cmp_content_res_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
+ axutil_hash_set(cmp_content_res_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(cmp_content_res_impl->annotated, env));
xml_schema_annotated_resolve_methods(&(cmp_content_res_impl->cmp_content_res.base),
@@ -396,7 +396,7 @@
return NULL;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_complex_content_restriction_super_objs(
void *cmp_content_res,
const axutil_env_t *env)
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c Fri Mar 30 11:28:18 2007
@@ -56,7 +56,7 @@
xml_schema_types_t obj_type;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
};
@@ -81,7 +81,7 @@
void *complex_type,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_complex_type_super_objs(
void *complex_type,
const axutil_env_t *env);
@@ -313,7 +313,7 @@
complex_type_impl->complex_type.ops->to_string =
xml_schema_complex_type_to_string;
- complex_type_impl->ht_super = axis2_hash_make(env);
+ complex_type_impl->ht_super = axutil_hash_make(env);
if (!complex_type_impl->ht_super)
{
@@ -322,23 +322,23 @@
return NULL;
}
- axis2_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_COMPLEX_TYPE",
+ axutil_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_COMPLEX_TYPE",
AXIS2_HASH_KEY_STRING, &(complex_type_impl->complex_type));
- axis2_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_TYPE",
+ axutil_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_TYPE",
AXIS2_HASH_KEY_STRING, complex_type_impl->schema_type);
annotated =
XML_SCHEMA_TYPE_GET_BASE_IMPL(complex_type_impl->schema_type, env);
if (annotated)
{
- axis2_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_ANNOTATED",
+ axutil_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_ANNOTATED",
AXIS2_HASH_KEY_STRING, annotated);
- axis2_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_OBJ",
+ axutil_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_OBJ",
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
- axis2_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_COMPLEX_TYPE",
+ axutil_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_COMPLEX_TYPE",
AXIS2_HASH_KEY_STRING, &(complex_type_impl->complex_type));
xml_schema_type_resolve_methods(&(complex_type_impl->complex_type.base), env,
@@ -619,7 +619,7 @@
return AXIS2_INTF_TO_IMPL(complex_type)->obj_type;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_complex_type_super_objs(
void *complex_type,
const axutil_env_t *env)
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c Fri Mar 30 11:28:18 2007
@@ -34,7 +34,7 @@
xml_schema_types_t obj_type;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
axutil_array_list_t *members;
};
@@ -47,7 +47,7 @@
void *content_processing,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_content_processing_super_objs(
void *content_processing,
const axutil_env_t *env);
@@ -130,7 +130,7 @@
content_processing_impl->schema_enum = xml_schema_enum_create(env, value);
- content_processing_impl->ht_super = axis2_hash_make(env);
+ content_processing_impl->ht_super = axutil_hash_make(env);
if (!content_processing_impl->ht_super)
{
xml_schema_content_processing_free(
@@ -139,10 +139,10 @@
return NULL;
}
- axis2_hash_set(content_processing_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_CONTENT_PROCESSING"),
+ axutil_hash_set(content_processing_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_CONTENT_PROCESSING"),
AXIS2_HASH_KEY_STRING, &(content_processing_impl->content_processing));
- axis2_hash_set(content_processing_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ENUM"),
+ axutil_hash_set(content_processing_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ENUM"),
AXIS2_HASH_KEY_STRING, content_processing_impl->schema_enum);
status = xml_schema_enum_resolve_methods(
@@ -186,7 +186,7 @@
if (content_processing_impl->ht_super)
{
- axis2_hash_free(content_processing_impl->ht_super, env);
+ axutil_hash_free(content_processing_impl->ht_super, env);
content_processing_impl->ht_super = NULL;
}
@@ -215,7 +215,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_content_processing_super_objs(
void *content_processing,
const axutil_env_t *env)
@@ -259,10 +259,10 @@
const axutil_env_t *env)
{
xml_schema_content_processing_impl_t *content_processing_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_USE_SUPER_OBJS(content_processing, env);
- content_processing_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
+ content_processing_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super,
"XML_SCHEMA_CONTENT_PROCESSING", AXIS2_HASH_KEY_STRING));
return content_processing_impl->members;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c Fri Mar 30 11:28:18 2007
@@ -37,7 +37,7 @@
axutil_array_list_t *members;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
};
#define AXIS2_INTF_TO_IMPL(content_type) \
@@ -59,7 +59,7 @@
xml_schema_content_type_get_type(void *content_type,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_content_type_super_objs(void *content_type,
const axutil_env_t *env);
@@ -132,7 +132,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- content_type_impl->ht_super = axis2_hash_make(env);
+ content_type_impl->ht_super = axutil_hash_make(env);
if (!content_type_impl->ht_super)
{
xml_schema_content_type_free(&(content_type_impl->content_type), env);
@@ -140,9 +140,9 @@
return NULL;
}
- axis2_hash_set(content_type_impl->ht_super, axis2_strdup("XML_SCHEMA_CONTENT_TYPE", env),
+ axutil_hash_set(content_type_impl->ht_super, axis2_strdup("XML_SCHEMA_CONTENT_TYPE", env),
AXIS2_HASH_KEY_STRING, &(content_type_impl->content_type));
- axis2_hash_set(content_type_impl->ht_super, axis2_strdup("XML_SCHEMA_ENUM", env), AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(content_type_impl->ht_super, axis2_strdup("XML_SCHEMA_ENUM", env), AXIS2_HASH_KEY_STRING,
content_type_impl->schema_enum);
status = xml_schema_enum_resolve_methods(
@@ -227,7 +227,7 @@
return AXIS2_INTF_TO_IMPL(content_type)->obj_type;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_content_type_super_objs(void *content_type,
const axutil_env_t *env)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c Fri Mar 30 11:28:18 2007
@@ -17,7 +17,7 @@
#include <xml_schema_data_type.h>
#include <xml_schema_tokenized_type.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_utils.h>
typedef struct xml_schema_data_type_impl
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c Fri Mar 30 11:28:18 2007
@@ -36,14 +36,14 @@
axutil_array_list_t *members;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
};
#define AXIS2_INTF_TO_IMPL(derivation_method) \
((xml_schema_derivation_method_impl_t *) derivation_method)
/************************* function prototypes ************************************/
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_derivation_method_super_objs(void *derivation_method,
const axutil_env_t *env);
@@ -152,11 +152,11 @@
return NULL;
}
- derivation_method_impl->ht_super = axis2_hash_make(env);
- axis2_hash_set(derivation_method_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_DERIVATION_METHOD"),
+ derivation_method_impl->ht_super = axutil_hash_make(env);
+ axutil_hash_set(derivation_method_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_DERIVATION_METHOD"),
AXIS2_HASH_KEY_STRING, &(derivation_method_impl->derivation_method));
- axis2_hash_set(derivation_method_impl->ht_super, axis2_strdup(env,"XML_SCHEMA_ENUM"),
+ axutil_hash_set(derivation_method_impl->ht_super, axis2_strdup(env,"XML_SCHEMA_ENUM"),
AXIS2_HASH_KEY_STRING, derivation_method_impl->schema_enum);
status = xml_schema_enum_resolve_methods(
@@ -240,7 +240,7 @@
return AXIS2_INTF_TO_IMPL(derivation_method)->members;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_derivation_method_super_objs(void *derivation_method,
const axutil_env_t *env)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c Fri Mar 30 11:28:18 2007
@@ -34,7 +34,7 @@
axis2_char_t *language;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
axis2_char_t *source;
@@ -49,7 +49,7 @@
void *documentation,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_documentation_super_objs(
void *documentation,
const axutil_env_t *env);
@@ -165,7 +165,7 @@
return NULL;
}
- documentation_impl->ht_super = axis2_hash_make(env);
+ documentation_impl->ht_super = axutil_hash_make(env);
if (!documentation_impl->ht_super)
{
@@ -173,11 +173,11 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(documentation_impl->ht_super,
+ axutil_hash_set(documentation_impl->ht_super,
axis2_strdup(env, "XML_SCHEMA_DOCUMENTATION"),
AXIS2_HASH_KEY_STRING, &(documentation_impl->documentation));
- axis2_hash_set(documentation_impl->ht_super,
+ axutil_hash_set(documentation_impl->ht_super,
axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, documentation_impl->schema_obj);
@@ -208,7 +208,7 @@
if (documentation_impl->ht_super)
{
- axis2_hash_free(documentation_impl->ht_super, env);
+ axutil_hash_free(documentation_impl->ht_super, env);
documentation_impl->ht_super = NULL;
}
@@ -236,7 +236,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_documentation_super_objs(
void *documentation,
const axutil_env_t *env)
@@ -265,12 +265,12 @@
const axutil_env_t *env)
{
xml_schema_documentation_impl_t *documentation_impl = NULL;
- axis2_hash_t *ht_super = NULL;
+ axutil_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, NULL);
ht_super = XML_SCHEMA_USE_SUPER_OBJS(documentation, env);
if (ht_super)
{
- documentation_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, "XML_SCHEMA_APP_INFO",
+ documentation_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_APP_INFO",
AXIS2_HASH_KEY_STRING));
if (documentation_impl)
return documentation_impl->source;
@@ -285,14 +285,14 @@
axis2_char_t *source)
{
xml_schema_documentation_impl_t *documentation_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, source, AXIS2_FAILURE);
ht_super = XML_SCHEMA_USE_SUPER_OBJS(documentation, env);
if (ht_super)
{
- documentation_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, "XML_SCHEMA_DOCUMENTATION",
+ documentation_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_DOCUMENTATION",
AXIS2_HASH_KEY_STRING));
if (documentation_impl)
return AXIS2_FAILURE;
@@ -318,12 +318,12 @@
const axutil_env_t *env)
{
xml_schema_documentation_impl_t *documentation_impl = NULL;
- axis2_hash_t *ht_super = NULL;
+ axutil_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, NULL);
ht_super = XML_SCHEMA_USE_SUPER_OBJS(documentation, env);
if (ht_super)
{
- documentation_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, "XML_SCHEMA_DOCUMENTATION",
+ documentation_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_DOCUMENTATION",
AXIS2_HASH_KEY_STRING));
if (documentation_impl)
return NULL;
@@ -337,13 +337,13 @@
axiom_child_element_iterator_t *markup)
{
xml_schema_documentation_impl_t *documentation_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, markup, AXIS2_FAILURE);
ht_super = XML_SCHEMA_USE_SUPER_OBJS(documentation, env);
if (ht_super)
{
- documentation_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
+ documentation_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super,
"XML_SCHEMA_DOCUMENTATION", AXIS2_HASH_KEY_STRING));
if (documentation_impl)
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c Fri Mar 30 11:28:18 2007
@@ -107,7 +107,7 @@
*/
axis2_qname_t *substitution_group;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
xml_schema_types_t obj_type;
@@ -131,7 +131,7 @@
void *element,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_element_super_objs(
void *element,
const axutil_env_t *env);
@@ -440,25 +440,25 @@
xml_schema_element_free(&(element_impl->element), env);
return NULL;
}
- element_impl->ht_super = axis2_hash_make(env);
+ element_impl->ht_super = axutil_hash_make(env);
if (!element_impl->ht_super)
{
xml_schema_element_free(&(element_impl->element), env);
return NULL;
}
- axis2_hash_set(element_impl->ht_super, axis2_strdup(env,"XML_SCHEMA_ELEMENT"),
+ axutil_hash_set(element_impl->ht_super, axis2_strdup(env,"XML_SCHEMA_ELEMENT"),
AXIS2_HASH_KEY_STRING, &(element_impl->element));
- axis2_hash_set(element_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
+ axutil_hash_set(element_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
AXIS2_HASH_KEY_STRING, element_impl->particle);
annotated = XML_SCHEMA_PARTICLE_GET_BASE_IMPL(element_impl->particle, env);
if (annotated)
{
- axis2_hash_set(element_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
+ axutil_hash_set(element_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, &(element_impl->element));
- axis2_hash_set(element_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
+ axutil_hash_set(element_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
xml_schema_particle_resolve_methods(
@@ -933,7 +933,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_element_super_objs(
void *element,
const axutil_env_t *env)
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c Fri Mar 30 11:28:18 2007
@@ -16,7 +16,7 @@
*/
#include <xml_schema_enum.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_utils.h>
typedef struct xml_schema_enum_impl
@@ -32,7 +32,7 @@
xml_schema_types_t obj_type;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
axutil_array_list_t *values;
@@ -47,7 +47,7 @@
void *schema_enum,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_enum_super_objs(
void *schema_enum,
const axutil_env_t *env);
@@ -134,7 +134,7 @@
schema_enum_impl->schema_enum.ops->get_values =
xml_schema_enum_get_values;
- schema_enum_impl->ht_super = axis2_hash_make(env);
+ schema_enum_impl->ht_super = axutil_hash_make(env);
if (!schema_enum_impl->ht_super)
{
@@ -143,7 +143,7 @@
return NULL;
}
- axis2_hash_set(schema_enum_impl->ht_super, "XML_SCHEMA_ENUM",
+ axutil_hash_set(schema_enum_impl->ht_super, "XML_SCHEMA_ENUM",
AXIS2_HASH_KEY_STRING, &(schema_enum_impl->schema_enum));
xml_schema_enum_set_value(&(schema_enum_impl->schema_enum),
@@ -174,7 +174,7 @@
if (schema_enum_impl->ht_super)
{
- axis2_hash_free(schema_enum_impl->ht_super, env);
+ axutil_hash_free(schema_enum_impl->ht_super, env);
schema_enum_impl->ht_super = NULL;
}
@@ -192,7 +192,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_enum_super_objs(
void *schema_enum,
const axutil_env_t *env)
@@ -265,10 +265,10 @@
const axutil_env_t *env)
{
xml_schema_enum_impl_t *schema_enum_impl = NULL;
- axis2_hash_t *ht_super = NULL;
+ axutil_hash_t *ht_super = NULL;
ht_super = XML_SCHEMA_ENUM_SUPER_OBJS(schema_enum, env);
- schema_enum_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
+ schema_enum_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super,
"XML_SCHEMA_ENUM", AXIS2_HASH_KEY_STRING));
return schema_enum_impl->value;
@@ -280,11 +280,11 @@
const axis2_char_t *value)
{
xml_schema_enum_impl_t *schema_enum_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
/** TODO fix this method to match the list of values
in sub class with 'value' */
super = XML_SCHEMA_ENUM_SUPER_OBJS(schema_enum, env);
- schema_enum_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
+ schema_enum_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super,
"XML_SCHEMA_ENUM", AXIS2_HASH_KEY_STRING));
if (schema_enum_impl->value)
@@ -307,10 +307,10 @@
void *obj)
{
xml_schema_enum_impl_t *schema_enum_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_ENUM_SUPER_OBJS(schema_enum, env);
- schema_enum_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
+ schema_enum_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super,
"XML_SCHEMA_ENUM", AXIS2_HASH_KEY_STRING));
@@ -323,10 +323,10 @@
const axutil_env_t *env)
{
xml_schema_enum_impl_t *schema_enum_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_ENUM_SUPER_OBJS(schema_enum, env);
- schema_enum_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
+ schema_enum_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super,
"XML_SCHEMA_ENUM", AXIS2_HASH_KEY_STRING));
return schema_enum_impl->values;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.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;
axis2_char_t *schema_location;
@@ -51,7 +51,7 @@
xml_schema_external_get_base_impl(void *external,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_external_super_objs(void *external,
const axutil_env_t *env);
@@ -129,7 +129,7 @@
external_impl->external.ops->set_schema_location =
xml_schema_external_set_schema_location;
- external_impl->ht_super = axis2_hash_make(env);
+ external_impl->ht_super = axutil_hash_make(env);
if (!external_impl->ht_super)
{
@@ -146,11 +146,11 @@
return NULL;
}
- axis2_hash_set(external_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_EXTERNAL"),
+ axutil_hash_set(external_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_EXTERNAL"),
AXIS2_HASH_KEY_STRING, &(external_impl->external));
- axis2_hash_set(external_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
+ axutil_hash_set(external_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, external_impl->annotated);
- axis2_hash_set(external_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
+ axutil_hash_set(external_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(external_impl->annotated, env));
@@ -183,7 +183,7 @@
if (external_impl->ht_super)
{
- axis2_hash_free(external_impl->ht_super, env);
+ axutil_hash_free(external_impl->ht_super, env);
external_impl->ht_super = NULL;
}
if (external_impl->annotated)
@@ -259,13 +259,13 @@
const axutil_env_t *env)
{
xml_schema_external_impl_t *ext_impl = NULL;
- axis2_hash_t *ht_super = NULL;
+ axutil_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, NULL);
ht_super = XML_SCHEMA_EXTERNAL_SUPER_OBJS(external, env);
if (ht_super)
{
- ext_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
+ ext_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super,
"XML_SCHEMA_EXTERNAL", AXIS2_HASH_KEY_STRING));
if (!ext_impl)
return NULL;
@@ -279,13 +279,13 @@
xml_schema_t *schema)
{
xml_schema_external_impl_t *ext_impl = NULL;
- axis2_hash_t *ht_super = NULL;
+ axutil_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
ht_super = XML_SCHEMA_EXTERNAL_SUPER_OBJS(external, env);
if (ht_super)
{
- ext_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
+ ext_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super,
"XML_SCHEMA_EXTERNAL", AXIS2_HASH_KEY_STRING));
if (!ext_impl)
return AXIS2_FAILURE;
@@ -301,7 +301,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_external_super_objs(void *external,
const axutil_env_t *env)
{
@@ -320,13 +320,13 @@
const axutil_env_t *env)
{
xml_schema_external_impl_t *ext_impl = NULL;
- axis2_hash_t *ht_super = NULL;
+ axutil_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, NULL);
ht_super = XML_SCHEMA_EXTERNAL_SUPER_OBJS(external, env);
if (ht_super)
{
- ext_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
+ ext_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super,
"XML_SCHEMA_EXTERNAL", AXIS2_HASH_KEY_STRING));
if (!ext_impl)
return NULL;
@@ -340,14 +340,14 @@
axis2_char_t* location)
{
xml_schema_external_impl_t *ext_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, location, AXIS2_FAILURE);
ht_super = XML_SCHEMA_EXTERNAL_SUPER_OBJS(external, env);
if (ht_super)
{
- ext_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
+ ext_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super,
"XML_SCHEMA_EXTERNAL", AXIS2_HASH_KEY_STRING));
if (!ext_impl)
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
int obj_type;
-axis2_hash_t* ht_super;
+axutil_hash_t* ht_super;
axis2_char_t *value;
};
@@ -85,7 +85,7 @@
void *facet,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_facet_super_objs(
void *facet,
const axutil_env_t *env);
@@ -152,17 +152,17 @@
return NULL;
}
- facet_impl->ht_super = axis2_hash_make(env);
+ facet_impl->ht_super = axutil_hash_make(env);
if (!facet_impl->ht_super)
{
xml_schema_facet_free(&(facet_impl->facet), env);
return NULL;
}
- axis2_hash_set(facet_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_FACET"),
+ axutil_hash_set(facet_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_FACET"),
AXIS2_HASH_KEY_STRING, &(facet_impl->facet));
- axis2_hash_set(facet_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
+ axutil_hash_set(facet_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, facet_impl->annotated);
- axis2_hash_set(facet_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
+ axutil_hash_set(facet_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(
facet_impl->annotated, env));
@@ -376,7 +376,7 @@
return AXIS2_INTF_TO_IMPL(facet)->obj_type;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_facet_super_objs(void *facet,
const axutil_env_t *env)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
xml_schema_types_t obj_type;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
axutil_array_list_t *members;
@@ -46,7 +46,7 @@
void *form,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_form_super_objs(
void *form,
const axutil_env_t *env);
@@ -65,7 +65,7 @@
xml_schema_form_t *form,
const axutil_env_t *env,
xml_schema_form_t *form_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
axutil_array_list_t *AXIS2_CALL
xml_schema_form_get_values(void *form,
@@ -144,7 +144,7 @@
return NULL;
}
- form_impl->ht_super = axis2_hash_make(env);
+ form_impl->ht_super = axutil_hash_make(env);
if (!form_impl->ht_super)
{
@@ -154,10 +154,10 @@
return NULL;
}
- axis2_hash_set(form_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_FORM"),
+ axutil_hash_set(form_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_FORM"),
AXIS2_HASH_KEY_STRING, &(form_impl->form));
- axis2_hash_set(form_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ENUM"),
+ axutil_hash_set(form_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ENUM"),
AXIS2_HASH_KEY_STRING, form_impl->schema_enum);
status = xml_schema_enum_resolve_methods(
@@ -199,7 +199,7 @@
if (form_impl->ht_super)
{
- axis2_hash_free(form_impl->ht_super, env);
+ axutil_hash_free(form_impl->ht_super, env);
form_impl->ht_super = NULL;
}
@@ -229,7 +229,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_form_super_objs(void *form,
const axutil_env_t *env)
{
@@ -268,10 +268,10 @@
const axutil_env_t *env)
{
xml_schema_form_impl_t *form_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_FORM_SUPER_OBJS(form, env);
- form_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
+ form_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super,
"XML_SCHEMA_FORM", AXIS2_HASH_KEY_STRING));
return form_impl->members;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
xml_schema_group_t group;
xml_schema_annotated_t *annotated;
xml_schema_types_t obj_type;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
axis2_char_t *name;
xml_schema_group_base_t *particle;
};
@@ -42,7 +42,7 @@
void *group,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_group_super_objs(
void *group,
const axutil_env_t *env);
@@ -129,18 +129,18 @@
xml_schema_group_free(&(group_impl->group), env);
return NULL;
}
- group_impl->ht_super = axis2_hash_make(env);
+ group_impl->ht_super = axutil_hash_make(env);
if (!group_impl->ht_super)
{
xml_schema_group_free(&(group_impl->group), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(group_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_GROUP"), AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(group_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_GROUP"), AXIS2_HASH_KEY_STRING,
&(group_impl->group));
- axis2_hash_set(group_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(group_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING,
group_impl->annotated);
- axis2_hash_set(group_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(group_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(group_impl->annotated, env));
@@ -175,7 +175,7 @@
if (group_impl->ht_super)
{
- axis2_hash_free(group_impl->ht_super, env);
+ axutil_hash_free(group_impl->ht_super, env);
group_impl->ht_super = NULL;
}
@@ -201,7 +201,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_group_super_objs(void *group,
const axutil_env_t *env)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.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_obj_collection_t *items;
};
@@ -47,7 +47,7 @@
void *group_base,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_group_base_super_objs(
void *group_base,
const axutil_env_t *env);
@@ -130,25 +130,25 @@
return NULL;
}
- group_base_impl->ht_super = axis2_hash_make(env);
+ group_base_impl->ht_super = axutil_hash_make(env);
if (!group_base_impl->ht_super)
{
xml_schema_group_base_free(&(group_base_impl->group_base), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_GROUP_BASE"),
+ axutil_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_GROUP_BASE"),
AXIS2_HASH_KEY_STRING, &(group_base_impl->group_base));
- axis2_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
+ axutil_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
AXIS2_HASH_KEY_STRING, group_base_impl->particle);
annotated = XML_SCHEMA_PARTICLE_GET_BASE_IMPL(group_base_impl->particle, env);
if (annotated)
{
- axis2_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
+ axutil_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
- axis2_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
+ axutil_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
@@ -208,7 +208,7 @@
if (group_base_impl->ht_super)
{
- axis2_hash_free(group_base_impl->ht_super, env);
+ axutil_hash_free(group_base_impl->ht_super, env);
group_base_impl->ht_super = NULL;
}
@@ -236,7 +236,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_group_base_super_objs(
void *group_base,
const axutil_env_t *env)
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c Fri Mar 30 11:28:18 2007
@@ -34,7 +34,7 @@
xml_schema_types_t obj_type;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
axis2_qname_t *ref_qname;
@@ -49,7 +49,7 @@
void *group_ref,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_group_ref_super_objs(
void *group_ref,
const axutil_env_t *env);
@@ -148,7 +148,7 @@
xml_schema_group_ref_free(&(group_ref_impl->group_ref), env);
return NULL;
}
- group_ref_impl->ht_super = axis2_hash_make(env);
+ group_ref_impl->ht_super = axutil_hash_make(env);
if (!group_ref_impl->ht_super)
{
xml_schema_group_ref_free(&(group_ref_impl->group_ref), env);
@@ -156,19 +156,19 @@
return NULL;
}
- axis2_hash_set(group_ref_impl->ht_super,
+ axutil_hash_set(group_ref_impl->ht_super,
axis2_strdup(env, "XML_SCHEMA_GROUP_REF"),
AXIS2_HASH_KEY_STRING, &(group_ref_impl->group_ref));
- axis2_hash_set(group_ref_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
+ axutil_hash_set(group_ref_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
AXIS2_HASH_KEY_STRING, group_ref_impl->particle);
annotated = XML_SCHEMA_PARTICLE_GET_BASE_IMPL(group_ref_impl->particle, env);
if (annotated)
{
- axis2_hash_set(group_ref_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
+ axutil_hash_set(group_ref_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
- axis2_hash_set(group_ref_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
+ axutil_hash_set(group_ref_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
@@ -204,7 +204,7 @@
if (group_ref_impl->ht_super)
{
- axis2_hash_free(group_ref_impl->ht_super, env);
+ axutil_hash_free(group_ref_impl->ht_super, env);
group_ref_impl->ht_super = NULL;
}
@@ -229,7 +229,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_group_ref_super_objs(
void *group_ref,
const axutil_env_t *env)
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c Fri Mar 30 11:28:18 2007
@@ -37,7 +37,7 @@
/** keyref field */
axis2_qname_t *refer;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
xml_schema_types_t obj_type;
};
@@ -58,7 +58,7 @@
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_identity_constraint_super_objs(void *id_constr,
const axutil_env_t *env);
axis2_qname_t* AXIS2_CALL
@@ -148,7 +148,7 @@
id_cns_impl->id_constr.ops->set_selector =
xml_schema_identity_constraint_set_selector;
- id_cns_impl->ht_super = axis2_hash_make(env);
+ id_cns_impl->ht_super = axutil_hash_make(env);
if (!id_cns_impl->ht_super)
{
@@ -164,11 +164,11 @@
return NULL;
}
- axis2_hash_set(id_cns_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_IDENTITY_CONSTRAINT"),
+ axutil_hash_set(id_cns_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_IDENTITY_CONSTRAINT"),
AXIS2_HASH_KEY_STRING, &(id_cns_impl->id_constr));
- axis2_hash_set(id_cns_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
+ axutil_hash_set(id_cns_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, id_cns_impl->annotated);
- axis2_hash_set(id_cns_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
+ axutil_hash_set(id_cns_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(id_cns_impl->annotated, env));
status = xml_schema_annotated_resolve_methods(
@@ -240,7 +240,7 @@
if (id_cns_impl->ht_super)
{
- axis2_hash_free(id_cns_impl->ht_super, env);
+ axutil_hash_free(id_cns_impl->ht_super, env);
id_cns_impl->ht_super = NULL;
}
if (id_cns_impl->refer)
@@ -291,7 +291,7 @@
xml_schema_identity_constraint_t *id_constr,
const axutil_env_t *env,
xml_schema_identity_constraint_t *id_cns_impl,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
xml_schema_identity_constraint_impl_t *identity_constraint_impl_l = NULL;
@@ -308,7 +308,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- id_constr->ops->free = axis2_hash_get(methods, "free",
+ id_constr->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
id_constr->ops->get_base_impl =
identity_constraint_impl_l->id_constr.ops->get_base_impl;
@@ -398,7 +398,7 @@
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_identity_constraint_super_objs(void *id_constr,
const axutil_env_t *env)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c Fri Mar 30 11:28:18 2007
@@ -29,7 +29,7 @@
axis2_char_t *ns;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
xml_schema_types_t obj_type;
@@ -53,7 +53,7 @@
xml_schema_import_get_type(void *import,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_import_super_objs(void *import,
const axutil_env_t *env);
axis2_char_t* AXIS2_CALL
@@ -111,7 +111,7 @@
import_impl->import.ops->set_namespace =
xml_schema_import_set_namespace;
- import_impl->ht_super = axis2_hash_make(env);
+ import_impl->ht_super = axutil_hash_make(env);
if (!import_impl->ht_super)
{
xml_schema_import_free(&(import_impl->import), env);
@@ -127,18 +127,18 @@
return NULL;
}
- axis2_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_IMPORT"),
+ axutil_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_IMPORT"),
AXIS2_HASH_KEY_STRING, &(import_impl->import));
- axis2_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_EXTERNAL"),
+ axutil_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_EXTERNAL"),
AXIS2_HASH_KEY_STRING, import_impl->external);
annotated = XML_SCHEMA_EXTERNAL_GET_BASE_IMPL(import_impl->external, env);
if (annotated)
{
- axis2_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
+ axutil_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
- axis2_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
+ axutil_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
@@ -162,7 +162,7 @@
if (import_impl->ht_super)
{
- axis2_hash_free(import_impl->ht_super, env);
+ axutil_hash_free(import_impl->ht_super, env);
import_impl->ht_super = NULL;
}
if (import_impl->external)
@@ -230,7 +230,7 @@
return AXIS2_INTF_TO_IMPL(import)->obj_type;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_import_super_objs(void *import,
const axutil_env_t *env)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c Fri Mar 30 11:28:18 2007
@@ -16,7 +16,7 @@
*/
#include <xml_schema_obj.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_utils.h>
/**
@@ -28,13 +28,13 @@
xml_schema_types_t obj_type;
- axis2_hash_t *ht_super;
+ axutil_hash_t *ht_super;
int line_num;
int line_pos;
- axis2_hash_t *meta_info_map;
+ axutil_hash_t *meta_info_map;
axis2_char_t *source_uri;
@@ -51,7 +51,7 @@
void *obj,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_obj_super_objs(
void *obj,
const axutil_env_t *env);
@@ -107,7 +107,7 @@
axis2_char_t *key,
void *value);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_obj_get_meta_info(
void *obj,
const axutil_env_t *env);
@@ -170,14 +170,14 @@
obj_impl->obj.ops->add_meta_info =
xml_schema_obj_add_meta_info;
- obj_impl->ht_super = axis2_hash_make(env);
+ obj_impl->ht_super = axutil_hash_make(env);
if (!obj_impl->ht_super)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(obj_impl->ht_super, "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(obj_impl->ht_super, "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING,
&(obj_impl->obj));
return &(obj_impl->obj);
@@ -200,7 +200,7 @@
if (obj_impl->ht_super)
{
- axis2_hash_free(obj_impl->ht_super, env);
+ axutil_hash_free(obj_impl->ht_super, env);
obj_impl->ht_super = NULL;
}
@@ -218,7 +218,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
xml_schema_obj_super_objs(void *obj,
const axutil_env_t *env)
{
@@ -294,12 +294,12 @@
const axutil_env_t *env)
{
xml_schema_obj_impl_t *obj_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_OBJ_SUPER_OBJS(obj, env);
if (super)
{
- obj_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
+ obj_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super,
"XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING));
if (obj_impl)
return obj_impl->line_num;
@@ -313,12 +313,12 @@
int line_num)
{
xml_schema_obj_impl_t *obj_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_OBJ_SUPER_OBJS(obj, env);
if (super)
{
- obj_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super, "XML_SCHEMA_OBJ",
+ obj_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super, "XML_SCHEMA_OBJ",
AXIS2_HASH_KEY_STRING));
}
else
@@ -335,12 +335,12 @@
const axutil_env_t *env)
{
xml_schema_obj_impl_t *obj_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_OBJ_SUPER_OBJS(obj, env);
if (super)
{
- obj_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super, "XML_SCHEMA_OBJ",
+ obj_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super, "XML_SCHEMA_OBJ",
AXIS2_HASH_KEY_STRING));
}
return obj_impl->line_pos;
@@ -352,12 +352,12 @@
int line_pos)
{
xml_schema_obj_impl_t *obj_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_OBJ_SUPER_OBJS(obj, env);
if (super)
{
- obj_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super, "XML_SCHEMA_OBJ",
+ obj_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super, "XML_SCHEMA_OBJ",
AXIS2_HASH_KEY_STRING));
if (obj_impl)
obj_impl->line_pos = line_pos;
@@ -370,9 +370,9 @@
const axutil_env_t *env)
{
xml_schema_obj_impl_t *obj_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_OBJ_SUPER_OBJS(obj, env);
- obj_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super, "XML_SCHEMA_OBJ",
+ obj_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super, "XML_SCHEMA_OBJ",
AXIS2_HASH_KEY_STRING));
return obj_impl->source_uri;
}
@@ -383,10 +383,10 @@
axis2_char_t *source_uri)
{
xml_schema_obj_impl_t *obj_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_OBJ_SUPER_OBJS(obj, env);
- obj_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super, "XML_SCHEMA_OBJ",
+ obj_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super, "XML_SCHEMA_OBJ",
AXIS2_HASH_KEY_STRING));
if (obj_impl->source_uri)
@@ -405,10 +405,10 @@
void *obj_comp)
{
xml_schema_obj_impl_t *obj_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
super = XML_SCHEMA_OBJ_SUPER_OBJS(obj, env);
- obj_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super, "XML_SCHEMA_OBJ",
+ obj_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(super, "XML_SCHEMA_OBJ",
AXIS2_HASH_KEY_STRING));
/****
TODO
@@ -424,22 +424,22 @@
void *value)
{
xml_schema_obj_impl_t *obj_impl = NULL;
- axis2_hash_t *ht_super = NULL;
+ axutil_hash_t *ht_super = NULL;
ht_super = XML_SCHEMA_OBJ_SUPER_OBJS(obj, env);
if (ht_super)
{
- obj_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, "XML_SCHEMA_OBJ",
+ obj_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_OBJ",
AXIS2_HASH_KEY_STRING));
if (!obj_impl->meta_info_map)
{
- obj_impl->meta_info_map = axis2_hash_make(env);
+ obj_impl->meta_info_map = axutil_hash_make(env);
if (!obj_impl->meta_info_map)
{
AXIS2_ERROR_SET((env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- axis2_hash_set(obj_impl->meta_info_map, key, AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(obj_impl->meta_info_map, key, AXIS2_HASH_KEY_STRING,
value);
}
return AXIS2_SUCCESS;
@@ -447,16 +447,16 @@
return AXIS2_FAILURE;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
xml_schema_obj_get_meta_info(void *obj,
const axutil_env_t *env)
{
xml_schema_obj_impl_t *obj_impl = NULL;
- axis2_hash_t *ht_super = NULL;
+ axutil_hash_t *ht_super = NULL;
ht_super = XML_SCHEMA_OBJ_SUPER_OBJS(obj, env);
if (ht_super)
{
- obj_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super, "XML_SCHEMA_OBJ",
+ obj_impl = AXIS2_INTF_TO_IMPL(axutil_hash_get(ht_super, "XML_SCHEMA_OBJ",
AXIS2_HASH_KEY_STRING));
return obj_impl->meta_info_map;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c Fri Mar 30 11:28:18 2007
@@ -16,7 +16,7 @@
*/
#include <xml_schema_obj_collection.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_utils.h>
typedef struct xml_schema_obj_collection_impl
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org