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 di...@apache.org on 2007/03/17 08:52:55 UTC
svn commit: r519259 [2/2] - in /webservices/axis2/trunk/c/xml_schema: src/
test/
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=519259&r1=519258&r2=519259
==============================================================================
--- 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 Sat Mar 17 00:52:53 2007
@@ -164,11 +164,11 @@
return NULL;
}
- axis2_hash_set(id_cns_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_IDENTITY_CONSTRAINT", env),
+ axis2_hash_set(id_cns_impl->ht_super, axis2_strdup("XML_SCHEMA_IDENTITY_CONSTRAINT", env),
AXIS2_HASH_KEY_STRING, &(id_cns_impl->id_constr));
- axis2_hash_set(id_cns_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(id_cns_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, id_cns_impl->annotated);
- axis2_hash_set(id_cns_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(id_cns_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(id_cns_impl->annotated, env));
status = xml_schema_annotated_resolve_methods(
@@ -245,7 +245,7 @@
}
if (id_cns_impl->refer)
{
- AXIS2_QNAME_FREE(id_cns_impl->refer, env);
+ axis2_qname_free(id_cns_impl->refer, env);
id_cns_impl->refer = NULL;
}
if (id_cns_impl->annotated)
@@ -357,7 +357,7 @@
AXIS2_FREE(env->allocator, id_cns_impl->name);
id_cns_impl->name = NULL;
}
- id_cns_impl->name = AXIS2_STRDUP(name, env);
+ id_cns_impl->name = axis2_strdup(name, env);
if (!id_cns_impl->name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -423,7 +423,7 @@
if (id_cns_impl->refer)
{
/*
- AXIS2_QNAME_FREE(id_cns_impl->reref, env);
+ axis2_qname_free(id_cns_impl->reref, env);
id_cns_impl->reref = NULL;
*/
}
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=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c Sat Mar 17 00:52:53 2007
@@ -127,18 +127,18 @@
return NULL;
}
- axis2_hash_set(import_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_IMPORT", env),
+ axis2_hash_set(import_impl->ht_super, axis2_strdup("XML_SCHEMA_IMPORT", env),
AXIS2_HASH_KEY_STRING, &(import_impl->import));
- axis2_hash_set(import_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_EXTERNAL", env),
+ axis2_hash_set(import_impl->ht_super, axis2_strdup("XML_SCHEMA_EXTERNAL", env),
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("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(import_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, annotated);
- axis2_hash_set(import_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(import_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_input_source.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_input_source.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_input_source.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_input_source.c Sat Mar 17 00:52:53 2007
@@ -131,7 +131,7 @@
input_source_impl = AXIS2_INTF_TO_IMPL(input_source);
- input_source_impl->system_id = AXIS2_STRDUP(id, env);
+ input_source_impl->system_id = axis2_strdup(id, env);
return &(input_source_impl->input_source);
}
@@ -184,7 +184,7 @@
AXIS2_FREE(env->allocator, input_source->system_id);
input_source->system_id = NULL;
}
- input_source->system_id = AXIS2_STRDUP(system_id, env);
+ input_source->system_id = axis2_strdup(system_id, env);
return AXIS2_SUCCESS;
}
@@ -211,7 +211,7 @@
AXIS2_FREE(env->allocator, input_source->public_id);
input_source->public_id = NULL;
}
- input_source->public_id = AXIS2_STRDUP(public_id, env);
+ input_source->public_id = axis2_strdup(public_id, env);
return AXIS2_SUCCESS;
}
@@ -228,7 +228,7 @@
AXIS2_FREE(env->allocator, input_source->encoing);
input_source->encoing = NULL;
}
- input_source->encoing = AXIS2_STRDUP(encoding, env);
+ input_source->encoing = axis2_strdup(encoding, env);
return AXIS2_SUCCESS;
}
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=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c Sat Mar 17 00:52:53 2007
@@ -394,7 +394,7 @@
AXIS2_FREE(env->allocator, obj_impl->source_uri);
obj_impl->source_uri = NULL;
}
- obj_impl->source_uri = AXIS2_STRDUP(source_uri, env);
+ obj_impl->source_uri = axis2_strdup(source_uri, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c Sat Mar 17 00:52:53 2007
@@ -214,7 +214,7 @@
obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
- name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)qname, env);
+ name = axis2_qname_to_string((axis2_qname_t *)qname, env);
if (name)
{
return axis2_hash_get(obj_table_impl->collection, name,
@@ -305,7 +305,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
- name = AXIS2_QNAME_TO_STRING(qname, env);
+ name = axis2_qname_to_string(qname, env);
if (name)
{
value = axis2_hash_get(obj_table_impl->collection, name,
@@ -330,7 +330,7 @@
AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
- name = AXIS2_QNAME_TO_STRING(qname, env);
+ name = axis2_qname_to_string(qname, env);
if (name)
{
axis2_hash_set(obj_table_impl->collection,
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c Sat Mar 17 00:52:53 2007
@@ -161,12 +161,12 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(particle_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_PARTICLE", env), AXIS2_HASH_KEY_STRING,
+ axis2_hash_set(particle_impl->ht_super, axis2_strdup("XML_SCHEMA_PARTICLE", env), AXIS2_HASH_KEY_STRING,
&(particle_impl->particle));
- axis2_hash_set(particle_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env), AXIS2_HASH_KEY_STRING,
+ axis2_hash_set(particle_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env), AXIS2_HASH_KEY_STRING,
particle_impl->annotated);
- axis2_hash_set(particle_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_OBJ", env), AXIS2_HASH_KEY_STRING,
+ axis2_hash_set(particle_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env), AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(particle_impl->annotated, env));
status = xml_schema_annotated_resolve_methods(
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c Sat Mar 17 00:52:53 2007
@@ -158,9 +158,9 @@
}
- axis2_hash_set(redefine_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_REDEFINE", env),
+ axis2_hash_set(redefine_impl->ht_super, axis2_strdup("XML_SCHEMA_REDEFINE", env),
AXIS2_HASH_KEY_STRING, &(redefine_impl->redefine));
- axis2_hash_set(redefine_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_EXTERNAL", env),
+ axis2_hash_set(redefine_impl->ht_super, axis2_strdup("XML_SCHEMA_EXTERNAL", env),
AXIS2_HASH_KEY_STRING, redefine_impl->external);
annotated = XML_SCHEMA_EXTERNAL_GET_BASE_IMPL(redefine_impl->external, env);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c Sat Mar 17 00:52:53 2007
@@ -132,13 +132,13 @@
xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env);
return NULL;
}
- axis2_hash_set(sim_cnt_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_SIMPLE_CONTENT", env),
+ axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup("XML_SCHEMA_SIMPLE_CONTENT", env),
AXIS2_HASH_KEY_STRING, &(sim_cnt_impl->sim_content));
- axis2_hash_set(sim_cnt_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, sim_cnt_impl->annotated);
- axis2_hash_set(sim_cnt_impl->ht_super, AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_cnt_impl->annotated, env));
@@ -243,9 +243,9 @@
AXIS2_ENV_CHECK(env, NULL);
sim_cnt_impl = AXIS2_INTF_TO_IMPL(sim_content);
- if (prefix && AXIS2_STRCMP(prefix, "") != 0 && strchr(prefix, ':') == NULL)
+ if (prefix && axis2_strcmp(prefix, "") != 0 && strchr(prefix, ':') == NULL)
{
- xml = AXIS2_STRACAT(prefix, ":", env);
+ xml = axis2_stracat(prefix, ":", env);
}
return xml;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c Sat Mar 17 00:52:53 2007
@@ -173,15 +173,15 @@
return NULL;
}
axis2_hash_set(sim_content_ext_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SIMPLE_CONTENT_EXTENSION", env),
+ axis2_strdup("XML_SCHEMA_SIMPLE_CONTENT_EXTENSION", env),
AXIS2_HASH_KEY_STRING, &(sim_content_ext_impl->sim_content_ext));
axis2_hash_set(sim_content_ext_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, (sim_content_ext_impl->annotated));
axis2_hash_set(sim_content_ext_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_content_ext_impl->annotated, env));
@@ -214,7 +214,7 @@
}
if (content_ext_impl->base_type_name)
{
- AXIS2_QNAME_FREE(content_ext_impl->base_type_name, env);
+ axis2_qname_free(content_ext_impl->base_type_name, env);
content_ext_impl->base_type_name = NULL;
}
if (content_ext_impl->annotated)
@@ -314,7 +314,7 @@
content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content);
if (content_ext_impl->base_type_name)
{
- AXIS2_QNAME_FREE(content_ext_impl->base_type_name, env);
+ axis2_qname_free(content_ext_impl->base_type_name, env);
content_ext_impl->base_type_name = NULL;
}
content_ext_impl->base_type_name = base_type_name;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c Sat Mar 17 00:52:53 2007
@@ -273,7 +273,7 @@
}
if (content_res_impl->base_type_name)
{
- AXIS2_QNAME_FREE(content_res_impl->base_type_name, env);
+ axis2_qname_free(content_res_impl->base_type_name, env);
content_res_impl->base_type_name = NULL;
}
if (content_res_impl->annotated)
@@ -368,7 +368,7 @@
content_res_impl = AXIS2_INTF_TO_IMPL(sim_content);
if (content_res_impl->base_type_name)
{
- AXIS2_QNAME_FREE(content_res_impl->base_type_name, env);
+ axis2_qname_free(content_res_impl->base_type_name, env);
content_res_impl->base_type_name = NULL;
}
content_res_impl->base_type_name = base_type_name;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c Sat Mar 17 00:52:53 2007
@@ -149,21 +149,21 @@
}
axis2_hash_set(simple_type->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SIMPLE_TYPE", env),
+ axis2_strdup("XML_SCHEMA_SIMPLE_TYPE", env),
AXIS2_HASH_KEY_STRING, &(simple_type->simple_type));
axis2_hash_set(simple_type->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_TYPE", env),
+ axis2_strdup("XML_SCHEMA_TYPE", env),
AXIS2_HASH_KEY_STRING, simple_type->schema_type);
annotated = XML_SCHEMA_TYPE_GET_BASE_IMPL(simple_type->schema_type, env);
if (annotated)
{
axis2_hash_set(simple_type->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, annotated);
axis2_hash_set(simple_type->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c Sat Mar 17 00:52:53 2007
@@ -115,15 +115,15 @@
}
axis2_hash_set(sim_type_cont_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
+ axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
AXIS2_HASH_KEY_STRING, &(sim_type_cont_impl->sim_type_cont));
axis2_hash_set(sim_type_cont_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, sim_type_cont_impl->annotated);
axis2_hash_set(sim_type_cont_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_type_cont_impl->annotated, env));
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c Sat Mar 17 00:52:53 2007
@@ -155,11 +155,11 @@
}
axis2_hash_set(simple_type_list_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SIMPLE_TYPE_LIST", env),
+ axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_LIST", env),
AXIS2_HASH_KEY_STRING, &(simple_type_list_impl->simple_type_list));
axis2_hash_set(simple_type_list_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
+ axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
AXIS2_HASH_KEY_STRING, &(simple_type_list_impl->sim_type_content));
annotated = XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
@@ -167,11 +167,11 @@
if (annotated)
{
axis2_hash_set(simple_type_list_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, annotated);
axis2_hash_set(simple_type_list_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
@@ -332,7 +332,7 @@
sim_type_res_impl = AXIS2_INTF_TO_IMPL(simple_type_list);
if (sim_type_res_impl->item_type_name)
{
- AXIS2_QNAME_FREE(sim_type_res_impl->item_type_name, env);
+ axis2_qname_free(sim_type_res_impl->item_type_name, env);
sim_type_res_impl->item_type_name = NULL;
}
sim_type_res_impl->item_type_name = item_type_name;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c Sat Mar 17 00:52:53 2007
@@ -168,12 +168,12 @@
}
axis2_hash_set(simple_type_restriction_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SIMPLE_TYPE_RESTRICTION", env),
+ axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_RESTRICTION", env),
AXIS2_HASH_KEY_STRING, &(simple_type_restriction_impl->simple_type_restriction));
axis2_hash_set(simple_type_restriction_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
+ axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
AXIS2_HASH_KEY_STRING, simple_type_restriction_impl->sim_type_content);
annotated = XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
@@ -182,11 +182,11 @@
if (annotated)
{
axis2_hash_set(simple_type_restriction_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, annotated);
axis2_hash_set(simple_type_restriction_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
@@ -354,7 +354,7 @@
sim_type_res_impl = AXIS2_INTF_TO_IMPL(simple_type_restriction);
if (sim_type_res_impl->base_type_name)
{
- AXIS2_QNAME_FREE(sim_type_res_impl->base_type_name, env);
+ axis2_qname_free(sim_type_res_impl->base_type_name, env);
sim_type_res_impl->base_type_name = NULL;
}
sim_type_res_impl->base_type_name = base_type_name;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c Sat Mar 17 00:52:53 2007
@@ -180,11 +180,11 @@
axis2_hash_set(simple_type_union_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SIMPLE_TYPE_UNION", env),
+ axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_UNION", env),
AXIS2_HASH_KEY_STRING, &(simple_type_union_impl->simple_type_union));
axis2_hash_set(simple_type_union_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
+ axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
AXIS2_HASH_KEY_STRING,
simple_type_union_impl->sim_type_content);
@@ -194,11 +194,11 @@
if (annotated)
{
axis2_hash_set(simple_type_union_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, annotated);
axis2_hash_set(simple_type_union_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
@@ -338,7 +338,7 @@
sim_type_res_impl->member_types_source = NULL;
}
- sim_type_res_impl->member_types_source = AXIS2_STRDUP(member_types_source, env);
+ sim_type_res_impl->member_types_source = axis2_strdup(member_types_source, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c Sat Mar 17 00:52:53 2007
@@ -227,15 +227,15 @@
return NULL;
}
axis2_hash_set(type_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_TYPE", env),
+ axis2_strdup("XML_SCHEMA_TYPE", env),
AXIS2_HASH_KEY_STRING, &(type_impl->type));
axis2_hash_set(type_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING, type_impl->annotated);
axis2_hash_set(type_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(type_impl->annotated, env));
@@ -259,7 +259,7 @@
type_impl = AXIS2_INTF_TO_IMPL(type);
if (type_impl->qname)
{
- AXIS2_QNAME_FREE(type_impl->qname, env);
+ axis2_qname_free(type_impl->qname, env);
type_impl->qname = NULL;
}
@@ -552,7 +552,7 @@
AXIS2_FREE(env->allocator, type_impl->name);
type_impl->name = NULL;
}
- type_impl->name = AXIS2_STRDUP(name, env);
+ type_impl->name = axis2_strdup(name, env);
if (!type_impl->name)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c Sat Mar 17 00:52:53 2007
@@ -59,8 +59,8 @@
uri2 = axis2_uri_parse_relative(env, uri1, schema_location);
if (uri2)
{
- ref = AXIS2_URI_TO_STRING(uri2, env, 1);
- /* AXIS2_URI_FREE(uri2, env); */
+ ref = axis2_uri_to_string(uri2, env, 1);
+ /* axis2_uri_free(uri2, env); */
return xml_schema_input_source_create_with_system_id(env, ref);
}
}
@@ -88,15 +88,15 @@
axis2_char_t *final_path = NULL;
if (!path)
return NULL;
- modified_path = AXIS2_STRDUP(path, env);
- AXIS2_REPLACE(env, modified_path, '\\', '/');
+ modified_path = axis2_strdup(path, env);
+ axis2_replace(env, modified_path, '\\', '/');
if (strncmp(modified_path, "/", 1) == 0)
{
- final_path = AXIS2_STRACAT("file://", modified_path, env);
+ final_path = axis2_stracat("file://", modified_path, env);
}
else
{
- final_path = AXIS2_STRACAT("file:///", modified_path, env);
+ final_path = axis2_stracat("file:///", modified_path, env);
}
if (modified_path)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c Sat Mar 17 00:52:53 2007
@@ -109,13 +109,13 @@
if (!use_impl->members)
return NULL;
axis2_array_list_add(use_impl->members, env,
- AXIS2_STRDUP(XML_SCHEMA_CONST_NONE, env));
+ axis2_strdup(XML_SCHEMA_CONST_NONE, env));
axis2_array_list_add(use_impl->members, env,
- AXIS2_STRDUP(XML_SCHEMA_CONST_OPTIONAL, env));
+ axis2_strdup(XML_SCHEMA_CONST_OPTIONAL, env));
axis2_array_list_add(use_impl->members, env,
- AXIS2_STRDUP(XML_SCHEMA_CONST_PROHIBITED, env));
+ axis2_strdup(XML_SCHEMA_CONST_PROHIBITED, env));
axis2_array_list_add(use_impl->members, env,
- AXIS2_STRDUP(XML_SCHEMA_CONST_REQUIRED, env));
+ axis2_strdup(XML_SCHEMA_CONST_REQUIRED, env));
use_impl->schema_enum = xml_schema_enum_create(env, value);
@@ -126,12 +126,12 @@
return NULL;
}
axis2_hash_set(use_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_USE", env),
+ axis2_strdup("XML_SCHEMA_USE", env),
AXIS2_HASH_KEY_STRING,
&(use_impl->use));
axis2_hash_set(use_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ENUM", env),
+ axis2_strdup("XML_SCHEMA_ENUM", env),
AXIS2_HASH_KEY_STRING,
use_impl->schema_enum);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c Sat Mar 17 00:52:53 2007
@@ -101,16 +101,16 @@
}
axis2_hash_set(xpath_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_XPATH", env),
+ axis2_strdup("XML_SCHEMA_XPATH", env),
AXIS2_HASH_KEY_STRING,
&(xpath_impl->xpath));
axis2_hash_set(xpath_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup("XML_SCHEMA_ANNOTATED", env),
AXIS2_HASH_KEY_STRING,
xpath_impl->annotated);
axis2_hash_set(xpath_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_OBJ", env),
+ axis2_strdup("XML_SCHEMA_OBJ", env),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(xpath_impl->annotated, env));
@@ -231,7 +231,7 @@
AXIS2_FREE(env->allocator, xpath_impl->x_path);
xpath_impl->x_path = NULL;
}
- xpath_impl->x_path = AXIS2_STRDUP(x_path, env);
+ xpath_impl->x_path = axis2_strdup(x_path, env);
if (!xpath_impl->x_path)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c Sat Mar 17 00:52:53 2007
@@ -109,9 +109,9 @@
return NULL;
}
axis2_array_list_add(severity_type_impl->members, env,
- AXIS2_STRDUP(XML_SCHEMA_CONST_ERROR, env));
+ axis2_strdup(XML_SCHEMA_CONST_ERROR, env));
axis2_array_list_add(severity_type_impl->members, env,
- AXIS2_STRDUP(XML_SCHEMA_CONST_WARNING, env));
+ axis2_strdup(XML_SCHEMA_CONST_WARNING, env));
severity_type_impl->schema_enum = xml_schema_enum_create(env, value);
if (!severity_type_impl->schema_enum)
@@ -130,11 +130,11 @@
}
axis2_hash_set(severity_type_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_SEVERITY_TYPE", env),
+ axis2_strdup("XML_SCHEMA_SEVERITY_TYPE", env),
AXIS2_HASH_KEY_STRING, &(severity_type_impl->severity_type));
axis2_hash_set(severity_type_impl->ht_super,
- AXIS2_STRDUP("XML_SCHEMA_ENUM", env),
+ axis2_strdup("XML_SCHEMA_ENUM", env),
AXIS2_HASH_KEY_STRING, severity_type_impl->schema_enum);
status = xml_schema_enum_resolve_methods(
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c Sat Mar 17 00:52:53 2007
@@ -115,29 +115,29 @@
return NULL;
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("CDATA", env));
+ axis2_strdup("CDATA", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("IDREF", env));
+ axis2_strdup("IDREF", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("IDREFS", env));
+ axis2_strdup("IDREFS", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("ENTITY", env));
+ axis2_strdup("ENTITY", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("ENTITIES", env));
+ axis2_strdup("ENTITIES", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("NMTOKEN", env));
+ axis2_strdup("NMTOKEN", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("NMTOKENS", env));
+ axis2_strdup("NMTOKENS", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("NOTATION", env));
+ axis2_strdup("NOTATION", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("ENUMERATION", env));
+ axis2_strdup("ENUMERATION", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("QName", env));
+ axis2_strdup("QName", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("NCName", env));
+ axis2_strdup("NCName", env));
axis2_array_list_add(tokenized_type_impl->members, env,
- AXIS2_STRDUP("None", env));
+ axis2_strdup("None", env));
tokenized_type_impl->schema_enum = xml_schema_enum_create(env, value);
Modified: webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c?view=diff&rev=519259&r1=519258&r2=519259
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Sat Mar 17 00:52:53 2007
@@ -356,7 +356,7 @@
CuAssertPtrNotNull(tc, qn1);
- uri1 = AXIS2_QNAME_GET_URI(qn1, env);
+ uri1 = axis2_qname_get_uri(qn1, env);
CuAssertPtrNotNull(tc, uri1);
@@ -368,7 +368,7 @@
CuAssertPtrNotNull(tc, qn2);
- uri2 = AXIS2_QNAME_GET_URI(qn2, env);
+ uri2 = axis2_qname_get_uri(qn2, env);
CuAssertPtrNotNull(tc, uri2);
@@ -515,7 +515,7 @@
env = axis2_env_create_all("test.log", 1);
- reader = axiom_xml_reader_create_for_memory(env, xml, AXIS2_STRLEN(xml), NULL,
+ reader = axiom_xml_reader_create_for_memory(env, xml, axis2_strlen(xml), NULL,
AXIS2_XML_PARSER_TYPE_BUFFER);
builder = axiom_stax_builder_create(env, reader);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org