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 09:13:00 UTC
svn commit: r519261 [4/6] - in /webservices/axis2/trunk/c:
guththila/samples/ guththila/src/ rampart/samples/authn_provider/
rampart/samples/callback/ rampart/samples/callback/htpasswd_callback/
rampart/samples/client/sec_echo/ rampart/samples/omxmlsec...
Modified: webservices/axis2/trunk/c/tools/codegen/src/templates/c/CADBBeanTemplateSource.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/templates/c/CADBBeanTemplateSource.xsl?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/templates/c/CADBBeanTemplateSource.xsl (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/templates/c/CADBBeanTemplateSource.xsl Sat Mar 17 01:12:54 2007
@@ -322,11 +322,11 @@
</xsl:when>
<xsl:when test="$nativePropertyType='axis2_qname_t*'">
- AXIS2_QNAME_FREE( <xsl:value-of select="$attriName"/>, env );
+ axis2_qname_free( <xsl:value-of select="$attriName"/>, env );
</xsl:when>
<xsl:when test="$nativePropertyType='axis2_uri_t*'">
- AXIS2_URI_FREE( <xsl:value-of select="$attriName"/>, env );
+ axis2_uri_free( <xsl:value-of select="$attriName"/>, env );
</xsl:when>
<xsl:when test="$nativePropertyType='axis2_date_time_t*'">
@@ -357,7 +357,7 @@
<xsl:if test="not(@type)">
if(<xsl:value-of select="$name"/>_impl->qname )
{
- AXIS2_QNAME_FREE (<xsl:value-of select="$name"/>_impl->qname, env);
+ axis2_qname_free (<xsl:value-of select="$name"/>_impl->qname, env);
<xsl:value-of select="$name"/>_impl->qname = NULL;
}
</xsl:if>
@@ -472,7 +472,7 @@
<xsl:if test="position()=1">
current_element = AXIOM_NODE_GET_DATA_ELEMENT( parent, env);
qname = AXIOM_ELEMENT_GET_QNAME( current_element, env, parent);
- if ( AXIS2_QNAME_EQUALS( qname, env, <xsl:value-of select="$name"/>_impl-> qname ) )
+ if ( axis2_qname_equals( qname, env, <xsl:value-of select="$name"/>_impl-> qname ) )
{
first_node = AXIOM_NODE_GET_FIRST_CHILD( parent, env);
}
@@ -598,7 +598,7 @@
<!-- add axis2_char_t s -->
<xsl:when test="$nativePropertyType='axis2_char_t*'">
<xsl:value-of select="$axis2_capsname"/>_SET_<xsl:value-of select="$CapsCName"/>( <xsl:value-of select="$name"/>,
- env, AXIS2_STRDUP( attrib_text, env));
+ env, axis2_strdup( attrib_text, env));
</xsl:when>
<!-- add axis2_qname_t s -->
@@ -614,7 +614,7 @@
</xsl:when>
<!-- add axis2_bool_t s -->
<xsl:when test="$nativePropertyType='axis2_bool_t'">
- if ( !AXIS2_STRCMP( attrib_text, "TRUE") || !AXIS2_STRCMP( attrib_text, "true") )
+ if ( !axis2_strcmp( attrib_text, "TRUE") || !axis2_strcmp( attrib_text, "true") )
{
<xsl:value-of select="$axis2_capsname"/>_SET_<xsl:value-of select="$CapsCName"/>( <xsl:value-of select="$name"/>,
env, AXIS2_TRUE);
@@ -707,7 +707,7 @@
element_qname = axis2_qname_create( env, "<xsl:value-of select="$propertyName"/>", "<xsl:value-of select="@nsuri"/>", "<xsl:choose>
<xsl:when test="@prefix!=''"><xsl:value-of select="@prefix"/></xsl:when>
<xsl:when test="@nsuri=../@nsuri"><xsl:value-of select="../@nsprefix"/></xsl:when></xsl:choose>");
- if ( AXIS2_QNAME_EQUALS( element_qname, env, qname))
+ if ( axis2_qname_equals( element_qname, env, qname))
{
/** found the requried element */
break;
@@ -931,7 +931,7 @@
element_qname = axis2_qname_create( env, "<xsl:value-of select="$propertyName"/>", "<xsl:value-of select="@nsuri"/>","<xsl:choose>
<xsl:when test="@prefix!=''"><xsl:value-of select="@prefix"/></xsl:when>
<xsl:when test="@nsuri=../@nsuri"><xsl:value-of select="../@nsprefix"/></xsl:when></xsl:choose>");
- if ( AXIS2_QNAME_EQUALS( element_qname, env, qname) )
+ if ( axis2_qname_equals( element_qname, env, qname) )
{
if( sequence_broken)
{
@@ -1093,7 +1093,7 @@
element_qname = axis2_qname_create( env, "<xsl:value-of select="$propertyName"/>", "<xsl:value-of select="@nsuri"/>","<xsl:choose>
<xsl:when test="@prefix!=''"><xsl:value-of select="@prefix"/></xsl:when>
<xsl:when test="@nsuri=../@nsuri"><xsl:value-of select="../@nsprefix"/></xsl:when></xsl:choose>");
- if ( AXIS2_QNAME_EQUALS( element_qname, env, qname)
+ if ( axis2_qname_equals( element_qname, env, qname)
{
/** found the requried element */
element_found = 1;
@@ -1421,14 +1421,14 @@
<!-- add axis2_uri_t s -->
<xsl:when test="$nativePropertyType='axis2_uri_t*'">
- text_value = AXIS2_URI_TO_STRING(<xsl:value-of select="$attriName"/>, env, AXIS2_URI_UNP_OMITUSERINFO);
+ text_value = axis2_uri_to_string(<xsl:value-of select="$attriName"/>, env, AXIS2_URI_UNP_OMITUSERINFO);
text_attri = axiom_attribute_create (env, "<xsl:value-of select="$propertyName"/>", text_value, ns1);
AXIOM_ELEMENT_ADD_ATTRIBUTE (parent_element, env, text_attri, parent);
</xsl:when>
<!-- add axis2_qname_t s -->
<xsl:when test="$nativePropertyType='axis2_qname_t*'">
- text_value = AXIS2_QNAME_TO_STRING(<xsl:value-of select="$attriName"/>, env);
+ text_value = axis2_qname_to_string(<xsl:value-of select="$attriName"/>, env);
text_attri = axiom_attribute_create (env, "<xsl:value-of select="$propertyName"/>", text_value, ns1);
AXIOM_ELEMENT_ADD_ATTRIBUTE (parent_element, env, text_attri, parent);
</xsl:when>
@@ -1587,13 +1587,13 @@
<!-- add axis2_uri_t s -->
<xsl:when test="$nativePropertyType='axis2_uri_t*'">
- text_value = AXIS2_URI_TO_STRING(<xsl:value-of select="$attriName"/>, env, AXIS2_URI_UNP_OMITUSERINFO);
+ text_value = axis2_uri_to_string(<xsl:value-of select="$attriName"/>, env, AXIS2_URI_UNP_OMITUSERINFO);
AXIOM_ELEMENT_SET_TEXT(current_element, env, text_value, current_node);
</xsl:when>
<!-- add axis2_qname_t s -->
<xsl:when test="$nativePropertyType='axis2_qname_t*'">
- text_value = AXIS2_QNAME_TO_STRING(<xsl:value-of select="$attriName"/>, env);
+ text_value = axis2_qname_to_string(<xsl:value-of select="$attriName"/>, env);
AXIOM_ELEMENT_SET_TEXT(current_element, env, text_value, current_node);
</xsl:when>
Modified: webservices/axis2/trunk/c/tools/codegen/src/templates/c/ServiceSkeleton.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/templates/c/ServiceSkeleton.xsl?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/templates/c/ServiceSkeleton.xsl (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/templates/c/ServiceSkeleton.xsl Sat Mar 17 01:12:54 2007
@@ -169,7 +169,7 @@
<xsl:variable name="outputCapsType"><xsl:value-of select="@output/param/@caps-type"/> </xsl:variable>
<xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"/></xsl:variable>
- if ( AXIS2_STRCMP(op_name, "<xsl:value-of select="@localpart"/>") == 0 )
+ if ( axis2_strcmp(op_name, "<xsl:value-of select="@localpart"/>") == 0 )
{
<xsl:for-each select="input/param[@type!='']">
input_val<xsl:value-of select="$position"/>_<xsl:value-of select="position()"/> = <xsl:choose>
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c Sat Mar 17 01:12:54 2007
@@ -37,7 +37,7 @@
AXIS2_PARAM_CHECK(env->error, class_name, NULL);
file_path = getenv("AXIS2C_HOME");
- file_path = AXIS2_STRDUP( file_path, env);
+ file_path = axis2_strdup( file_path, env);
dll_desc = axis2_dll_desc_create(env);
*pdll_desc = dll_desc;
@@ -56,7 +56,7 @@
axis2_dll_desc_set_type(dll_desc, env, -1); /* not a standard type */
impl_info_param = axis2_param_create(env, NULL, NULL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_class_loader_init(env);
obj = axis2_class_loader_create_dll(env, impl_info_param);
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c Sat Mar 17 01:12:54 2007
@@ -118,7 +118,7 @@
}
/* populate data */
w2c_cmdline_option_set_type( cmdline_option_impl ,
- env, (axis2_char_t*)AXIS2_STRDUP(type, env));
+ env, (axis2_char_t*)axis2_strdup(type, env));
cmdline_option_impl-> values_arr = values_arr;
return &(cmdline_option_impl->cmdline_option);
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c Sat Mar 17 01:12:54 2007
@@ -210,7 +210,7 @@
while ( i < argc && !(w2c_string_indexof_cs ( argv[i], "-" ) == 0)
&& !(w2c_string_indexof_cs ( argv[i], "--" ) == 0) )
{
- value = (axis2_char_t*)AXIS2_STRDUP(argv[i], env);
+ value = (axis2_char_t*)axis2_strdup(argv[i], env);
axis2_array_list_add ( values_arr, env, value );
i ++;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c Sat Mar 17 01:12:54 2007
@@ -230,8 +230,8 @@
config_property_loader_impl->prop_filename = NULL;
axis2c_home = getenv ( "AXIS2C_HOME" );
- path_len = AXIS2_STRLEN (axis2c_home ) +
- AXIS2_STRLEN (W2C_CONFIG_PROPERTY_LOADER_DEFAULT_CODEGEN_CONFIG_PROPERTIES) +
+ path_len = axis2_strlen (axis2c_home ) +
+ axis2_strlen (W2C_CONFIG_PROPERTY_LOADER_DEFAULT_CODEGEN_CONFIG_PROPERTIES) +
2;
config_property_loader_impl-> prop_filename = AXIS2_MALLOC ( env->allocator,
sizeof(axis2_char_t)*path_len );
@@ -692,9 +692,9 @@
for (i = 0 ; i < size ;i++ )
{
axis2_hash_set ( temp_hash,
- AXIS2_STRDUP( axis2_array_list_get(obj_impl ->databinding_framework_names, env, i ), env),
+ axis2_strdup( axis2_array_list_get(obj_impl ->databinding_framework_names, env, i ), env),
AXIS2_HASH_KEY_STRING,
- AXIS2_STRDUP( axis2_array_list_get(temp_array, env, i ), env));
+ axis2_strdup( axis2_array_list_get(temp_array, env, i ), env));
}
}
@@ -705,7 +705,7 @@
if ( prop != NULL)
{
obj_impl ->default_db_framework_name =
- AXIS2_STRDUP( axis2_array_list_get(prop, env, 0 ), env);
+ axis2_strdup( axis2_array_list_get(prop, env, 0 ), env);
}
/* load the third party schema names */
@@ -715,7 +715,7 @@
if ( prop != NULL)
{
obj_impl ->third_party_schema_names=
- AXIS2_STRDUP( axis2_array_list_get(prop, env, 0 ), env);
+ axis2_strdup( axis2_array_list_get(prop, env, 0 ), env);
}
/* the db supporter template name */
@@ -725,7 +725,7 @@
if ( prop != NULL)
{
obj_impl ->db_supporter_template_name=
- AXIS2_STRDUP( axis2_array_list_get(prop, env, 0 ), env);
+ axis2_strdup( axis2_array_list_get(prop, env, 0 ), env);
}
/* test object template name */
@@ -739,7 +739,7 @@
if ( prop != NULL)
{
obj_impl ->test_object_template_name=
- AXIS2_STRDUP( axis2_array_list_get(prop, env, 0), env);
+ axis2_strdup( axis2_array_list_get(prop, env, 0), env);
}
@@ -777,9 +777,9 @@
key = axis2_array_list_get(obj_impl ->language_types, env, i);
val = axis2_array_list_get(temp_array, env, i );
axis2_hash_set ( temp_hash,
- AXIS2_STRDUP( key, env),
+ axis2_strdup( key, env),
AXIS2_HASH_KEY_STRING,
- AXIS2_STRDUP( val, env));
+ axis2_strdup( val, env));
}
}
@@ -790,7 +790,7 @@
if ( prop != NULL)
{
obj_impl ->default_language =
- AXIS2_STRDUP( axis2_array_list_get(prop, env, 0 ), env);
+ axis2_strdup( axis2_array_list_get(prop, env, 0 ), env);
}
/**
@@ -839,7 +839,7 @@
for( i = 0; i < size; i ++ )
{
tmp = (axis2_char_t*)axis2_array_list_get( original, env, i);
- tmp = AXIS2_STRDUP( tmp, env);
+ tmp = axis2_strdup( tmp, env);
axis2_array_list_add_at( new_array, env, i, tmp);
}
return new_array;
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c Sat Mar 17 01:12:54 2007
@@ -38,11 +38,11 @@
if ( NULL == root_location )
{
- full_path= AXIS2_STRDUP ( ".", env);
+ full_path= axis2_strdup ( ".", env);
}
else
{
- full_path = AXIS2_STRDUP ( root_location,env );
+ full_path = axis2_strdup ( root_location,env );
for ( end = AXIS2_FALSE, cp = full_path; 1; cp ++)
{
if ( *cp == '\0' )
@@ -76,7 +76,7 @@
/* this is related to adding folder hiearchy corrosponding to the package */
if ( package_name && *package_name != '\0')
{
- length = AXIS2_STRLEN ( full_path );
+ length = axis2_strlen ( full_path );
full_path = w2c_string_add_string ( full_path, package_name, env);
/* the loop wil start from the package name */
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/messages.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/messages.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/messages.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/messages.c Sat Mar 17 01:12:54 2007
@@ -45,14 +45,14 @@
inter_path = W2C_MESSAGES_INTER_PATH;
filename = W2C_MESSAGES_FILENAME;
- path_len = AXIS2_STRLEN ( filename ) + AXIS2_STRLEN (axis2c_home )
- + AXIS2_STRLEN ( inter_path )
+ path_len = axis2_strlen ( filename ) + axis2_strlen (axis2c_home )
+ + axis2_strlen ( inter_path )
+ 2; /* for seperator and null char */
filepath = AXIS2_MALLOC ( env-> allocator, path_len* sizeof(axis2_char_t) );
sprintf ( filepath, "%s%s%s", axis2c_home, inter_path, filename );
props = axis2_properties_create(env);
- AXIS2_PROPERTIES_LOAD( props, env, filepath);
+ axis2_properties_load( props, env, filepath);
return props;
}
@@ -64,12 +64,12 @@
axis2_char_t *message = NULL;
props = w2c_messages_get_message_properties( env);
- message = AXIS2_PROPERTIES_GET_PROPERTY( props, env, key);
+ message = axis2_properties_get_property( props, env, key);
if ( message )
{
- message = AXIS2_STRDUP ( message, env );
+ message = axis2_strdup ( message, env );
}
- AXIS2_PROPERTIES_FREE( props, env);
+ axis2_properties_free( props, env);
return message;
}
@@ -94,7 +94,7 @@
axis2_char_t *key )
{
axis2_char_t *msg = NULL;
- msg = AXIS2_PROPERTIES_GET_PROPERTY( props, env, key);
+ msg = axis2_properties_get_property( props, env, key);
if ( msg )
{
fprintf ( stderr, "%s\n", msg );
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/properties.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/properties.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/properties.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/properties.c Sat Mar 17 01:12:54 2007
@@ -81,9 +81,9 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- AXIS2_PROPERTIES_LOAD( main_props, env, filename );
+ axis2_properties_load( main_props, env, filename );
- tmp_hash = AXIS2_PROPERTIES_GET_ALL( main_props, env);
+ tmp_hash = axis2_properties_get_all( main_props, env);
properties_impl-> prop_hash = axis2_hash_make (env);
if(NULL == properties_impl-> prop_hash)
@@ -118,12 +118,12 @@
tag = w2c_properties_trunk_and_dup( tag, p, env);
axis2_array_list_add_at( arr_list, env, i, tag);
}
- key = AXIS2_STRDUP(key, env);
+ key = axis2_strdup(key, env);
axis2_hash_set( properties_impl-> prop_hash, key, AXIS2_HASH_KEY_STRING, arr_list);
}
}
}
- AXIS2_PROPERTIES_FREE( main_props, env);
+ axis2_properties_free( main_props, env);
properties_impl->properties.ops =
@@ -218,7 +218,7 @@
for ( ; *start == ' '; start ++ ); /* remove front spaces */
for ( end --; *end == ' '; end -- ); /* remove rear spaces */
*(++end ) = '\0';
- start = (axis2_char_t*)AXIS2_STRDUP ( start, env );
+ start = (axis2_char_t*)axis2_strdup ( start, env );
return start;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/string.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/string.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/string.c Sat Mar 17 01:12:54 2007
@@ -114,8 +114,8 @@
int new_index = 0;
int earlier_capital = 0;
- name = (axis2_char_t*)AXIS2_STRDUP( name, env); /* so constansts are allowd */
- len = AXIS2_STRLEN( name);
+ name = (axis2_char_t*)axis2_strdup( name, env); /* so constansts are allowd */
+ len = axis2_strlen( name);
ret_val = (axis2_char_t*) AXIS2_MALLOC ( env-> allocator,
sizeof(axis2_char_t) * len * 2);
@@ -164,10 +164,10 @@
axis2_char_t *uri = NULL;
axis2_char_t *key = NULL;
- local = AXIS2_QNAME_GET_LOCALPART( qname, env);
- uri = AXIS2_QNAME_GET_URI( qname, env);
+ local = axis2_qname_get_localpart( qname, env);
+ uri = axis2_qname_get_uri( qname, env);
- key = AXIS2_STRDUP( local, env);
+ key = axis2_strdup( local, env);
if ( uri != NULL && *uri != '\0' ) /* it should not be empty*/
{
key = w2c_string_add_string( key, "|", env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c Sat Mar 17 01:12:54 2007
@@ -174,7 +174,7 @@
return NULL;
}
file_path = getenv("AXIS2C_HOME");
- file_path = AXIS2_STRDUP( file_path, env);
+ file_path = axis2_strdup( file_path, env);
file_path = w2c_string_add_string(file_path, W2C_TYPEMAPPER_MAPPING_PATH, env );
file_path = w2c_string_add_string(file_path, filename, env );
@@ -194,7 +194,7 @@
typemapper_impl-> mapper_name =
axiom_element_get_attribute_value_by_name(root_ele, env, "dbf");
typemapper_impl-> mapper_name =
- AXIS2_STRDUP( typemapper_impl-> mapper_name, env);
+ axis2_strdup( typemapper_impl-> mapper_name, env);
it = axiom_element_get_children(root_ele, env, root);
while ( (child = axiom_children_iterator_next(it, env )) != NULL )
{
@@ -227,9 +227,9 @@
(child_ele, env, "namespace");
prefix = axiom_element_get_attribute_value_by_name
(child_ele, env, "prefix");
- prefix = AXIS2_STRDUP( prefix, env);
+ prefix = axis2_strdup( prefix, env);
local_name = axiom_element_get_text(child_ele, env, child);
- qname2str = AXIS2_STRDUP( local_name, env);
+ qname2str = axis2_strdup( local_name, env);
qname2str = w2c_string_add_string( qname2str, "|", env);
qname2str = w2c_string_add_string( qname2str, uri, env);
@@ -243,22 +243,22 @@
/* child = AXIOM_NODE_GET_NEXT_SIBLING( child, env ); */
child_ele = AXIOM_NODE_GET_DATA_ELEMENT( child, env);
type_val = axiom_element_get_text( child_ele, env, child);
- type_val = AXIS2_STRDUP( type_val, env);
+ type_val = axis2_strdup( type_val, env);
if ( is_default )
{
- uri = AXIS2_STRDUP( uri, env);
- local_name = AXIS2_STRDUP( local_name, env);
- prefix = AXIS2_STRDUP( prefix, env);
+ uri = axis2_strdup( uri, env);
+ local_name = axis2_strdup( local_name, env);
+ prefix = axis2_strdup( prefix, env);
typemapper_impl-> default_qname =
axis2_qname_create( env, local_name, uri, prefix);
- typemapper_impl-> default_type = AXIS2_STRDUP( type_val, env);
+ typemapper_impl-> default_type = axis2_strdup( type_val, env);
}
axis2_hash_set( typemapper_impl-> qname2name, qname2str,
AXIS2_HASH_KEY_STRING, type_val );
- qname2str = AXIS2_STRDUP( qname2str, env);
+ qname2str = axis2_strdup( qname2str, env);
axis2_hash_set( typemapper_impl-> qname2prefix, qname2str,
AXIS2_HASH_KEY_STRING, prefix );
- qname2str = AXIS2_STRDUP( qname2str, env);
+ qname2str = axis2_strdup( qname2str, env);
axis2_hash_set( typemapper_impl-> primitive_map, qname2str,
AXIS2_HASH_KEY_STRING, (void*)1);
}
@@ -331,7 +331,7 @@
}
if (typemapper_impl-> default_qname)
{
- AXIS2_QNAME_FREE( typemapper_impl-> default_qname, env);
+ axis2_qname_free( typemapper_impl-> default_qname, env);
}
if(typemapper->ops)
{
@@ -361,7 +361,7 @@
AXIS2_ENV_CHECK(env, NULL);
- local = AXIS2_STRDUP( "param", env);
+ local = axis2_strdup( "param", env);
if (counter == W2C_TYPEMAPPER_UPPER_PARAM_LIMIT)
{
@@ -421,16 +421,16 @@
typemapper_impl = W2C_INTF_TO_IMPL(typemapper);
- prefix = AXIS2_QNAME_GET_PREFIX( qname, env);
+ prefix = axis2_qname_get_prefix( qname, env);
key = w2c_string_make_key_from_qname( qname, env);
- key = AXIS2_STRDUP( key, env);
- name = AXIS2_STRDUP( name, env);
+ key = axis2_strdup( key, env);
+ name = axis2_strdup( name, env);
axis2_hash_set( typemapper_impl-> qname2name, key,
AXIS2_HASH_KEY_STRING, name);
- if ( prefix && AXIS2_STRLEN( prefix) > 0 )
+ if ( prefix && axis2_strlen( prefix) > 0 )
{
- key = AXIS2_STRDUP( key, env);
+ key = axis2_strdup( key, env);
axis2_hash_set( typemapper_impl-> qname2prefix , key,
AXIS2_HASH_KEY_STRING, prefix);
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c Sat Mar 17 01:12:54 2007
@@ -55,10 +55,10 @@
url = axis2_url_parse_string (env, namespace );
if ( NULL == url )
{
- return AXIS2_STRDUP( namespace, env);
+ return axis2_strdup( namespace, env);
}
- host_name = AXIS2_URL_GET_SERVER ( url, env );
- path = AXIS2_URL_GET_PATH ( url, env );
+ host_name = axis2_url_get_server ( url, env );
+ path = axis2_url_get_path ( url, env );
if ( NULL == host_name )
{
@@ -86,7 +86,7 @@
return NULL;
}
- long_path = (axis2_char_t* )AXIS2_STRDUP ( host_name,env );
+ long_path = (axis2_char_t* )axis2_strdup ( host_name,env );
/** make path_name legal */
@@ -130,7 +130,7 @@
path ++;
}
- long_path = ( axis2_char_t* )AXIS2_STRDUP( path, env );
+ long_path = ( axis2_char_t* )axis2_strdup( path, env );
long_path = axis2_string_replace ( long_path, '-', '_' );
long_path = axis2_string_replace ( long_path, ':', '_' );
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c Sat Mar 17 01:12:54 2007
@@ -116,14 +116,14 @@
if ( AXIOM_NODE_GET_NODE_TYPE ( from_child, env ) == AXIOM_TEXT )
{
text = axiom_element_get_text ( from_ele, env, from );
- text = AXIS2_STRDUP ( text, env);
+ text = axis2_strdup ( text, env);
axiom_element_set_text ( to_ele, env, text, to);
}
else if ( AXIOM_NODE_GET_NODE_TYPE ( from_child, env ) == AXIOM_ELEMENT )
{
from_child_ele = AXIOM_NODE_GET_DATA_ELEMENT ( from_child, env );
qname = axiom_element_get_qname ( from_child_ele, env, from_child );
- qname = AXIS2_QNAME_CLONE ( qname, env );
+ qname = axis2_qname_clone ( qname, env );
axiom_element_create_with_qname ( env, to, qname, &to_child );
w2c_xslt_utils_copy_node_tree ( env, to_child, from_child );
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c Sat Mar 17 01:12:54 2007
@@ -409,10 +409,10 @@
qname = w2c_emitter_pick_service_name( emitter_impl, env );
given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, qname);
- qname_str = AXIS2_QNAME_TO_STRING(qname, env);
+ qname_str = axis2_qname_to_string(qname, env);
root = w2c_xslt_utils_add_child_node(env, "class", NULL);
- full_name = AXIS2_STRDUP ( W2C_C_EMITTER_STUB_PREFIX, env );
+ full_name = axis2_strdup ( W2C_C_EMITTER_STUB_PREFIX, env );
full_name = w2c_string_add_string ( full_name, given_name, env );
full_name = w2c_string_add_string
( full_name, W2C_C_EMITTER_STUB_SUFFIX, env);
@@ -468,10 +468,10 @@
qname = w2c_emitter_pick_service_name( emitter_impl, env );
given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, qname);
- qname_str = AXIS2_QNAME_TO_STRING(qname, env);
+ qname_str = axis2_qname_to_string(qname, env);
root = w2c_xslt_utils_add_child_node(env, "interface", NULL);
- full_name = AXIS2_STRDUP ( W2C_C_EMITTER_SKEL_PREFIX, env );
+ full_name = axis2_strdup ( W2C_C_EMITTER_SKEL_PREFIX, env );
full_name = w2c_string_add_string ( full_name, given_name, env );
full_name = w2c_string_add_string
( full_name, W2C_C_EMITTER_SKEL_SUFFIX, env);
@@ -506,10 +506,10 @@
qname = w2c_emitter_pick_service_name( emitter_impl, env );
given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, qname);
- qname_str = AXIS2_QNAME_TO_STRING(qname, env);
+ qname_str = axis2_qname_to_string(qname, env);
root = w2c_xslt_utils_add_child_node(env, "interface", NULL);
- svc_skel_name = AXIS2_STRDUP ( W2C_C_EMITTER_SVC_SKEL_PREFIX, env );
+ svc_skel_name = axis2_strdup ( W2C_C_EMITTER_SVC_SKEL_PREFIX, env );
svc_skel_name = w2c_string_add_string ( svc_skel_name, given_name, env );
svc_skel_name = w2c_string_add_string
( svc_skel_name, W2C_C_EMITTER_SVC_SKEL_SUFFIX, env);
@@ -519,7 +519,7 @@
w2c_xslt_utils_add_attribute (env, root, "prefix", svc_skel_name_c);
w2c_xslt_utils_add_attribute (env, root, "qname", qname_str);
- skel_name = AXIS2_STRDUP ( W2C_C_EMITTER_SKEL_PREFIX, env );
+ skel_name = axis2_strdup ( W2C_C_EMITTER_SKEL_PREFIX, env );
skel_name = w2c_string_add_string ( skel_name, given_name, env );
skel_name = w2c_string_add_string
( skel_name, W2C_C_EMITTER_SKEL_SUFFIX, env);
@@ -552,7 +552,7 @@
qname = w2c_emitter_pick_service_name( emitter_impl, env );
svc_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, qname);
- qname_str = AXIS2_QNAME_TO_STRING(qname, env);
+ qname_str = axis2_qname_to_string(qname, env);
c_svc_name = emitter_impl-> name_maker_func( svc_name, env);
root = w2c_xslt_utils_add_child_node(env, "interface", NULL);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c Sat Mar 17 01:12:54 2007
@@ -307,7 +307,7 @@
return AXIS2_FAILURE;
}
/*axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- doc_base_uri = AXIS2_STRACAT (axis2c_home, "/woden/", env);*/
+ doc_base_uri = axis2_stracat (axis2c_home, "/woden/", env);*/
doc_base_uri = W2C_ENGINE_CONFIGURATION_GET_BASE_URI ( emitter_impl-> config, env);
desc = (void *)WODEN_RESOLVER_READ(emitter_impl-> resolver , env, om_doc,
@@ -470,7 +470,7 @@
}
svc = axis2_array_list_get( svc_list, env, 0 );
svc_qname = WODEN_WSDL10_SVC_GET_QNAME( svc, env);
- ns = AXIS2_QNAME_GET_URI( svc_qname, env);
+ ns = axis2_qname_get_uri( svc_qname, env);
w2c_xslt_utils_add_attribute (env, root, "namespace", ns);
/**********************************************************************
@@ -500,7 +500,7 @@
{
ext_element = axis2_array_list_get(ext_elements, env, j);
ext_type = (axis2_qname_t*)WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
- if(AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
+ if(AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
{
ext_element =
woden_wsdl10_soap_module_to_soap_module_element (
@@ -517,7 +517,7 @@
if(soap_address_uri)
{
- address = AXIS2_URI_TO_STRING(soap_address_uri, env,
+ address = axis2_uri_to_string(soap_address_uri, env,
AXIS2_URI_UNP_OMITUSERINFO);
endpoint_node = w2c_xslt_utils_add_child_node(env, "endpoint",
root);
@@ -554,10 +554,10 @@
{
method = w2c_xslt_utils_add_child_node(env, "method",
root);
- local_part= AXIS2_QNAME_GET_LOCALPART(op_qname, env);
+ local_part= axis2_qname_get_localpart(op_qname, env);
given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, op_qname);
- qname_str = AXIS2_QNAME_TO_STRING(op_qname, env);
+ qname_str = axis2_qname_to_string(op_qname, env);
w2c_xslt_utils_add_attribute (env, method, "localpart",
local_part);
given_name = emitter_impl-> name_maker_func(given_name, env);
@@ -566,7 +566,7 @@
w2c_xslt_utils_add_attribute(env, method, "qname",
qname_str);
AXIS2_FREE( env-> allocator, local_part);
- ns = AXIS2_QNAME_GET_URI(op_qname, env);
+ ns = axis2_qname_get_uri(op_qname, env);
w2c_xslt_utils_add_attribute (env, method, "namespace",
ns);
/** todos */
@@ -592,7 +592,7 @@
{
ext_element = axis2_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
- if(AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
+ if(AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
{
ext_element = woden_wsdl10_soap_module_to_soap_module_element (
ext_element, env);
@@ -602,7 +602,7 @@
soap_action_uri =
WODEN_WSDL10_SOAP_BINDING_OP_EXTS_GET_SOAP_ACTION
(soap_binding_op, env);
- soap_action_str = AXIS2_URI_TO_STRING
+ soap_action_str = axis2_uri_to_string
( soap_action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
w2c_xslt_utils_add_attribute (env, method, "soapaction", soap_action_str);
}
@@ -681,7 +681,7 @@
msg_qname = WODEN_INTERFACE_MSG_REF_ELEMENT_GET_ELEMENT_QNAME( if_msg_ref_ele, env);
}
str_direction = WODEN_DIRECTION_TO_STRING(direction, env);
- if(0 == AXIS2_STRCMP(str_direction, "in"))
+ if(0 == axis2_strcmp(str_direction, "in"))
{
if (!in) /* for the first in iteration */
{
@@ -690,7 +690,7 @@
}
w2c_emitter_add_param( emitter_impl, env, input_param, msg_qname);
}
- if(0 == AXIS2_STRCMP(str_direction, "out"))
+ if(0 == axis2_strcmp(str_direction, "out"))
{
if (!out)
{
@@ -781,7 +781,7 @@
}
endpoint = axis2_array_list_get( endpoint_list, env, 0 );
endpoint_uri = WODEN_ENDPOINT_GET_ADDRESS( endpoint, env);
- endpoint_uri_str = AXIS2_URI_TO_STRING ( endpoint_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ endpoint_uri_str = axis2_uri_to_string ( endpoint_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
endpoint_node = w2c_xslt_utils_add_child_node(env, "endpoint",
root);
/** here the endpoint adding */
@@ -816,10 +816,10 @@
{
method = w2c_xslt_utils_add_child_node(env, "method",
root);
- local_part= AXIS2_QNAME_GET_LOCALPART(op_qname, env);
+ local_part= axis2_qname_get_localpart(op_qname, env);
given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, op_qname);
- qname_str = AXIS2_QNAME_TO_STRING(op_qname, env);
+ qname_str = axis2_qname_to_string(op_qname, env);
w2c_xslt_utils_add_attribute (env, method, "localpart",
local_part);
given_name = emitter_impl-> name_maker_func(given_name, env);
@@ -827,7 +827,7 @@
given_name);
w2c_xslt_utils_add_attribute (env, method, "qname",
qname_str);
- ns = AXIS2_QNAME_GET_URI(op_qname, env);
+ ns = axis2_qname_get_uri(op_qname, env);
w2c_xslt_utils_add_attribute (env, method, "namespace",
ns);
/** todos */
@@ -854,7 +854,7 @@
{
ext_element = axis2_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
- if(AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
+ if(AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
{
/*ext_element = woden_soap_module_to_soap_module_element (
ext_element, env);
@@ -864,7 +864,7 @@
soap_action_uri =
WODEN_SOAP_BINDING_OP_EXTS_GET_SOAP_ACTION
(soap_binding_op, env); */
- soap_action_str = AXIS2_URI_TO_STRING
+ soap_action_str = axis2_uri_to_string
( soap_action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
w2c_xslt_utils_add_attribute (env, method, "soapaction", soap_action_str);
}
@@ -905,7 +905,7 @@
{
w2c_xslt_utils_add_attribute (env, param, "ours", "yes");
}
- type = AXIS2_STRDUP( type, env);
+ type = axis2_strdup( type, env);
w2c_xslt_utils_add_attribute (env, param, "type", type);
type = axis2_string_toupper( type);
w2c_xslt_utils_add_attribute (env, param, "caps-type", type);
@@ -920,11 +920,11 @@
axis2_char_t* w2c_emitter_default_namemaker( axis2_char_t *name,
const axis2_env_t *env)
{
- return AXIS2_STRDUP( name, env);
+ return axis2_strdup( name, env);
}
axis2_char_t* w2c_emitter_default_qname2name( axis2_qname_t *qname,
const axis2_env_t *env)
{
- return AXIS2_QNAME_GET_LOCALPART( qname, env);
+ return axis2_qname_get_localpart( qname, env);
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c Sat Mar 17 01:12:54 2007
@@ -135,7 +135,7 @@
output_lang=
W2C_CONFIG_PROPERTY_LOADER_GET_DEFAULT_LANGUAGE
(engine_impl->prop_loader, env);
- output_lang = AXIS2_STRDUP( output_lang, env);
+ output_lang = axis2_strdup( output_lang, env);
W2C_ENGINE_CONFIGURATION_SET_OUTPUT_LANGUAGE
( engine_impl-> conf, env, output_lang );
if ( NULL == output_lang )
@@ -389,15 +389,15 @@
{
/** uri should be a file */
/**TODO: this doesnt work always */
- base_uri = AXIS2_STRDUP("file:/", env);
+ base_uri = axis2_strdup("file:/", env);
base_uri = w2c_string_add_string ( base_uri, current_uri, env );
}
else
{
- base_uri = AXIS2_STRDUP( current_uri, env );
+ base_uri = axis2_strdup( current_uri, env );
}
/* retrieve the base uri */
- len = AXIS2_STRLEN ( current_uri);
+ len = axis2_strlen ( current_uri);
for ( c = base_uri + len-1 ; c !=base_uri && *c != '/' ; c -- );
if (c != base_uri )
{
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c Sat Mar 17 01:12:54 2007
@@ -67,7 +67,7 @@
}
else
{
- tmp_string = AXIS2_STRDUP(W2C_ENGINE_CONFIG_LOADER_OUTPUT_DEFAULT, env );
+ tmp_string = axis2_strdup(W2C_ENGINE_CONFIG_LOADER_OUTPUT_DEFAULT, env );
}
/*TODO: should check for the vaildity of the output location */
W2C_ENGINE_CONFIGURATION_SET_OUTPUT_LOCATION( conf, env,
@@ -295,7 +295,7 @@
break;
}
*cp ='\0';
- tmp_key = AXIS2_STRDUP ( tag, env );
+ tmp_key = axis2_strdup ( tag, env );
loop_state = 1;
}
else if ( *cp ==',' || *cp=='\0' )
@@ -321,7 +321,7 @@
loop_state = 0;
*cp = '\0';
axis2_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING,
- AXIS2_STRDUP ( tag, env ) );
+ axis2_strdup ( tag, env ) );
}
}
if (loop_state == -1)
@@ -341,8 +341,8 @@
hi; hi = axis2_hash_next(env, hi))
{
axis2_hash_this(hi, (void*)&tmp_key, NULL, (void*)&tmp_string);
- tmp_key = AXIS2_STRDUP( tmp_key, env);
- tmp_string = AXIS2_STRDUP ( tmp_string, env );
+ tmp_key = axis2_strdup( tmp_key, env);
+ tmp_string = axis2_strdup ( tmp_string, env );
axis2_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING, tmp_string);
}
}
@@ -367,7 +367,7 @@
{
h = axis2_hash_make ( env );
}
- len = AXIS2_STRLEN (W2C_CMDLINE_OPTION_CONSTS_EXTRA_OPTIONTYPE_PREFIX );
+ len = axis2_strlen (W2C_CMDLINE_OPTION_CONSTS_EXTRA_OPTIONTYPE_PREFIX );
tmp_key = axis2_string_substring_starting_at ( tmp_key, len);
axis2_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING, tmp_string );
axis2_array_list_free ( tmp_array, env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c Sat Mar 17 01:12:54 2007
@@ -1204,7 +1204,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->base_uri = AXIS2_STRDUP( base_uri, env);
+ engine_configuration_impl->base_uri = axis2_strdup( base_uri, env);
return AXIS2_SUCCESS;
}
@@ -1220,7 +1220,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->wsdl_uri = AXIS2_STRDUP( wsdl_uri, env);
+ engine_configuration_impl->wsdl_uri = axis2_strdup( wsdl_uri, env);
return AXIS2_SUCCESS;
}
@@ -1236,7 +1236,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->repository_path = AXIS2_STRDUP( repository_path, env);
+ engine_configuration_impl->repository_path = axis2_strdup( repository_path, env);
return AXIS2_SUCCESS;
}
@@ -1252,7 +1252,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->type_mapping_file = AXIS2_STRDUP( type_mapping_file, env);
+ engine_configuration_impl->type_mapping_file = axis2_strdup( type_mapping_file, env);
return AXIS2_SUCCESS;
}
@@ -1316,7 +1316,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->output_language = AXIS2_STRDUP( output_language, env);
+ engine_configuration_impl->output_language = axis2_strdup( output_language, env);
return AXIS2_SUCCESS;
}
@@ -1332,7 +1332,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->databinding_type = AXIS2_STRDUP( databinding_type, env);
+ engine_configuration_impl->databinding_type = axis2_strdup( databinding_type, env);
return AXIS2_SUCCESS;
}
@@ -1460,7 +1460,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->package_name = AXIS2_STRDUP( package_name, env);
+ engine_configuration_impl->package_name = axis2_strdup( package_name, env);
return AXIS2_SUCCESS;
}
@@ -1508,7 +1508,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->port_name = AXIS2_STRDUP( port_name, env);
+ engine_configuration_impl->port_name = axis2_strdup( port_name, env);
return AXIS2_SUCCESS;
}
@@ -1524,7 +1524,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->service_name = AXIS2_STRDUP( service_name, env);
+ engine_configuration_impl->service_name = axis2_strdup( service_name, env);
return AXIS2_SUCCESS;
}
@@ -1588,7 +1588,7 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- engine_configuration_impl->wsdl_version = AXIS2_STRDUP( wsdl_version, env);
+ engine_configuration_impl->wsdl_version = axis2_strdup( wsdl_version, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c Sat Mar 17 01:12:54 2007
@@ -76,13 +76,13 @@
filenames = W2C_ENGINE_CONFIGURATION_GET_FILENAMES( conf, env);
/* this executes only with following configuration */
- if ( indent_code && AXIS2_STRCMP( lang, "c") == 0)
+ if ( indent_code && axis2_strcmp( lang, "c") == 0)
{
size = axis2_array_list_size( filenames, env);
for ( i = 0; i < size; i ++ )
{
filename = axis2_array_list_get( filenames, env, i);
- length = AXIS2_STRLEN( filename);
+ length = axis2_strlen( filename);
/* take only .c or .h files */
if( filename[length-1] == 'c' || filename[length-1] == 'h' ||
filename[length-2] == '.' )
@@ -423,7 +423,7 @@
void* src = NULL;
int count = 0;
- additional_len = AXIS2_STRLEN ( string ) +1;
+ additional_len = axis2_strlen ( string ) +1;
if ( allocator-> index + additional_len >= allocator-> allocated )
{
if ( allocator-> allocated == 0 )
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c Sat Mar 17 01:12:54 2007
@@ -68,7 +68,7 @@
lang = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE( conf, env);
/* this executes only with following configuration */
- if ( convert_names && AXIS2_STRCMP( lang, "c") == 0)
+ if ( convert_names && axis2_strcmp( lang, "c") == 0)
{
W2C_ENGINE_CONFIGURATION_SET_NAMEMAKER_FUNC( conf, env,
(W2C_ENGINE_CONFIGURATION_NAMEMAKER) w2c_string_make_c_simple_name);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c Sat Mar 17 01:12:54 2007
@@ -107,7 +107,7 @@
lang = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE( conf, env);
/* this executes only with following configuration */
- if ( AXIS2_STRCMP( lang, "c") == 0)
+ if ( axis2_strcmp( lang, "c") == 0)
{
W2C_ENGINE_CONFIGURATION_SET_QNAME2NAME( conf, env,
qname2name_maker);
@@ -135,7 +135,7 @@
impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker);
- key = AXIS2_QNAME_TO_STRING(qname, env);
+ key = axis2_qname_to_string(qname, env);
local = (axis2_char_t*)axis2_hash_get( impl-> qname2name, key,
AXIS2_HASH_KEY_STRING );
if( local != NULL) /* key has been there somewhere */
@@ -143,7 +143,7 @@
return local;
}
/* otherwise */
- local = AXIS2_QNAME_GET_LOCALPART( qname, env);
+ local = axis2_qname_get_localpart( qname, env);
counter = (int)axis2_hash_get( impl-> name2number, local,
AXIS2_HASH_KEY_STRING );
if ( counter == 0 ) /** this means name doesnt exist */
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c Sat Mar 17 01:12:54 2007
@@ -66,7 +66,7 @@
db_type = W2C_ENGINE_CONFIGURATION_GET_DATABINDING_TYPE( conf, env);
/* this executes only with following configuration */
- if ( NULL == db_type || !AXIS2_STRCMP( db_type, "none" ) )
+ if ( NULL == db_type || !axis2_strcmp( db_type, "none" ) )
{
typemapper = W2C_ENGINE_CONFIGURATION_GET_TYPEMAPPER( conf, env);
if ( typemapper != NULL )
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c Sat Mar 17 01:12:54 2007
@@ -95,7 +95,7 @@
impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker);
/** here nothing special would be happened */
- return AXIS2_QNAME_GET_LOCALPART( qname, env);
+ return axis2_qname_get_localpart( qname, env);
}
axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c Sat Mar 17 01:12:54 2007
@@ -193,14 +193,14 @@
axis2_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
if ( key && arr_list)
{
- suf_length = AXIS2_STRLEN( W2C_WRITER_EXTENSION_SUFFIX );
- all_length = AXIS2_STRLEN( key);
+ suf_length = axis2_strlen( W2C_WRITER_EXTENSION_SUFFIX );
+ all_length = axis2_strlen( key);
index = w2c_string_indexof_cs
(key, W2C_WRITER_EXTENSION_SUFFIX );
if ( index + suf_length == all_length )/* this meen its a suf*/
{
value = axis2_array_list_get( arr_list, env, 0);
- ext_name = AXIS2_STRDUP (".", env );
+ ext_name = axis2_strdup (".", env );
ext_name = w2c_string_add_string ( ext_name, value, env);
break;
}
@@ -229,8 +229,8 @@
axis2_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
if ( key && arr_list)
{
- suf_length = AXIS2_STRLEN( W2C_WRITER_TEMPLATE_SUFFIX );
- all_length = AXIS2_STRLEN(key );
+ suf_length = axis2_strlen( W2C_WRITER_TEMPLATE_SUFFIX );
+ all_length = axis2_strlen(key );
index = w2c_string_indexof_cs
(key, W2C_WRITER_TEMPLATE_SUFFIX );
if ( index + suf_length == all_length )/* this meen its a suf*/
@@ -241,7 +241,7 @@
if (0 == index) /* prefix matches for the first entry*/
{
value = axis2_array_list_get ( arr_list, env, 1);
- tmpl_name = AXIS2_STRDUP ("", env );
+ tmpl_name = axis2_strdup ("", env );
tmpl_name = w2c_string_add_string ( tmpl_name, value, env);
break;
}
@@ -256,7 +256,7 @@
const axis2_env_t* env,
axis2_char_t* self_name)
{
- writer_impl -> self_name = AXIS2_STRDUP(self_name, env);
+ writer_impl -> self_name = axis2_strdup(self_name, env);
return AXIS2_SUCCESS;
}
@@ -276,7 +276,7 @@
if ( NULL == lang )
return AXIS2_FAILURE;
}
- writer_impl-> language = AXIS2_STRDUP(lang, env);
+ writer_impl-> language = axis2_strdup(lang, env);
return AXIS2_SUCCESS;
}
@@ -296,7 +296,7 @@
file_path = getenv("AXIS2C_HOME");
- file_path = AXIS2_STRDUP ( file_path, env);
+ file_path = axis2_strdup ( file_path, env);
if ( NULL == file_path)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c Sat Mar 17 01:12:54 2007
@@ -123,7 +123,7 @@
w2c_print_message(env, props, "wsdl2code.arg9");
w2c_print_message(env, props, "wsdl2code.arg10");
- AXIS2_PROPERTIES_FREE(props, env);
+ axis2_properties_free(props, env);
}
static void
@@ -131,6 +131,6 @@
{
axis2_char_t* message = NULL;
message = (axis2_char_t*)
- AXIS2_PROPERTIES_GET_PROPERTY(messageh, env, key);
+ axis2_properties_get_property(messageh, env, key);
printf("%s\n", message);
}
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c Sat Mar 17 01:12:54 2007
@@ -90,7 +90,7 @@
axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
sprintf(actual, "%s%s=%s,", actual, key, value);
}
- actual_len = AXIS2_STRLEN(actual);
+ actual_len = axis2_strlen(actual);
actual[actual_len -1 ] = '\0'; /* remove the last comma */
expected = (char*)w2c_config_test_input2[1];
@@ -115,7 +115,7 @@
axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
sprintf(actual, "%s%s=%s,", actual, key, value);
}
- actual_len = AXIS2_STRLEN(actual);
+ actual_len = axis2_strlen(actual);
actual[actual_len -1 ] = '\0'; /* remove the last comma */
expected = (char*)w2c_config_test_input2[1];
CuAssertStrEquals(tc, expected, actual);
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c Sat Mar 17 01:12:54 2007
@@ -156,7 +156,7 @@
sprintf(file_path, "%s/codegen/util/codegen-config.properties",
axis2c_home);
- /* file_path = AXIS2_STRDUP
+ /* file_path = axis2_strdup
("../../resources/codegen-config.properties", env); */
/*W2C_CONFIG_PROPERTY_LOADER_W2C_CONFIG_PROPERTY_LOADER_SET_FILENAME( loader,
env, file_path );*/
@@ -212,7 +212,7 @@
allocator = axis2_allocator_init(NULL);
env = axis2_env_create(allocator);
- key = AXIS2_STRDUP("wsdl2code.arg1", env);
+ key = axis2_strdup("wsdl2code.arg1", env);
expected = "Usage WSDL2Code -uri <Location of WSDL> : WSDL file location";
actual = w2c_messages_get_message(env, key);
CuAssertStrEquals(tc, expected, actual);
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c Sat Mar 17 01:12:54 2007
@@ -60,7 +60,7 @@
allocator = axis2_allocator_init(NULL);
env = axis2_env_create(allocator);
- input = (char*)AXIS2_STRDUP("http://ws.apache.org/axis2/c/w2c", env);
+ input = (char*)axis2_strdup("http://ws.apache.org/axis2/c/w2c", env);
actual =
(char*)w2c_url_processor_make_package_name(env, input);
expected = "org.apache.ws.axis2.c.w2c";
@@ -68,7 +68,7 @@
free(input);
free(actual);
- input = (char*)AXIS2_STRDUP("http://while.234who.for/switch/case/2sixa", env);
+ input = (char*)axis2_strdup("http://while.234who.for/switch/case/2sixa", env);
actual =
(char*)w2c_url_processor_make_package_name(env, input);
expected = "_for._234who._while._switch._case._2sixa";
@@ -101,7 +101,7 @@
out_content = read_file("../../resources/xml/result1.xml");
cmp_out_content = read_file("../../resources/xml/style1_result.xml");
/* just ignore the last new line char for avoid warning */
- len = AXIS2_STRLEN(out_content);
+ len = axis2_strlen(out_content);
out_content[len -1] = '\0';
CuAssertStrEquals(tc, out_content, cmp_out_content);
@@ -116,7 +116,7 @@
out_content = read_file("../../resources/xml/result2.xml");
cmp_out_content = read_file("../../resources/xml/style2_result.xml");
/* just ignore the last new line char for avoid warning */
- len = AXIS2_STRLEN(out_content);
+ len = axis2_strlen(out_content);
out_content[len -1] = '\0';
CuAssertStrEquals(tc, out_content, cmp_out_content);
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/entry.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/entry.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/entry.c Sat Mar 17 01:12:54 2007
@@ -649,7 +649,7 @@
{
header_found = 1;
*(buffer + read_size - 3) = '\0';
- header_ptr = (axis2_char_t*)AXIS2_STRDUP(buffer, env);
+ header_ptr = (axis2_char_t*)axis2_strdup(buffer, env);
header_just_finished = 1;
*(buffer + read_size - 3) = '\r';
}
@@ -662,7 +662,7 @@
chunked_encoded = 1;
header_found = 1;
*(buffer + read_size - 3) = '\0';
- header_ptr = (axis2_char_t*)AXIS2_STRDUP(buffer, env);
+ header_ptr = (axis2_char_t*)axis2_strdup(buffer, env);
header_just_finished = 1;
*(buffer + read_size - 3) = '\r';
}
@@ -672,12 +672,12 @@
if (header_width != 0)
{
body_ptr = buffer + header_width;
- *data = (axis2_char_t*) AXIS2_STRDUP(body_ptr, env);
+ *data = (axis2_char_t*) axis2_strdup(body_ptr, env);
}
else
{
*(buffer + read_size) = '\0';
- header_ptr = (axis2_char_t*)AXIS2_STRDUP(buffer, env);
+ header_ptr = (axis2_char_t*)axis2_strdup(buffer, env);
/** soap body part is unavailable */
*data = NULL;
}
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/session.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/session.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/session.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/session.c Sat Mar 17 01:12:54 2007
@@ -355,7 +355,7 @@
session_impl = AXIS2_INTF_TO_IMPL(session);
- session_impl-> target_host = (axis2_char_t*)AXIS2_STRDUP(target_host, env);
+ session_impl-> target_host = (axis2_char_t*)axis2_strdup(target_host, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c Sat Mar 17 01:12:54 2007
@@ -57,7 +57,7 @@
env = axis2_env_create_with_error_log_thread_pool(allocator, error, log,
thread_pool);
- if (argc < 2 || !AXIS2_STRCMP(argv[1], "-h"))
+ if (argc < 2 || !axis2_strcmp(argv[1], "-h"))
{
printf("Usage : %s [OPTIONS] -lp LISTEN_PORT -tp TARGET_PORT -th [TARGET_HOST]\n", argv[0]);
printf("use -h for help\n");
@@ -92,7 +92,7 @@
else if (!strcmp ("-th", argv[ii]))
{
ii++;
- target_host = (char*)AXIS2_STRDUP(argv[ii++], env);
+ target_host = (char*)axis2_strdup(argv[ii++], env);
}
else if (!strcmp ("--test", argv [ii]))
{
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/util.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/util.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/util.c Sat Mar 17 01:12:54 2007
@@ -346,7 +346,7 @@
void* src = NULL;
int count = 0;
- additional_len = AXIS2_STRLEN(string) + 1;
+ additional_len = axis2_strlen(string) + 1;
if (allocator-> index + additional_len >= allocator-> allocated)
{
if (allocator-> allocated == 0)
Modified: webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c Sat Mar 17 01:12:54 2007
@@ -34,7 +34,7 @@
allocator = axis2_allocator_init(NULL);
env = axis2_env_create(allocator);
- input = (char*)AXIS2_STRDUP(
+ input = (char*)axis2_strdup(
"<input>check for one step</input>",
env);
actual =
@@ -47,7 +47,7 @@
free(input);
- input = (char*)AXIS2_STRDUP(
+ input = (char*)axis2_strdup(
"<input><tag2><another_tag with='attriutes'>check for one step</another_tag></tag2></input>",
env);
actual =
@@ -65,7 +65,7 @@
free(actual);
free(input);
- input = (char*)AXIS2_STRDUP(
+ input = (char*)axis2_strdup(
"<?processing inc?><input><tag2><another_tag with='attriutes'>check for one step</another_tag></tag2></input>",
env);
actual =
Modified: webservices/axis2/trunk/c/util/include/axis2_param.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param.h Sat Mar 17 01:12:54 2007
@@ -159,46 +159,6 @@
const axis2_env_t *env,
void *free_fn);
-
-#define AXIS2_PARAM_FREE(param, env) \
- axis2_param_free (param, env)
-
-#define AXIS2_PARAM_SET_NAME(param, env, name) \
- axis2_param_set_name (param, env, name)
-
-#define AXIS2_PARAM_GET_NAME(param, env) \
- axis2_param_get_name (param, env)
-
-#define AXIS2_PARAM_SET_VALUE(param, env, value) \
- axis2_param_set_value (param , env, value)
-
-#define AXIS2_PARAM_GET_VALUE(param, env) \
- axis2_param_get_value (param, env)
-
-#define AXIS2_PARAM_IS_LOCKED(param, env) \
- axis2_param_is_locked (param, env)
-
-#define AXIS2_PARAM_SET_LOCKED(param, env, locked) \
- axis2_param_set_locked (param, env, locked)
-
-#define AXIS2_PARAM_SET_PARAM_TYPE(param, env, type) \
- axis2_param_set_param_type (param, env, type)
-
-#define AXIS2_PARAM_GET_PARAM_TYPE(param, env) \
- axis2_param_get_param_type (param, env)
-
-#define AXIS2_PARAM_SET_ATTRIBUTES(param, env, attrs) \
- axis2_param_set_attributes (param , env, attrs)
-
-#define AXIS2_PARAM_GET_ATTRIBUTES(param, env) \
- axis2_param_get_attributes (param, env)
-
-#define AXIS2_PARAM_SET_VALUE_LIST(param, env, value_list) \
- axis2_param_set_value_list (param , env, value_list)
-
-#define AXIS2_PARAM_GET_VALUE_LIST(param, env) \
- axis2_param_get_value_list (param, env)
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/util/include/axis2_param_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param_container.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param_container.h Sat Mar 17 01:12:54 2007
@@ -115,21 +115,6 @@
const axis2_env_t *env,
const axis2_char_t *param_name) ;
-#define AXIS2_PARAM_CONTAINER_FREE(param_container, env) \
- axis2_param_container_free (param_container, env)
-
-#define AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container, env, param) \
- axis2_param_container_add_param (param_container, env, param)
-
-#define AXIS2_PARAM_CONTAINER_GET_PARAM(param_container, env, name) \
- axis2_param_container_get_param (param_container, env, name)
-
-#define AXIS2_PARAM_CONTAINER_GET_PARAMS(param_container, env) \
- axis2_param_container_get_params (param_container, env)
-
-#define AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(param_container, env, param_name) \
- axis2_param_container_is_param_locked (param_container, env, \
- param_name)
/** @} */
Modified: webservices/axis2/trunk/c/util/include/axis2_properties.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_properties.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_properties.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_properties.h Sat Mar 17 01:12:54 2007
@@ -115,25 +115,7 @@
axis2_properties_store(axis2_properties_t *properites,
const axis2_env_t *env,
FILE *output);
-
-#define AXIS2_PROPERTIES_FREE(properties, env) \
- axis2_properties_free (properties, env)
-
-#define AXIS2_PROPERTIES_GET_PROPERTY(properties, env, key) \
- axis2_properties_get_property(properties, env, key)
-
-#define AXIS2_PROPERTIES_SET_PROPERTY(properties, env, key, value) \
- axis2_properties_set_property(properties, env, key, value)
-
-#define AXIS2_PROPERTIES_GET_ALL(properties, env) \
- axis2_properties_get_all(properties, env)
-
-#define AXIS2_PROPERTIES_LOAD(properties, env, input) \
- axis2_properties_load(properties, env, input)
-
-#define AXIS2_PROPERTIES_STORE(properties, env, output) \
- axis2_properties_store(properties, env, output)
-
+
/*************************** End of function macros ***************************/
Modified: webservices/axis2/trunk/c/util/include/axis2_property.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_property.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_property.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_property.h Sat Mar 17 01:12:54 2007
@@ -103,23 +103,6 @@
axis2_property_clone(axis2_property_t *property,
const axis2_env_t *env);
-#define AXIS2_PROPERTY_FREE(property, env) \
- axis2_property_free (property, env)
-
-#define AXIS2_PROPERTY_SET_FREE_FUNC(property, env, free_func) \
- axis2_property_set_free_func (property, env, free_func)
-
-#define AXIS2_PROPERTY_SET_SCOPE(property, env, scope) \
- axis2_property_set_scope (property, env, scope)
-
-#define AXIS2_PROPERTY_SET_VALUE(property, env, value) \
- axis2_property_set_value (property, env, value)
-
-#define AXIS2_PROPERTY_GET_VALUE(property, env) \
- axis2_property_get_value(property, env)
-
-#define AXIS2_PROPERTY_CLONE(property, env) \
- axis2_property_clone(property, env)
/*************************** End of function macros ***************************/
Modified: webservices/axis2/trunk/c/util/include/axis2_qname.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_qname.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_qname.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_qname.h Sat Mar 17 01:12:54 2007
@@ -123,27 +123,6 @@
axis2_qname_to_string(struct axis2_qname *qname,
const axis2_env_t *env);
-
-#define AXIS2_QNAME_FREE(qname, env) \
- axis2_qname_free(qname,env)
-
-#define AXIS2_QNAME_EQUALS(qname, env, qname1) \
- axis2_qname_equals(qname, env, qname1)
-
-#define AXIS2_QNAME_CLONE(qname, env) \
- axis2_qname_clone(qname, env)
-
-#define AXIS2_QNAME_GET_URI(qname, env) \
- axis2_qname_get_uri(qname, env)
-
-#define AXIS2_QNAME_GET_PREFIX(qname, env) \
- axis2_qname_get_prefix(qname, env)
-
-#define AXIS2_QNAME_GET_LOCALPART(qname, env) \
- axis2_qname_get_localpart(qname, env)
-
-#define AXIS2_QNAME_TO_STRING(qname, env) \
- axis2_qname_to_string(qname, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/util/include/axis2_rand.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_rand.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_rand.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_rand.h Sat Mar 17 01:12:54 2007
@@ -46,8 +46,7 @@
* @return int <code>int<code>
*/
AXIS2_EXTERN int AXIS2_CALL
-axis2_rand(
- unsigned int *seedp);
+axis2_rand(unsigned int *seedp);
/**
* This is reentrant and thread safe simple random number generator
@@ -60,8 +59,7 @@
* @return int If invalid range is entered -1 is returned <code>int<code>
*/
AXIS2_EXTERN int AXIS2_CALL
-axis2_rand_with_range(
- unsigned int *seedp,
+axis2_rand_with_range(unsigned int *seedp,
int start,
int end);
Modified: webservices/axis2/trunk/c/util/include/axis2_stack.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_stack.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_stack.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_stack.h Sat Mar 17 01:12:54 2007
@@ -77,24 +77,6 @@
const axis2_env_t *env,
int i);
-#define AXIS2_STACK_FREE( stack, env) \
- axis2_stack_free( stack, env)
-
-#define AXIS2_STACK_POP( stack, env) \
- axis2_stack_pop( stack, env)
-
-#define AXIS2_STACK_PUSH( stack, env, value) \
- axis2_stack_push( stack, env, value)
-
-#define AXIS2_STACK_SIZE( stack, env) \
- axis2_stack_size( stack, env)
-
-#define AXIS2_STACK_GET( stack, env) \
- axis2_stack_get( stack, env)
-
-#define AXIS2_STACK_GET_AT( stack, env, i) \
- axis2_stack_get_at( stack, env, i)
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/util/include/axis2_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_stream.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_stream.h Sat Mar 17 01:12:54 2007
@@ -66,12 +66,12 @@
* @return axis2_status_t AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
axis2_status_t(AXIS2_CALL *
- free_fn)(axis2_stream_t *stream,
- const axis2_env_t *env);
+ free_fn)(axis2_stream_t *stream,
+ const axis2_env_t *env);
axis2_status_t(AXIS2_CALL *
- free_void_arg)(void *stream,
- const axis2_env_t *env);
+ free_void_arg)(void *stream,
+ const axis2_env_t *env);
/**
* reads from stream
@@ -81,10 +81,10 @@
*/
int(AXIS2_CALL *
- read)(axis2_stream_t *stream,
- const axis2_env_t *env,
- void *buffer,
- size_t count);
+ read)(axis2_stream_t *stream,
+ const axis2_env_t *env,
+ void *buffer,
+ size_t count);
/**
* writes into stream
* @param buffer buffer to be written
@@ -92,19 +92,19 @@
* @return no: of bytes actually written
*/
int(AXIS2_CALL *
- write)(axis2_stream_t *stream,
- const axis2_env_t *env,
- const void *buffer,
- size_t count);
+ write)(axis2_stream_t *stream,
+ const axis2_env_t *env,
+ const void *buffer,
+ size_t count);
/**
* Skips over and discards n bytes of data from this input stream.
* @param count number of bytes to be discarded
* @return no: of bytes actually skipped
*/
int(AXIS2_CALL *
- skip)(axis2_stream_t *stream,
- const axis2_env_t *env,
- int count);
+ skip)(axis2_stream_t *stream,
+ const axis2_env_t *env,
+ int count);
/**
* Returns the length of the stream (applicable only to basic stream)
@@ -112,8 +112,8 @@
* (we can't define a length of a stream unless it is just a buffer)
*/
int(AXIS2_CALL *
- get_len)(axis2_stream_t *stream,
- const axis2_env_t *env);
+ get_len)(axis2_stream_t *stream,
+ const axis2_env_t *env);
};
/**
@@ -161,7 +161,7 @@
* into the module_desc structure's free method
*/
- AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_stream_free_void_arg(void *stream,
const axis2_env_t *env);
@@ -178,7 +178,7 @@
AXIS2_EXTERN int AXIS2_CALL
axis2_stream_peek_socket(axis2_stream_t *stream, const axis2_env_t *env,
- void *buffer, size_t count);
+ void *buffer, size_t count);
#define AXIS2_STREAM_FREE(stream, env) ((stream->ops)->free_fn(stream, env))
Modified: webservices/axis2/trunk/c/util/include/axis2_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_string.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_string.h Sat Mar 17 01:12:54 2007
@@ -298,55 +298,6 @@
axis2_strcasestr(const axis2_char_t *heystack,
const axis2_char_t *needle);
-
-#define AXIS2_STRDUP(pts, env) \
- axis2_strdup(pts, env)
-
-#define AXIS2_STRNDUP(pts, n, env) \
- axis2_strndup(pts, n, env)
-
-#define AXIS2_STRMEMDUP(pts, n, env) \
- axis2_strmemdup(pts, n, env)
-
-#define AXIS2_MEMCHR(pts, c, n) \
- axis2_memchr(pts, c, n)
-
-#define AXIS2_STRCMP(s1, s2) \
- axis2_strcmp(s1, s2)
-
-#define AXIS2_STRNCMP(s1, s2, n) \
- axis2_strncmp(s1, s2, n)
-
-#define AXIS2_STRLEN(s) \
- axis2_strlen(s)
-
-#define AXIS2_STRCASECMP(s1,s2) \
- axis2_strcasecmp(s1,s2)
-
-#define AXIS2_STRNCASECMP(s1,s2,n) \
- axis2_strncasecmp(s1,s2,n)
-
-#define AXIS2_STRACAT(s1, s2, env) \
- axis2_stracat(s1, s2, env)
-
-#define AXIS2_STRSTR(s1, s2) \
- axis2_strstr(s1, s2)
-
-#define AXIS2_RINDEX(s, c) \
- axis2_rindex(s, c)
-
-#define AXIS2_REPLACE(env, str, s1, s2) \
- axis2_replace(env, str, s1, s2)
-
-#define AXIS2_STRLTRIM(env, s, trim) \
- axis2_strltrim(env, s, trim)
-
-#define AXIS2_STRRTRIM(env, s, trim) \
- axis2_strrtrim(env, s, trim)
-
-#define AXIS2_STRTRIM(env, s, trim) \
- axis2_strtrim(env, s, trim)
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/util/include/axis2_uri.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_uri.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_uri.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_uri.h Sat Mar 17 01:12:54 2007
@@ -186,26 +186,6 @@
axis2_uri_clone(const axis2_uri_t *uri,
const axis2_env_t *env);
-#define AXIS2_URI_FREE(uri, env) \
- axis2_uri_free(uri, env)
-
-#define AXIS2_URI_TO_STRING(uri, env, flags) \
- axis2_uri_to_string(uri, env, flags)
-
-#define AXIS2_URI_GET_PROTOCOL(uri, env) \
- axis2_uri_get_protocol(uri, env)
-
-#define AXIS2_URI_GET_SERVER(uri, env) \
- axis2_uri_get_server(uri, env)
-
-#define AXIS2_URI_GET_PORT(uri, env) \
- axis2_uri_get_port(uri, env)
-
-#define AXIS2_URI_GET_PATH(uri, env) \
- axis2_uri_get_path(uri, env)
-
-#define AXIS2_URI_CLONE(uri, env) \
- axis2_uri_clone(uri, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/util/include/axis2_url.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_url.h?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_url.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_url.h Sat Mar 17 01:12:54 2007
@@ -107,39 +107,6 @@
axis2_url_free(axis2_url_t *url,
const axis2_env_t *env);
-#define AXIS2_URL_TO_EXTERNAL_FORM(url, env) \
- axis2_url_to_external_form(url, env)
-
-#define AXIS2_URL_SET_PROTOCOL(url, env, protocol) \
- axis2_url_set_prtocol(url, env, protocol)
-
-#define AXIS2_URL_GET_PROTOCOL(url, env) \
- axis2_url_get_protocol(url, env)
-
-#define AXIS2_URL_SET_SERVER(url, env, server) \
- axis2_url_set_server(url, env, server)
-
-#define AXIS2_URL_GET_SERVER(url, env) \
- axis2_url_get_server(url, env)
-
-#define AXIS2_URL_SET_PORT(url, env, port) \
- axis2_url_set_port(url, env, port)
-
-#define AXIS2_URL_GET_PORT(url, env) \
- axis2_url_get_port(url, env)
-
-#define AXIS2_URL_SET_PATH(url, env, path) \
- axis2_url_set_path(url, env, path)
-
-#define AXIS2_URL_GET_PATH(url, env) \
- axis2_url_get_path(url, env)
-
-#define AXIS2_URL_CLONE(url, env) \
- axis2_url_clone(url, env)
-
-#define AXIS2_URL_FREE(url, env) \
- axis2_url_free(url, env)
-
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/trunk/c/util/src/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/class_loader.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/src/class_loader.c (original)
+++ webservices/axis2/trunk/c/util/src/class_loader.c Sat Mar 17 01:12:54 2007
@@ -67,7 +67,7 @@
axis2_dll_type_t dll_type = AXIS2_SVC_DLL;
axis2_error_codes_t error_code = AXIS2_ERROR_NONE;
- dll_desc = AXIS2_PARAM_GET_VALUE(impl_info_param, env);
+ dll_desc = axis2_param_get_value(impl_info_param, env);
if (!dll_desc)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_DLL_CREATE_FAILED,
Modified: webservices/axis2/trunk/c/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Sat Mar 17 01:12:54 2007
@@ -84,8 +84,8 @@
return NULL;
}
axis2_file_set_name(arch_file, env, fname);
- temp_path = AXIS2_STRACAT(pathname, AXIS2_PATH_SEP_STR, env);
- path = AXIS2_STRACAT(temp_path, fname, env);
+ temp_path = axis2_stracat(pathname, AXIS2_PATH_SEP_STR, env);
+ path = axis2_stracat(temp_path, fname, env);
AXIS2_FREE(env->allocator, temp_path);
if (!path)
{
@@ -219,8 +219,8 @@
return NULL;
}
axis2_file_set_name(arch_file, env, fname);
- temp_path = AXIS2_STRACAT(pathname, AXIS2_PATH_SEP_STR, env);
- path = AXIS2_STRACAT(temp_path, fname, env);
+ temp_path = axis2_stracat(pathname, AXIS2_PATH_SEP_STR, env);
+ path = axis2_stracat(temp_path, fname, env);
if (!path)
{
int size = 0;
@@ -304,7 +304,7 @@
return (AXIS2_FALSE);
/* Check for filename extensions */
- ptr = AXIS2_RINDEX(entry->d_name, '.');
+ ptr = axis2_rindex(entry->d_name, '.');
if ((ptr) &&
((strcmp(ptr, AXIS2_LIB_SUFFIX) == 0)))
{
Modified: webservices/axis2/trunk/c/util/src/dll_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dll_desc.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Sat Mar 17 01:12:54 2007
@@ -116,7 +116,7 @@
AXIS2_FREE(env->allocator, dll_desc->path_qualified_dll_name);
}
- dll_desc->path_qualified_dll_name = AXIS2_STRDUP(name, env);
+ dll_desc->path_qualified_dll_name = axis2_strdup(name, env);
if (!dll_desc->path_qualified_dll_name)
{
return AXIS2_FAILURE;
@@ -272,8 +272,8 @@
AXIS2_ENV_CHECK(env, NULL);
- temp_name = AXIS2_STRACAT(AXIS2_LIB_PREFIX, class_name, env);
- dll_desc->dll_name = AXIS2_STRACAT(temp_name, AXIS2_LIB_SUFFIX, env);
+ temp_name = axis2_stracat(AXIS2_LIB_PREFIX, class_name, env);
+ dll_desc->dll_name = axis2_stracat(temp_name, AXIS2_LIB_SUFFIX, env);
AXIS2_FREE(env->allocator, temp_name);
return dll_desc->dll_name;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org