You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/03/17 09:13:00 UTC
svn commit: r519261 [1/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...
Author: dinesh
Date: Sat Mar 17 01:12:54 2007
New Revision: 519261
URL: http://svn.apache.org/viewvc?view=rev&rev=519261
Log:
patch applied, thanks Diluka
Modified:
webservices/axis2/trunk/c/guththila/samples/guththila_main.c
webservices/axis2/trunk/c/guththila/src/guththila_token.c
webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c
webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c
webservices/axis2/trunk/c/rampart/samples/authn_provider/authn_provider.c
webservices/axis2/trunk/c/rampart/samples/callback/htpasswd_callback/htpwcb.c
webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c
webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c
webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlenc/enc.c
webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/asym_ctx.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/axis2_utils.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/encryption.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/util.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/x509.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_ctx.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/sign_part.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/signature.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/transform.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/utility.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/x509_cert.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/binding_commons_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_asymmetric_commons_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/model/algorithmsuite.c
webservices/axis2/trunk/c/rampart/src/util/rampart_action.c
webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_util.c
webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
webservices/axis2/trunk/c/rampart/src/util/rampart_sec_processed_result.c
webservices/axis2/trunk/c/rampart/src/util/rampart_util.c
webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
webservices/axis2/trunk/c/rampart/src/util/username_token.c
webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c
webservices/axis2/trunk/c/rampart/test/openssl/block_cipher_test.c
webservices/axis2/trunk/c/rampart/test/openssl/rsa/test_rsa.c
webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
webservices/axis2/trunk/c/samples/client/dynamic_client/test.c
webservices/axis2/trunk/c/samples/client/echo/echo.c
webservices/axis2/trunk/c/samples/client/google/google_client.c
webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
webservices/axis2/trunk/c/samples/client/math/math_client.c
webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
webservices/axis2/trunk/c/samples/client/notify/notify_client.c
webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c
webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/add.c
webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
webservices/axis2/trunk/c/savan/src/client/savan_client.c
webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c
webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
webservices/axis2/trunk/c/savan/src/util/savan_util.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
webservices/axis2/trunk/c/test/core/description/test_description.c
webservices/axis2/trunk/c/test/core/engine/test_engine.c
webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c
webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c
webservices/axis2/trunk/c/tools/codegen/samples/server/calculator/axis2_svc_skel_calculator.c
webservices/axis2/trunk/c/tools/codegen/samples/server/interop_test_svc/axis2_svc_skel_interop_test_port_type_doc_service.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c
webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c
webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c
webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
webservices/axis2/trunk/c/tools/codegen/src/templates/c/CADBBeanTemplateSource.xsl
webservices/axis2/trunk/c/tools/codegen/src/templates/c/ServiceSkeleton.xsl
webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c
webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c
webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c
webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c
webservices/axis2/trunk/c/tools/codegen/src/util/messages.c
webservices/axis2/trunk/c/tools/codegen/src/util/properties.c
webservices/axis2/trunk/c/tools/codegen/src/util/string.c
webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c
webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c
webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c
webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c
webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
webservices/axis2/trunk/c/tools/tcpmon/src/session.c
webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c
webservices/axis2/trunk/c/tools/tcpmon/src/util.c
webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c
webservices/axis2/trunk/c/util/include/axis2_param.h
webservices/axis2/trunk/c/util/include/axis2_param_container.h
webservices/axis2/trunk/c/util/include/axis2_properties.h
webservices/axis2/trunk/c/util/include/axis2_property.h
webservices/axis2/trunk/c/util/include/axis2_qname.h
webservices/axis2/trunk/c/util/include/axis2_rand.h
webservices/axis2/trunk/c/util/include/axis2_stack.h
webservices/axis2/trunk/c/util/include/axis2_stream.h
webservices/axis2/trunk/c/util/include/axis2_string.h
webservices/axis2/trunk/c/util/include/axis2_uri.h
webservices/axis2/trunk/c/util/include/axis2_url.h
webservices/axis2/trunk/c/util/src/class_loader.c
webservices/axis2/trunk/c/util/src/dir_handler.c
webservices/axis2/trunk/c/util/src/dll_desc.c
webservices/axis2/trunk/c/util/src/file.c
webservices/axis2/trunk/c/util/src/hash.c
webservices/axis2/trunk/c/util/src/log.c
webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
webservices/axis2/trunk/c/util/src/param.c
webservices/axis2/trunk/c/util/src/param_container.c
webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c
webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c
webservices/axis2/trunk/c/util/src/properties.c
webservices/axis2/trunk/c/util/src/property.c
webservices/axis2/trunk/c/util/src/qname.c
webservices/axis2/trunk/c/util/src/rand.c
webservices/axis2/trunk/c/util/src/stack.c
webservices/axis2/trunk/c/util/src/stream.c
webservices/axis2/trunk/c/util/src/string.c
webservices/axis2/trunk/c/util/src/string_util.c
webservices/axis2/trunk/c/util/src/thread_pool.c
webservices/axis2/trunk/c/util/src/uri.c
webservices/axis2/trunk/c/util/src/url.c
webservices/axis2/trunk/c/util/src/utils.c
webservices/axis2/trunk/c/util/src/uuid_gen.c
webservices/axis2/trunk/c/util/test/util/test_string.c
webservices/axis2/trunk/c/util/test/util/test_util.c
Modified: webservices/axis2/trunk/c/guththila/samples/guththila_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/samples/guththila_main.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/guththila/samples/guththila_main.c (original)
+++ webservices/axis2/trunk/c/guththila/samples/guththila_main.c Sat Mar 17 01:12:54 2007
@@ -125,7 +125,7 @@
AXIS2_FREE(allocator, p);
}
}
- depth = (guththila_depth_t *) AXIS2_STACK_GET(parser->dep, environment);
+ depth = (guththila_depth_t *) axis2_stack_get(parser->dep, environment);
d = depth->count;
for (; d > 0; d--)
{
Modified: webservices/axis2/trunk/c/guththila/src/guththila_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_token.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_token.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_token.c Sat Mar 17 01:12:54 2007
@@ -127,7 +127,7 @@
int ix = 0;
guththila_char_t *ref_buffer = NULL;
- len = AXIS2_STRLEN(buffer);
+ len = axis2_strlen(buffer);
ref_buffer = (guththila_char_t *) AXIS2_MALLOC(
environment->allocator, len + 1);
@@ -353,11 +353,11 @@
{
guththila_token_t *el = NULL;
int isize = 0;
- isize = AXIS2_STACK_SIZE(stack, environment);
- /* el = (guththila_token_t *) AXIS2_STACK_GET_AT (stack, environment, isize-1); */
+ isize = axis2_stack_size(stack, environment);
+ /* el = (guththila_token_t *) axis2_stack_get_at (stack, environment, isize-1); */
for (; isize > 0; isize--)
{
- el = (guththila_token_t *) AXIS2_STACK_GET_AT(stack,
+ el = (guththila_token_t *) axis2_stack_get_at(stack,
environment,
isize - 1);
guththila_token_relocate(environment, el, offset);
Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c Sat Mar 17 01:12:54 2007
@@ -78,37 +78,37 @@
if (parser->stack)
{
- ii = AXIS2_STACK_SIZE(parser->stack, environment);
+ ii = axis2_stack_size(parser->stack, environment);
for (; ii > 0; ii--)
{
guththila_token_t *d;
- d = (guththila_token_t *)AXIS2_STACK_POP(parser->stack, environment);
+ d = (guththila_token_t *)axis2_stack_pop(parser->stack, environment);
guththila_token_free (environment, d);
}
- AXIS2_STACK_FREE(parser->stack, environment);
+ axis2_stack_free(parser->stack, environment);
}
if (parser->attrib)
{
- int ii = AXIS2_STACK_SIZE(parser->attrib, environment);
+ int ii = axis2_stack_size(parser->attrib, environment);
guththila_attribute_t *attribute;
for (; ii > 0; ii--)
{
- attribute = AXIS2_STACK_POP(parser->attrib, environment);
+ attribute = axis2_stack_pop(parser->attrib, environment);
guththila_attribute_free (environment, attribute);
}
- AXIS2_STACK_FREE(parser->attrib, environment);
+ axis2_stack_free(parser->attrib, environment);
}
if (parser->namesp)
{
- int ii = AXIS2_STACK_SIZE(parser->namesp, environment);
+ int ii = axis2_stack_size(parser->namesp, environment);
guththila_namespace_t *namespace;
for (; ii > 0; ii--)
{
- namespace = (guththila_namespace_t *) AXIS2_STACK_POP(parser->namesp, environment);
+ namespace = (guththila_namespace_t *) axis2_stack_pop(parser->namesp, environment);
if (namespace->name)
{
AXIS2_FREE(environment->allocator, namespace->name);
@@ -121,31 +121,31 @@
}
AXIS2_FREE (environment->allocator, namespace);
}
- AXIS2_STACK_FREE(parser->namesp, environment);
+ axis2_stack_free(parser->namesp, environment);
}
if (parser->dep)
{
- int ii = AXIS2_STACK_SIZE(parser->dep, environment);
+ int ii = axis2_stack_size(parser->dep, environment);
guththila_depth_t *depth;
for (; ii > 0; ii--)
{
- depth = (guththila_depth_t *)AXIS2_STACK_POP(parser->dep, environment);
+ depth = (guththila_depth_t *)axis2_stack_pop(parser->dep, environment);
AXIS2_FREE(environment->allocator, depth);
}
- AXIS2_STACK_FREE(parser->dep, environment);
+ axis2_stack_free(parser->dep, environment);
}
if (parser->other)
{
- int ii = AXIS2_STACK_SIZE(parser->other, environment);
+ int ii = axis2_stack_size(parser->other, environment);
void *element = NULL;
for (; ii > 0; ii--)
{
- element = AXIS2_STACK_POP(parser->other, environment);
+ element = axis2_stack_pop(parser->other, environment);
AXIS2_FREE(environment->allocator, element);
}
- AXIS2_STACK_FREE(parser->other, environment);
+ axis2_stack_free(parser->other, environment);
}
AXIS2_FREE(environment->allocator, (void *) parser);
@@ -198,7 +198,7 @@
guththila_buffer_grow(environment, parser->buffer, parser->_next);
guththila_relocate_tokens(environment, parser->stack,
(buff - parser->buffer->buff));
- AXIS2_STACK_PUSH(parser->other, environment, buff);
+ axis2_stack_push(parser->other, environment, buff);
}
}
c = guththila_reader_read(environment, (parser->buffer->buff),
@@ -307,7 +307,7 @@
sizeof(guththila_token_t));
t->type = Unknown;
t->start = guththila_last_char(environment, parser);
- AXIS2_STACK_PUSH(parser->stack, environment, t);
+ axis2_stack_push(parser->stack, environment, t);
}
@@ -317,7 +317,7 @@
int t, int refer)
{
guththila_token_t *token =
- (guththila_token_t *) AXIS2_STACK_GET(parser->stack, environment);
+ (guththila_token_t *) axis2_stack_get(parser->stack, environment);
token->type = t;
token->ref = refer;
token->end =
@@ -576,20 +576,20 @@
parser->is_whitespace = 0;
parser->is_char = 0;
- ii = AXIS2_STACK_SIZE(parser->attrib, environment);
+ ii = axis2_stack_size(parser->attrib, environment);
for (; ii > 0; ii--)
{
guththila_attribute_t *attribute;
- attribute = (guththila_attribute_t *) AXIS2_STACK_POP(parser->attrib,
+ attribute = (guththila_attribute_t *) axis2_stack_pop(parser->attrib,
environment);
guththila_attribute_free (environment, attribute);
}
- ii = AXIS2_STACK_SIZE(parser->stack, environment);
+ ii = axis2_stack_size(parser->stack, environment);
for (; ii > 0; ii--)
{
guththila_token_t *d;
- d = (guththila_token_t *)AXIS2_STACK_POP(parser->stack, environment);
+ d = (guththila_token_t *)axis2_stack_pop(parser->stack, environment);
guththila_token_free (environment, d);
}
@@ -987,14 +987,14 @@
guththila_token_t *token;
guththila_token_t *att_name;
guththila_token_t *att_value;
- ix = AXIS2_STACK_SIZE(parser->stack, environment);
+ ix = axis2_stack_size(parser->stack, environment);
for (; ix > 0; ix--)
{
- token = (guththila_token_t *)AXIS2_STACK_POP(parser->stack, environment);
+ token = (guththila_token_t *)axis2_stack_pop(parser->stack, environment);
if (token->type == _attribute_value)
{
att_value = token;
- token = (guththila_token_t *)AXIS2_STACK_POP(parser->stack, environment);
+ token = (guththila_token_t *)axis2_stack_pop(parser->stack, environment);
ix--;
att_name = token;
guththila_add_attribute(environment,
@@ -1011,18 +1011,18 @@
guththila_token_t *token;
guththila_token_t *name = NULL;
guththila_token_t *value = NULL;
- is = AXIS2_STACK_SIZE(parser->stack, environment);
+ is = axis2_stack_size(parser->stack, environment);
for (;
- is > 0 && AXIS2_STACK_SIZE(parser->stack, environment);
+ is > 0 && axis2_stack_size(parser->stack, environment);
is--)
{
- token = (guththila_token_t *) AXIS2_STACK_POP(parser->stack, environment);
+ token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
/* be careful about memory leaks, when we pull it we get
seperate _element need to free it properly */
if (token->type == _attribute_value)
{
value = token;
- token = (guththila_token_t *) AXIS2_STACK_POP(parser->stack, environment);
+ token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
is--;
name = token;
if (!guththila_token_compare
@@ -1055,7 +1055,7 @@
(environment, token, "xmlns", 5,
parser->unicode_state))
{
- attribute = (guththila_attribute_t *) AXIS2_STACK_POP(parser->attrib, environment);
+ attribute = (guththila_attribute_t *) axis2_stack_pop(parser->attrib, environment);
guththila_add_namespace(environment,
parser,
attribute->
@@ -1071,11 +1071,11 @@
parser->prefix = token;
else
{
- attribute = (guththila_attribute_t *) AXIS2_STACK_POP(parser->attrib, environment);
+ attribute = (guththila_attribute_t *) axis2_stack_pop(parser->attrib, environment);
guththila_add_attribute_with_prefix
(environment, parser, token,
attribute->name, attribute->value);
- AXIS2_STACK_PUSH (parser->other, environment, (void *) attribute);
+ axis2_stack_push (parser->other, environment, (void *) attribute);
}
}
}
@@ -1088,15 +1088,15 @@
case GUTHTHILA_END_ELEMENT:
{
guththila_token_t *token;
- token = (guththila_token_t *) AXIS2_STACK_POP(parser->stack, environment);
+ token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
if (token->type == _name)
{
parser->name = token;
}
- if (AXIS2_STACK_SIZE(parser->stack, environment))
+ if (axis2_stack_size(parser->stack, environment))
{
- token = (guththila_token_t *) AXIS2_STACK_POP(parser->stack, environment);
+ token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
if (token->type == _prefix)
parser->prefix = token;
}
@@ -1105,7 +1105,7 @@
case GUTHTHILA_CHARACTER:
{
guththila_token_t *token;
- token = (guththila_token_t *) AXIS2_STACK_POP(parser->stack, environment);
+ token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
parser->value = token;
}
break;
@@ -1129,22 +1129,22 @@
sizeof(guththila_depth_t));
guththila_depth_t *l = NULL;
guththila_depth_t *depth;
- ii = AXIS2_STACK_SIZE(parser->dep, environment);
+ ii = axis2_stack_size(parser->dep, environment);
if (!ii)
{
m->first = 0;
- m->total = AXIS2_STACK_SIZE(parser->namesp, environment);
+ m->total = axis2_stack_size(parser->namesp, environment);
m->count = m->total;
- AXIS2_STACK_PUSH(parser->dep, environment, m);
+ axis2_stack_push(parser->dep, environment, m);
}
else
{
- depth = (guththila_depth_t *) AXIS2_STACK_GET(parser->dep, environment);
+ depth = (guththila_depth_t *) axis2_stack_get(parser->dep, environment);
l = depth;
m->first = l->first + l->count;
- m->total = AXIS2_STACK_SIZE(parser->namesp, environment);
+ m->total = axis2_stack_size(parser->namesp, environment);
m->count = m->total - l->total;
- AXIS2_STACK_PUSH(parser->dep, environment, m);
+ axis2_stack_push(parser->dep, environment, m);
}
}
@@ -1157,11 +1157,11 @@
guththila_depth_t *depth;
guththila_namespace_t *namespace;
int ii;
- depth = (guththila_depth_t *) AXIS2_STACK_POP(parser->dep, environment);
+ depth = (guththila_depth_t *) axis2_stack_pop(parser->dep, environment);
ii = depth->count;
for (; ii > 0; ii--)
{
- namespace = (guththila_namespace_t *) AXIS2_STACK_POP(parser->namesp, environment);
+ namespace = (guththila_namespace_t *) axis2_stack_pop(parser->namesp, environment);
if (namespace->name)
{
AXIS2_FREE(environment->allocator, namespace->name);
@@ -1188,7 +1188,7 @@
{
guththila_attribute_t *att = NULL;
att = guththila_attribute_create (environment, NULL, name, value, NULL);
- AXIS2_STACK_PUSH(parser->attrib, environment, att);
+ axis2_stack_push(parser->attrib, environment, att);
}
@@ -1205,7 +1205,7 @@
{
guththila_attribute_t *att;
att = guththila_attribute_create (environment, prefix, name, value, NULL);
- AXIS2_STACK_PUSH(parser->attrib, environment, att);
+ axis2_stack_push(parser->attrib, environment, att);
}
void AXIS2_CALL
@@ -1221,12 +1221,12 @@
ns->name = guththila_token_to_string(environment,
name,
parser->unicode_state);
- ns->length = AXIS2_STRLEN(ns->name);
+ ns->length = axis2_strlen(ns->name);
ns->uri = guththila_token_to_string(environment,
uri,
parser->unicode_state);
- ns->lengthuri = AXIS2_STRLEN(ns->uri);
- AXIS2_STACK_PUSH(parser->namesp, environment, ns);
+ ns->lengthuri = axis2_strlen(ns->uri);
+ axis2_stack_push(parser->namesp, environment, ns);
}
@@ -1236,7 +1236,7 @@
guththila_t *
parser)
{
- return AXIS2_STACK_SIZE(parser->attrib, environment);
+ return axis2_stack_size(parser->attrib, environment);
}
@@ -1246,7 +1246,7 @@
guththila_t * parser)
{
guththila_attribute_t *attribute;
- attribute = (guththila_attribute_t *) AXIS2_STACK_POP(parser->attrib, environment);
+ attribute = (guththila_attribute_t *) axis2_stack_pop(parser->attrib, environment);
if (attribute)
return attribute;
else
@@ -1305,13 +1305,13 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_attribute_prefix_by_number(axis2_env_t * environment, guththila_t * parser, int i)
{
- int ix = AXIS2_STACK_SIZE(parser->attrib, environment);
+ int ix = axis2_stack_size(parser->attrib, environment);
guththila_attribute_t *attribute = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- attribute = (guththila_attribute_t *) AXIS2_STACK_GET_AT(parser->attrib, environment, ix - i);
+ attribute = (guththila_attribute_t *) axis2_stack_get_at(parser->attrib, environment, ix - i);
}
return guththila_token_to_string(environment, attribute->prefix,
parser->unicode_state);
@@ -1321,13 +1321,13 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_attribute_name_by_number(axis2_env_t * environment, guththila_t * parser, int i)
{
- int ix = AXIS2_STACK_SIZE(parser->attrib, environment);
+ int ix = axis2_stack_size(parser->attrib, environment);
guththila_attribute_t *attribute = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- attribute = (guththila_attribute_t *) AXIS2_STACK_GET_AT(parser->attrib, environment, ix - i);
+ attribute = (guththila_attribute_t *) axis2_stack_get_atT(parser->attrib, environment, ix - i);
}
return guththila_token_to_string(environment, attribute->name,
parser->unicode_state);
@@ -1338,13 +1338,13 @@
guththila_get_attribute_value_by_number(axis2_env_t * environment,
guththila_t * parser, int i)
{
- int ix = AXIS2_STACK_SIZE(parser->attrib, environment);
+ int ix = axis2_stack_size(parser->attrib, environment);
guththila_attribute_t *attribute = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- attribute = (guththila_attribute_t *) AXIS2_STACK_GET_AT(parser->attrib, environment, ix - i);
+ attribute = (guththila_attribute_t *) axis2_stack_get_at(parser->attrib, environment, ix - i);
}
return guththila_token_to_string(environment, attribute->value,
parser->unicode_state);
@@ -1393,7 +1393,7 @@
parser)
{
if (parser->namesp)
- return AXIS2_STACK_SIZE(parser->namesp, environment);
+ return axis2_stack_size(parser->namesp, environment);
else
return 0;
}
@@ -1405,7 +1405,7 @@
guththila_t * parser)
{
guththila_namespace_t *namespace;
- namespace = (guththila_namespace_t *) AXIS2_STACK_GET(parser->namesp, environment);
+ namespace = (guththila_namespace_t *) axis2_stack_get(parser->namesp, environment);
if (namespace)
return namespace;
else
@@ -1421,7 +1421,7 @@
guththila_namespace_t * ns)
{
if (ns)
- return AXIS2_STRDUP(ns->name, environment);
+ return axis2_strdup(ns->name, environment);
else
return NULL;
}
@@ -1435,7 +1435,7 @@
guththila_namespace_t * ns)
{
if (ns)
- return AXIS2_STRDUP(ns->uri, environment);
+ return axis2_strdup(ns->uri, environment);
else
return NULL;
}
@@ -1446,15 +1446,15 @@
guththila_t * parser,
int i)
{
- int ix = AXIS2_STACK_SIZE(parser->namesp, environment);
+ int ix = axis2_stack_size(parser->namesp, environment);
guththila_namespace_t *ns = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- ns = (guththila_namespace_t *) AXIS2_STACK_GET_AT(parser->namesp, environment, ix - i);
+ ns = (guththila_namespace_t *) axis2_stack_get_at(parser->namesp, environment, ix - i);
}
- return AXIS2_STRDUP(ns->name, environment);
+ return axis2_strdup(ns->name, environment);
}
@@ -1464,15 +1464,15 @@
guththila_t
* parser, int i)
{
- int ix = AXIS2_STACK_SIZE(parser->namesp, environment);
+ int ix = axis2_stack_size(parser->namesp, environment);
guththila_namespace_t *ns = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- ns = (guththila_namespace_t *) AXIS2_STACK_GET_AT(parser->namesp, environment, ix - i);
+ ns = (guththila_namespace_t *) axis2_stack_get_at(parser->namesp, environment, ix - i);
}
- return AXIS2_STRDUP(ns->uri, environment);
+ return axis2_strdup(ns->uri, environment);
}
@@ -1483,7 +1483,7 @@
{
guththila_char_t *att_prefix;
int ii;
- int ix = AXIS2_STACK_SIZE(parser->namesp, environment);
+ int ix = axis2_stack_size(parser->namesp, environment);
guththila_namespace_t *ns = NULL;
att_prefix =
guththila_get_attribute_prefix_by_number(environment,
@@ -1491,15 +1491,15 @@
for (ii = 0; ii <= ix; ii++)
{
- ns = (guththila_namespace_t *) AXIS2_STACK_GET_AT(parser->namesp, environment, ix - ii);
+ ns = (guththila_namespace_t *) axis2_stack_get_at(parser->namesp, environment, ix - ii);
if (ns)
{
if (ns && att_prefix)
{
if (!
- (AXIS2_STRCMP
+ (axis2_strcmp
(ns->name, att_prefix)))
- return AXIS2_STRDUP(ns->uri, environment);
+ return axis2_strdup(ns->uri, environment);
}
}
}
Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c Sat Mar 17 01:12:54 2007
@@ -79,17 +79,17 @@
void *element;
size = 0;
- size = AXIS2_STACK_SIZE(p->xsw->element, env);
+ size = axis2_stack_size(p->xsw->element, env);
if (size)
{
for (; size > 0; size--)
{
- element = AXIS2_STACK_POP(p->xsw->element, env);
+ element = axis2_stack_pop(p->xsw->element, env);
AXIS2_FREE(env->allocator, element);
element = NULL;
}
}
- AXIS2_STACK_FREE(p->xsw->element, env);
+ axis2_stack_free(p->xsw->element, env);
p->xsw->element = NULL;
}
@@ -97,18 +97,18 @@
if (p->xsw->attribute)
{
size = 0;
- size = AXIS2_STACK_SIZE(p->xsw->attribute, env);
+ size = axis2_stack_size(p->xsw->attribute, env);
if (size)
{
guththila_attribute_t* att;
for (;size > 0; size--)
{
- att = (guththila_attribute_t *)AXIS2_STACK_POP(p->xsw->attribute, env);
+ att = (guththila_attribute_t *)axis2_stack_pop(p->xsw->attribute, env);
guththila_attribute_free (env, att);
att = NULL;
}
}
- AXIS2_STACK_FREE(p->xsw->attribute, env);
+ axis2_stack_free(p->xsw->attribute, env);
p->xsw->attribute = NULL;
}
@@ -116,18 +116,18 @@
if (p->xsw->namespace)
{
size = 0;
- size = AXIS2_STACK_SIZE(p->xsw->namespace, env);
+ size = axis2_stack_size(p->xsw->namespace, env);
if (size)
{
guththila_namespace_t* ns;
for (;size > 0; size--)
{
- ns = (guththila_namespace_t *)AXIS2_STACK_POP(p->xsw->namespace, env);
+ ns = (guththila_namespace_t *)axis2_stack_pop(p->xsw->namespace, env);
AXIS2_FREE(env->allocator, ns);
ns = NULL;
}
}
- AXIS2_STACK_FREE(p->xsw->namespace, env);
+ axis2_stack_free(p->xsw->namespace, env);
p->xsw->namespace = NULL;
}
@@ -135,18 +135,18 @@
if (p->xsw->depth)
{
size = 0;
- size = AXIS2_STACK_SIZE(p->xsw->depth, env);
+ size = axis2_stack_size(p->xsw->depth, env);
if (size)
{
guththila_depth_t* depth;
for (;size > 0; size--)
{
- depth = (guththila_depth_t *)AXIS2_STACK_POP(p->xsw->depth, env);
+ depth = (guththila_depth_t *)axis2_stack_pop(p->xsw->depth, env);
AXIS2_FREE(env->allocator, depth);
depth = NULL;
}
}
- AXIS2_STACK_FREE(p->xsw->depth, env);
+ axis2_stack_free(p->xsw->depth, env);
p->xsw->depth = NULL;
}
@@ -193,7 +193,7 @@
{
void *element = NULL;
- element = AXIS2_STACK_POP(p->xsw->element, env);
+ element = axis2_stack_pop(p->xsw->element, env);
if (p->xsw->empty_element_open)
{
guththila_close_start_element(env, p);
@@ -226,11 +226,11 @@
guththila_close_start_element(env, p);
guththila_open_depth_element(env, p);
- size = AXIS2_STACK_SIZE(p->xsw->element, env);
+ size = axis2_stack_size(p->xsw->element, env);
if (size)
{
- element = AXIS2_STACK_GET_AT(p->xsw->element, env, 0);
+ element = axis2_stack_get_at(p->xsw->element, env, 0);
if (!strcmp((char *)element, start_element))
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
}
@@ -239,7 +239,7 @@
p->xsw->start_element_open = 1;
if (!p->xsw->empty_element_open)
- AXIS2_STACK_PUSH(p->xsw->element, env, start_element);
+ axis2_stack_push(p->xsw->element, env, start_element);
guththila_write_to_buffer(env, p, "<");
guththila_write_to_buffer(env, p, start_element);
}
@@ -269,7 +269,7 @@
init_buffer = writer_impl->buffer->buff;
writer_impl->buffer = guththila_buffer_grow(env, writer_impl->buffer, ii);
p->xsw->last = writer_impl->buffer->size;
- AXIS2_STACK_PUSH (p->other, env, init_buffer);;
+ axis2_stack_push (p->other, env, init_buffer);;
}
}
c = guththila_writer_write(env, (char *)buff, 0, ii, p->xsw->writer);
@@ -313,13 +313,13 @@
guththila_write_to_buffer(env, p, ">");
}
- stack_size = AXIS2_STACK_SIZE(p->xsw->attribute, env);
+ stack_size = axis2_stack_size(p->xsw->attribute, env);
if (stack_size)
{
guththila_attribute_t* att = NULL;
for (;stack_size > 0; stack_size--)
{
- att = (guththila_attribute_t *)AXIS2_STACK_POP(p->xsw->attribute, env);
+ att = (guththila_attribute_t *)axis2_stack_pop(p->xsw->attribute, env);
/* guththila_attribute_free (env, att); */
att = NULL;
}
@@ -454,13 +454,13 @@
if (!p->xsw->start_element_open)
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EMPTY_ARGUMENTS);
- size = AXIS2_STACK_SIZE(p->xsw->attribute, env);
+ size = axis2_stack_size(p->xsw->attribute, env);
if (size)
{
int ii;
for (ii = 0; ii <= size; ii++)
{
- element = AXIS2_STACK_GET_AT(p->xsw->attribute, env, size - ii);
+ element = axis2_stack_get_at(p->xsw->attribute, env, size - ii);
if (element)
{
attr = (guththila_attribute_t *)element;
@@ -497,7 +497,7 @@
attr->value = (guththila_token_t *)value;
if (local_name && value)
{
- AXIS2_STACK_PUSH(p->xsw->attribute, env, attr);
+ axis2_stack_push(p->xsw->attribute, env, attr);
}
guththila_check_name_validity(env, p, (char *)local_name);
@@ -549,12 +549,12 @@
int ii;
void *element;
guththila_namespace_t *ns;
- size = AXIS2_STACK_SIZE(p->xsw->namespace, env);
+ size = axis2_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = AXIS2_STACK_GET_AT(p->xsw->namespace, env, size - ii);
+ element = axis2_stack_get_at(p->xsw->namespace, env, size - ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -581,7 +581,7 @@
ns->length = 0;
ns->uri = ns_uri;
ns->lengthuri = strlen(ns_uri);
- AXIS2_STACK_PUSH(p->xsw->namespace, env, (void *)ns);
+ axis2_stack_push(p->xsw->namespace, env, (void *)ns);
guththila_write_to_buffer(env, p, " ");
guththila_write_to_buffer(env, p, "xmlns");
@@ -616,12 +616,12 @@
int ii = 0;
void *element = NULL;
guththila_namespace_t *ns = NULL;
- size = AXIS2_STACK_SIZE(p->xsw->namespace, env);
+ size = axis2_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = AXIS2_STACK_GET_AT(p->xsw->namespace, env, size - ii);
+ element = axis2_stack_get_at(p->xsw->namespace, env, size - ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -656,7 +656,7 @@
ns->length = strlen(prefix);
ns->uri = uri;
ns->lengthuri = strlen(uri);
- AXIS2_STACK_PUSH(p->xsw->namespace, env, (void *)ns);
+ axis2_stack_push(p->xsw->namespace, env, (void *)ns);
guththila_write_to_buffer(env, p, " ");
guththila_write_to_buffer(env, p, "xmlns:");
@@ -682,13 +682,13 @@
if (prefix && namespace)
guththila_write_namespace(env, p, (char *)prefix, (char *)namespace);
- size = AXIS2_STACK_SIZE(p->xsw->attribute, env);
+ size = axis2_stack_size(p->xsw->attribute, env);
if (size)
{
int ii;
for (ii = 0; ii <= size; ii++)
{
- element = AXIS2_STACK_GET_AT(p->xsw->attribute, env, size - ii);
+ element = axis2_stack_get_at(p->xsw->attribute, env, size - ii);
if (element)
{
attr = (guththila_attribute_t *)element;
@@ -738,8 +738,8 @@
if (value)
attr->value = (guththila_token_t *)value;
- AXIS2_STACK_PUSH(p->xsw->attribute, env, (void *)attr);
- AXIS2_STACK_PUSH(p->other, env, attr);
+ axis2_stack_push(p->xsw->attribute, env, (void *)attr);
+ axis2_stack_push(p->other, env, attr);
guththila_check_name_validity(env, p, (char *)local_name);
if (strrchr(value, '&')
@@ -774,13 +774,13 @@
exsists or not. */
if (guththila_is_exsisting_prefix(env, p, prefix))
{
- size = AXIS2_STACK_SIZE(p->xsw->attribute, env);
+ size = axis2_stack_size(p->xsw->attribute, env);
if (size)
{
int ii;
for (ii = 0; ii <= size; ii++)
{
- element = AXIS2_STACK_GET_AT(p->xsw->attribute, env, ii);
+ element = axis2_stack_get_at(p->xsw->attribute, env, ii);
if (element)
{
attr = (guththila_attribute_t *)element;
@@ -832,12 +832,12 @@
int ii;
void *element;
guththila_namespace_t *ns;
- size = AXIS2_STACK_SIZE(p->xsw->namespace, env);
+ size = axis2_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = AXIS2_STACK_GET_AT(p->xsw->namespace, env, ii);
+ element = axis2_stack_get_at(p->xsw->namespace, env, ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -862,12 +862,12 @@
int ii;
void *element;
guththila_namespace_t *ns;
- size = AXIS2_STACK_SIZE(p->xsw->namespace, env);
+ size = axis2_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = AXIS2_STACK_GET_AT(p->xsw->namespace, env , size - ii);
+ element = axis2_stack_get_at(p->xsw->namespace, env , size - ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -900,13 +900,13 @@
{
char *prefix;
prefix = guththila_get_prefix_for_namespace(env, p, namespace);
- size = AXIS2_STACK_SIZE(p->xsw->attribute, env);
+ size = axis2_stack_size(p->xsw->attribute, env);
if (size)
{
int ii;
for (ii = 0; ii <= size; ii++)
{
- element = AXIS2_STACK_GET_AT(p->xsw->attribute, env, size - ii);
+ element = axis2_stack_get_at(p->xsw->attribute, env, size - ii);
if (element)
{
attr = (guththila_attribute_t *)element;
@@ -950,12 +950,12 @@
int ii;
void *element;
guththila_namespace_t *ns;
- size = AXIS2_STACK_SIZE(p->xsw->namespace, env);
+ size = axis2_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = AXIS2_STACK_GET_AT(p->xsw->namespace, env, size - ii);
+ element = axis2_stack_get_at(p->xsw->namespace, env, size - ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -1009,22 +1009,22 @@
else
start_element = (char *)local_name;
- size = AXIS2_STACK_SIZE(p->xsw->element, env);
+ size = axis2_stack_size(p->xsw->element, env);
if (size)
{
- element = AXIS2_STACK_GET_AT(p->xsw->element, env, size);
+ element = axis2_stack_get_at(p->xsw->element, env, size);
if (start_element && element)
{
if (!strcmp((char *)element, start_element))
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
}
}
- AXIS2_STACK_PUSH(p->other, env, start_element);
+ axis2_stack_push(p->other, env, start_element);
guththila_check_name_validity(env, p, start_element);
p->xsw->start_element_open = 1;
if (!p->xsw->empty_element_open)
- AXIS2_STACK_PUSH(p->xsw->element, env, start_element);
+ axis2_stack_push(p->xsw->element, env, start_element);
guththila_write_to_buffer(env, p, "<");
guththila_write_to_buffer(env, p, start_element);
guththila_write_namespace(env, p, (char *)prefix, (char *)namespace_uri);
@@ -1063,11 +1063,11 @@
else
strcat(start_element, local_name);
- size = AXIS2_STACK_SIZE(p->xsw->element, env);
+ size = axis2_stack_size(p->xsw->element, env);
if (size)
{
- element = AXIS2_STACK_GET_AT(p->xsw->element, env, size);
+ element = axis2_stack_get_at(p->xsw->element, env, size);
if (!strcmp((char *)element, start_element))
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
}
@@ -1076,7 +1076,7 @@
p->xsw->start_element_open = 1;
if (!p->xsw->empty_element_open)
- AXIS2_STACK_PUSH(p->xsw->element, env, start_element);
+ axis2_stack_push(p->xsw->element, env, start_element);
guththila_write_to_buffer(env, p, "<");
guththila_write_to_buffer(env, p, start_element);
}
@@ -1122,20 +1122,20 @@
memcpy (start_element + (prefix_length + 1), local_name, name_length);
}
- size = AXIS2_STACK_SIZE(p->xsw->element, env);
+ size = axis2_stack_size(p->xsw->element, env);
if (size)
{
- element = AXIS2_STACK_GET_AT(p->xsw->element, env, size - 1);
+ element = axis2_stack_get_at(p->xsw->element, env, size - 1);
if (!strcmp((char *)element, start_element))
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
}
- AXIS2_STACK_PUSH(p->other, env, start_element);
+ axis2_stack_push(p->other, env, start_element);
guththila_check_name_validity(env, p, start_element);
p->xsw->start_element_open = 1;
if (!p->xsw->empty_element_open)
- AXIS2_STACK_PUSH(p->xsw->element, env, start_element);
+ axis2_stack_push(p->xsw->element, env, start_element);
guththila_write_to_buffer(env, p, "<");
guththila_write_to_buffer(env, p, start_element);
}
@@ -1182,26 +1182,26 @@
void AXIS2_CALL
guththila_open_depth_element(axis2_env_t *env, guththila_t *p)
{
- int size = AXIS2_STACK_SIZE(p->xsw->depth, env);
+ int size = axis2_stack_size(p->xsw->depth, env);
guththila_depth_t *d = (guththila_depth_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_depth_t));
if (size)
{
void *e = NULL;
guththila_depth_t *l = NULL;
- e = AXIS2_STACK_GET(p->xsw->depth, env);
+ e = axis2_stack_get(p->xsw->depth, env);
l = (guththila_depth_t *)e;
- d->total = AXIS2_STACK_SIZE(p->xsw->namespace, env);
+ d->total = axis2_stack_size(p->xsw->namespace, env);
d->first = l->first + l->count;
d->count = d->total - l->total;
- AXIS2_STACK_PUSH(p->xsw->depth, env, (void *)d);
+ axis2_stack_push(p->xsw->depth, env, (void *)d);
}
else
{
d->first = 0;
- d->total = AXIS2_STACK_SIZE(p->xsw->namespace, env);
+ d->total = axis2_stack_size(p->xsw->namespace, env);
d->count = d->total;
- AXIS2_STACK_PUSH(p->xsw->depth, env, (void *)d);
+ axis2_stack_push(p->xsw->depth, env, (void *)d);
}
}
@@ -1209,14 +1209,14 @@
void AXIS2_CALL
guththila_close_depth_element(axis2_env_t *env, guththila_t *p)
{
- void *e = AXIS2_STACK_POP(p->xsw->depth, env);
+ void *e = axis2_stack_pop(p->xsw->depth, env);
guththila_depth_t *d = (guththila_depth_t *)e;
void *elem = NULL;
if (d->count)
{
for (; d->count > 0; d->count --)
{
- elem = AXIS2_STACK_POP(p->xsw->namespace, env);
+ elem = axis2_stack_pop(p->xsw->namespace, env);
if (elem)
AXIS2_FREE(env->allocator, elem);
}
@@ -1231,7 +1231,7 @@
int ii = 0;
if (p->xsw->start_element_open || p->xsw->empty_element_open)
guththila_close_start_element(env, p);
- ii = AXIS2_STACK_SIZE(p->xsw->element, env);
+ ii = axis2_stack_size(p->xsw->element, env);
for (; ii > 0; ii --)
guththila_write_end_element(env, p);
/* guththila_flush(env, p); */
Modified: webservices/axis2/trunk/c/rampart/samples/authn_provider/authn_provider.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/authn_provider/authn_provider.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/authn_provider/authn_provider.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/authn_provider/authn_provider.c Sat Mar 17 01:12:54 2007
@@ -45,14 +45,14 @@
while ( fgets ( line, sizeof line, file ) != NULL )
{
- res = AXIS2_STRSTR(line, ":");
+ res = axis2_strstr(line, ":");
ch = res[0];
res[0] = '\0';
- un = (axis2_char_t *) AXIS2_STRDUP(line, env);
+ un = (axis2_char_t *) axis2_strdup(line, env);
res[0] = ch;
- if(0 == AXIS2_STRCMP(un, username)){
- pw = (axis2_char_t *) AXIS2_STRDUP(&(res[1]), env);
- password = AXIS2_STRNDUP(pw, AXIS2_STRLEN(pw)-1, env); /*We need to remove the end of line character*/
+ if(0 == axis2_strcmp(un, username)){
+ pw = (axis2_char_t *) axis2_strdup(&(res[1]), env);
+ password = axis2_strndup(pw, axis2_strlen(pw)-1, env); /*We need to remove the end of line character*/
break;
}
@@ -73,36 +73,36 @@
{
/*First set pf password are for sample usernames*/
axis2_char_t * pw = NULL;
- if (0 == AXIS2_STRCMP(username, "Raigama"))
+ if (0 == axis2_strcmp(username, "Raigama"))
{
pw = "RaigamaPW" ;
}
- else if (0 == AXIS2_STRCMP(username, "Gampola"))
+ else if (0 == axis2_strcmp(username, "Gampola"))
{
pw = "GampolaPW";
}
- else if (0 == AXIS2_STRCMP(username, "alice"))
+ else if (0 == axis2_strcmp(username, "alice"))
{
pw = "password";
}
- else if (0 == AXIS2_STRCMP(username, "bob"))
+ else if (0 == axis2_strcmp(username, "bob"))
{
pw = "bobPW";
}
/*These are for sample keystores*/
- else if (0 == AXIS2_STRCMP(username, "a"))
+ else if (0 == axis2_strcmp(username, "a"))
{
pw = "a12345";
}
- else if (0 == AXIS2_STRCMP(username, "b"))
+ else if (0 == axis2_strcmp(username, "b"))
{
pw = "b12345";
}
- else if (0 == AXIS2_STRCMP(username, "x"))
+ else if (0 == axis2_strcmp(username, "x"))
{
pw = "x12345";
}
- else if (0 == AXIS2_STRCMP(username, "y"))
+ else if (0 == axis2_strcmp(username, "y"))
{
pw = "y12345";
}
@@ -129,7 +129,7 @@
local_pw = ramaprt_get_sample_password_from_file(env, username);
if(local_pw){
/*Compare passwords*/
- if(0 == AXIS2_STRCMP(password, local_pw)){
+ if(0 == axis2_strcmp(password, local_pw)){
return RAMPART_AUTHN_PROVIDER_GRANTED;
}else{
return RAMPART_AUTHN_PROVIDER_DENIED;
@@ -158,7 +158,7 @@
/*Generate the digest*/
local_digest = rampart_crypto_sha1(env, nonce, created, local_pw);
/*Compare digest*/
- if(0 == AXIS2_STRCMP(digest, local_digest)){
+ if(0 == axis2_strcmp(digest, local_digest)){
return RAMPART_AUTHN_PROVIDER_GRANTED;
}else{
return RAMPART_AUTHN_PROVIDER_DENIED;
Modified: webservices/axis2/trunk/c/rampart/samples/callback/htpasswd_callback/htpwcb.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/callback/htpasswd_callback/htpwcb.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/callback/htpasswd_callback/htpwcb.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/callback/htpasswd_callback/htpwcb.c Sat Mar 17 01:12:54 2007
@@ -55,14 +55,14 @@
while ( fgets ( line, sizeof line, file ) != NULL )
{
- res = AXIS2_STRSTR(line, ":");
+ res = axis2_strstr(line, ":");
ch = res[0];
res[0] = '\0';
- un = (axis2_char_t *) AXIS2_STRDUP(line, env);
+ un = (axis2_char_t *) axis2_strdup(line, env);
res[0] = ch;
- if(0 == AXIS2_STRCMP(un, username)){
- pw = (axis2_char_t *) AXIS2_STRDUP(&(res[1]), env);
- password = AXIS2_STRNDUP(pw, AXIS2_STRLEN(pw)-1, env); /*We need to remove the end of line character*/
+ if(0 == axis2_strcmp(un, username)){
+ pw = (axis2_char_t *) axis2_strdup(&(res[1]), env);
+ password = axis2_strndup(pw, axis2_strlen(pw)-1, env); /*We need to remove the end of line character*/
break;
}
Modified: webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c Sat Mar 17 01:12:54 2007
@@ -47,14 +47,14 @@
while ( fgets ( line, sizeof line, file ) != NULL )
{
- res = AXIS2_STRSTR(line, ":");
+ res = axis2_strstr(line, ":");
ch = res[0];
res[0] = '\0';
- un = (axis2_char_t *) AXIS2_STRDUP(line, env);
+ un = (axis2_char_t *) axis2_strdup(line, env);
res[0] = ch;
- if(0 == AXIS2_STRCMP(un, username)){
- pw = (axis2_char_t *) AXIS2_STRDUP(&(res[1]), env);
- password = AXIS2_STRNDUP(pw, AXIS2_STRLEN(pw)-1, env); /*We need to remove the end of line character*/
+ if(0 == axis2_strcmp(un, username)){
+ pw = (axis2_char_t *) axis2_strdup(&(res[1]), env);
+ password = axis2_strndup(pw, axis2_strlen(pw)-1, env); /*We need to remove the end of line character*/
break;
}
@@ -79,36 +79,36 @@
{
/*First set pf password are for sample usernames*/
axis2_char_t * pw = NULL;
- if (0 == AXIS2_STRCMP(username, "Raigama"))
+ if (0 == axis2_strcmp(username, "Raigama"))
{
pw = "RaigamaPW" ;
}
- else if (0 == AXIS2_STRCMP(username, "Gampola"))
+ else if (0 == axis2_strcmp(username, "Gampola"))
{
pw = "GampolaPW";
}
- else if (0 == AXIS2_STRCMP(username, "alice"))
+ else if (0 == axis2_strcmp(username, "alice"))
{
pw = "password";
}
- else if (0 == AXIS2_STRCMP(username, "bob"))
+ else if (0 == axis2_strcmp(username, "bob"))
{
pw = "bobPW";
}
/*These are for sample keystores*/
- else if (0 == AXIS2_STRCMP(username, "a"))
+ else if (0 == axis2_strcmp(username, "a"))
{
pw = "a12345";
}
- else if (0 == AXIS2_STRCMP(username, "b"))
+ else if (0 == axis2_strcmp(username, "b"))
{
pw = "b12345";
}
- else if (0 == AXIS2_STRCMP(username, "x"))
+ else if (0 == axis2_strcmp(username, "x"))
{
pw = "x12345";
}
- else if (0 == AXIS2_STRCMP(username, "y"))
+ else if (0 == axis2_strcmp(username, "y"))
{
pw = "y12345";
}
Modified: webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c Sat Mar 17 01:12:54 2007
@@ -50,7 +50,7 @@
printf("Using client_home : %s\n", client_home);
}
- if (AXIS2_STRCMP(address, "-h") == 0)
+ if (axis2_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url] [client_home]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlenc/enc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlenc/enc.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlenc/enc.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlenc/enc.c Sat Mar 17 01:12:54 2007
@@ -97,7 +97,7 @@
}
serialized_data = AXIOM_NODE_TO_STRING(tmpl, env);
outf = fopen("decrypted-result.xml", "wb");
- fwrite(serialized_data, 1, AXIS2_STRLEN(serialized_data), outf);
+ fwrite(serialized_data, 1, axis2_strlen(serialized_data), outf);
fclose(outf);
printf("Node decrypted successfully. Result is written to decrypted-result.xml\n");
return AXIS2_SUCCESS;
@@ -144,7 +144,7 @@
encrypted_result = AXIOM_NODE_TO_STRING(tmpl, env) ;
outf = fopen("result.xml", "wb");
- fwrite(encrypted_result, 1, AXIS2_STRLEN(encrypted_result), outf);
+ fwrite(encrypted_result, 1, axis2_strlen(encrypted_result), outf);
fclose(outf);
printf("Node encrypted successfully. Result is written to result.xml\n");
return temp_status;
Modified: webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c Sat Mar 17 01:12:54 2007
@@ -135,7 +135,7 @@
signed_result = AXIOM_NODE_TO_STRING(tmpl, env) ;
outf = fopen(signed_filename, "wb");
- fwrite(signed_result, 1, AXIS2_STRLEN(signed_result), outf);
+ fwrite(signed_result, 1, axis2_strlen(signed_result), outf);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/asym_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/asym_ctx.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/asym_ctx.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/asym_ctx.c Sat Mar 17 01:12:54 2007
@@ -132,7 +132,7 @@
AXIS2_FREE(env->allocator, asym_ctx->file_name);
asym_ctx->file_name = NULL;
}
- asym_ctx->file_name = AXIS2_STRDUP(file_name, env);
+ asym_ctx->file_name = axis2_strdup(file_name, env);
return AXIS2_SUCCESS;
}
@@ -149,7 +149,7 @@
AXIS2_FREE(env->allocator, asym_ctx->pem_buf);
asym_ctx->pem_buf = NULL;
}
- asym_ctx->pem_buf = AXIS2_STRDUP(pem_buf, env);
+ asym_ctx->pem_buf = axis2_strdup(pem_buf, env);
return AXIS2_SUCCESS;
}
@@ -166,7 +166,7 @@
AXIS2_FREE(env->allocator, asym_ctx->password);
asym_ctx->password = NULL;
}
- asym_ctx->password = AXIS2_STRDUP(password, env);
+ asym_ctx->password = axis2_strdup(password, env);
return AXIS2_SUCCESS;
}
@@ -195,7 +195,7 @@
AXIS2_FREE(env->allocator, asym_ctx->algorithm);
asym_ctx->algorithm = NULL;
}
- asym_ctx->algorithm = AXIS2_STRDUP(algorithm, env);
+ asym_ctx->algorithm = axis2_strdup(algorithm, env);
return AXIS2_SUCCESS;
}
@@ -211,7 +211,7 @@
AXIS2_FREE(env->allocator, asym_ctx->st_ref_pattern);
asym_ctx->st_ref_pattern = NULL;
}
- asym_ctx->st_ref_pattern = AXIS2_STRDUP(st_ref_pattern, env);
+ asym_ctx->st_ref_pattern = axis2_strdup(st_ref_pattern, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c Sat Mar 17 01:12:54 2007
@@ -102,7 +102,7 @@
temp_name = axiom_util_get_localname(node, env);
AXIS2_LOG_INFO(env->log, "[rampart][axiom] Checking node %s for %s", temp_name, local_name );
- if(0 == AXIS2_STRCMP(temp_name, local_name) ){
+ if(0 == axis2_strcmp(temp_name, local_name) ){
/*Gottcha.. return this node*/
return node;
}else{
@@ -144,7 +144,7 @@
/*AXIS2_LOG_INFO(env->log, "[rampart][axiom] Checking node %s for the attribute %s with value = %s", localname, attr, val);*/
attribute_value = oxs_axiom_get_attribute_value_of_node_by_name(env, node, attr);
- if(0 == AXIS2_STRCMP(val, attribute_value) ){
+ if(0 == axis2_strcmp(val, attribute_value) ){
/*Gottcha.. return this node*/
return node;
}else{
@@ -205,7 +205,7 @@
/*Get the child*/
ele = axiom_element_get_first_child_with_qname(parent_ele, env, qname, parent, &node);
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
qname = NULL;
parent_name = AXIOM_NODE_TO_STRING(parent, env);
@@ -250,7 +250,7 @@
return NULL;
}
reader = axiom_xml_reader_create_for_memory(env,
- (void*)buffer, AXIS2_STRLEN(buffer), "utf-8", AXIS2_XML_PARSER_TYPE_BUFFER);
+ (void*)buffer, axis2_strlen(buffer), "utf-8", AXIS2_XML_PARSER_TYPE_BUFFER);
if (!reader)
{
@@ -297,16 +297,16 @@
ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
qname = axiom_element_get_qname(ele, env, node);
- namestr = AXIS2_QNAME_GET_LOCALPART(qname, env);
- ret_name = AXIS2_STRCMP(namestr, name) ;
+ namestr = axis2_qname_get_localpart(qname, env);
+ ret_name = axis2_strcmp(namestr, name) ;
if (ret_name < 0) return 0;
if (ns)
{
- ns_str = AXIS2_QNAME_GET_URI(qname, env);
- ret_ns = AXIS2_STRCMP(ns_str, ns) ;
+ ns_str = axis2_qname_get_uri(qname, env);
+ ret_ns = axis2_strcmp(ns_str, ns) ;
if (ret_ns < 0) return AXIS2_FAILURE;
else return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/axis2_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/axis2_utils.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/axis2_utils.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/axis2_utils.c Sat Mar 17 01:12:54 2007
@@ -42,7 +42,7 @@
int ret;
- encoded_str = AXIS2_MALLOC(env->allocator, (unsigned int)axis2_base64_encode_len(AXIS2_STRLEN((char*)(plain_buf->data))));
+ encoded_str = AXIS2_MALLOC(env->allocator, (unsigned int)axis2_base64_encode_len(axis2_strlen((char*)(plain_buf->data))));
ret = axis2_base64_encode(encoded_str, (char*)(plain_buf->data), plain_buf->size);
if (ret < 0) return NULL;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c Sat Mar 17 01:12:54 2007
@@ -219,11 +219,11 @@
axis2_char_t *prefix_i = axiom_namespace_get_prefix(
(ns_stack->stack)[i], ctx->env);
- if (AXIS2_STRCMP(prefix_i, prefix) == 0)
+ if (axis2_strcmp(prefix_i, prefix) == 0)
{
axis2_char_t *uri_i = axiom_namespace_get_uri((ns_stack->stack)[i],
ctx->env);
- if (AXIS2_STRCMP(uri_i, uri) == 0)
+ if (axis2_strcmp(uri_i, uri) == 0)
return AXIS2_SUCCESS;
else
return AXIS2_FALSE;
@@ -795,7 +795,7 @@
{
axis2_char_t *prefix = axiom_namespace_get_prefix(ns, ctx->env);
- if (AXIS2_STRLEN(prefix) > 0)
+ if (axis2_strlen(prefix) > 0)
{
c14n_output(prefix, ctx);
c14n_output(":", ctx);
@@ -861,7 +861,7 @@
{
axis2_char_t *prefix = axiom_namespace_get_prefix(ns, ctx->env);
- if (AXIS2_STRLEN(prefix) > 0)
+ if (axis2_strlen(prefix) > 0)
{
c14n_output(prefix, ctx);
c14n_output(":", ctx);
@@ -900,7 +900,7 @@
if (!ns1) return -1;
if (!ns2) return 1;
- return (AXIS2_STRCMP(
+ return (axis2_strcmp(
(const axis2_char_t *)axiom_namespace_get_uri(
(axiom_namespace_t *)ns1, ctx->env),
(const axis2_char_t *)axiom_namespace_get_uri(
@@ -920,7 +920,7 @@
if (!ns1) return -1;
if (!ns2) return 1;
- return (AXIS2_STRCMP(
+ return (axis2_strcmp(
(const axis2_char_t *)axiom_namespace_get_prefix(
(axiom_namespace_t *)ns1, ctx->env),
(const axis2_char_t *)axiom_namespace_get_prefix(
@@ -951,7 +951,7 @@
ns2 = axiom_attribute_get_namespace((axiom_attribute_t *)a2, ctx->env);
if (ns1 == ns2)
- return AXIS2_STRCMP(
+ return axis2_strcmp(
(const axis2_char_t *)axiom_attribute_get_localname(
(axiom_attribute_t *)a1, ctx->env),
(const axis2_char_t *)axiom_attribute_get_localname(
@@ -960,12 +960,12 @@
if (!ns1) return -1;
if (!ns2) return 1;
- res = AXIS2_STRCMP(
+ res = axis2_strcmp(
axiom_namespace_get_uri(ns1, ctx->env),
axiom_namespace_get_uri(ns2, ctx->env));
if (res == 0)
- return AXIS2_STRCMP(
+ return axis2_strcmp(
(const axis2_char_t *)axiom_attribute_get_localname(
(axiom_attribute_t *)a1, ctx->env),
(const axis2_char_t *)axiom_attribute_get_localname(
@@ -993,7 +993,7 @@
{
axis2_char_t *prefix = axiom_namespace_get_prefix(ns, ctx->env);
- if (AXIS2_STRLEN(prefix) > 0)
+ if (axis2_strlen(prefix) > 0)
{
c14n_output(prefix, ctx);
c14n_output(":", ctx);
@@ -1281,13 +1281,13 @@
axis2_char_t *pfx = axiom_namespace_get_prefix(ns, ctx->env);
axis2_char_t *uri = axiom_namespace_get_uri(ns, ctx->env);
- if (AXIS2_STRLEN(pfx) == 0)
+ if (axis2_strlen(pfx) == 0)
{
/*process for default namespace*/
/*int nsc = ns_prefix_compare(c14n_ns_stack_get_default(ctx), ns, ctx);
- int len = AXIS2_STRLEN(uri);*/
+ int len = axis2_strlen(uri);*/
- if (AXIS2_STRLEN(uri) == 0)
+ if (axis2_strlen(uri) == 0)
{
if (c14n_ns_stack_get_default(ctx)!=NULL)
{
@@ -1306,7 +1306,7 @@
axiom_namespace_get_uri(prev_def, ctx->env) : NULL);
- if (!prev_def_uri || AXIS2_STRCMP(prev_def_uri, uri) != 0)
+ if (!prev_def_uri || axis2_strcmp(prev_def_uri, uri) != 0)
{
c14n_ns_stack_set_default(ns, ctx);
AXIS2_SORTED_LIST_INSERT(&out_list, (void *)ns, ctx,
@@ -1356,11 +1356,11 @@
if (ns)
{
- if (AXIS2_STRLEN(axiom_namespace_get_prefix((axiom_namespace_t *)ns,
+ if (axis2_strlen(axiom_namespace_get_prefix((axiom_namespace_t *)ns,
ctx->env)) == 0)
{
axiom_namespace_t *def_ns = c14n_ns_stack_get_default(ctx);
- if (def_ns || AXIS2_STRLEN(axiom_namespace_get_uri(
+ if (def_ns || axis2_strlen(axiom_namespace_get_uri(
(axiom_namespace_t *)ns, ctx->env)) != 0)
{
if (ns_uri_compare(ns, def_ns, ctx) != 0)
@@ -1394,7 +1394,7 @@
pfx = axiom_namespace_get_prefix(ns, ctx->env);
/*axis2_char_t *uri = axiom_namespace_get_uri(ns, ctx->env);*/
- if (AXIS2_STRLEN(pfx) == 0)
+ if (axis2_strlen(pfx) == 0)
{
/* process for default namespace.
* NOTE: This part was taken out of here due to the
@@ -1439,7 +1439,7 @@
c14n_output(axiom_namespace_to_string(ns, ctx->env), ctx);
c14n_output("*", ctx);*/
- if (AXIS2_STRLEN(pfx) > 0)
+ if (axis2_strlen(pfx) > 0)
{
c14n_output(" xmlns:", ctx);
c14n_output(pfx, ctx);
@@ -1449,7 +1449,7 @@
c14n_output("=\"", ctx);
- if (AXIS2_STRLEN(uri) > 0)
+ if (axis2_strlen(uri) > 0)
c14n_output(uri, ctx);
c14n_output("\"", ctx);
@@ -1467,7 +1467,7 @@
if (ctx->use_stream)
{
AXIS2_STREAM_WRITE(ctx->outstream, ctx->env, str,
- AXIS2_STRLEN(str)*sizeof(axis2_char_t));
+ axis2_strlen(str)*sizeof(axis2_char_t));
}
#endif
}
@@ -1516,7 +1516,7 @@
pfx_ele = axiom_namespace_get_prefix(ns_ele, ctx->env);
uri_ele = axiom_namespace_get_uri(ns_ele, ctx->env);
}
- if ((AXIS2_STRCMP(pfx, pfx_ele) == 0) && (AXIS2_STRCMP(uri, uri_ele) == 0))
+ if ((axis2_strcmp(pfx, pfx_ele) == 0) && (axis2_strcmp(uri, uri_ele) == 0))
vu = AXIS2_TRUE;
else
{
@@ -1543,7 +1543,7 @@
attr_pfx = axiom_namespace_get_prefix(
ns_attr, ctx->env);
- if (AXIS2_STRCMP(attr_pfx, pfx) == 0)
+ if (axis2_strcmp(attr_pfx, pfx) == 0)
{
vu = AXIS2_TRUE;
break;
@@ -1624,11 +1624,11 @@
{
parent_pfx = axiom_namespace_get_prefix((axiom_namespace_t *)parent_ns,
ctx->env);
- if (AXIS2_STRCMP(pfx, parent_pfx) == 0)
+ if (axis2_strcmp(pfx, parent_pfx) == 0)
{
parent_uri = axiom_namespace_get_uri((axiom_namespace_t*)parent_ns,
ctx->env);
- return (!(AXIS2_STRCMP(uri, parent_uri) == 0));
+ return (!(axis2_strcmp(uri, parent_uri) == 0));
}
}
@@ -1657,8 +1657,8 @@
attr_uri = axiom_namespace_get_uri(attr_ns,
ctx->env);
- if (AXIS2_STRCMP(attr_pfx, pfx) == 0)
- return (!(AXIS2_STRCMP(attr_uri, uri) == 0));
+ if (axis2_strcmp(attr_pfx, pfx) == 0)
+ return (!(axis2_strcmp(attr_uri, uri) == 0));
/*test for this case*/
}
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c Sat Mar 17 01:12:54 2007
@@ -35,7 +35,7 @@
ret = OPENSSL_CIPHER_PROPERTY_SET_URL(cprop, env , url);
cipher_name = oxs_get_cipher_name_for_url(env, url);
- if((!cipher_name) || (0 == AXIS2_STRCMP(cipher_name, ""))){
+ if((!cipher_name) || (0 == axis2_strcmp(cipher_name, ""))){
oxs_error(env, ERROR_LOCATION,
OXS_ERROR_INVALID_DATA, "Cannot populate cipher property");
return NULL;
@@ -60,22 +60,22 @@
axis2_char_t *cipher_name = NULL;
- if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HREF_DES3_CBC))
+ if (0 == axis2_strcmp(url, (axis2_char_t*)OXS_HREF_DES3_CBC))
{
cipher_name = OPENSSL_EVP_des_ede3_cbc;
}
- else if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HREF_AES_128_CBC))
+ else if (0 == axis2_strcmp(url, (axis2_char_t*)OXS_HREF_AES_128_CBC))
{
cipher_name = OPENSSL_EVP_aes_128_cbc;
}
- else if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HREF_AES_192_CBC))
+ else if (0 == axis2_strcmp(url, (axis2_char_t*)OXS_HREF_AES_192_CBC))
{
cipher_name = OPENSSL_EVP_aes_192_cbc;
}
- else if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HREF_AES_256_CBC))
+ else if (0 == axis2_strcmp(url, (axis2_char_t*)OXS_HREF_AES_256_CBC))
{
cipher_name = OPENSSL_EVP_aes_256_cbc;
@@ -97,22 +97,22 @@
axis2_char_t *cipher_url = NULL;
- if (0 == AXIS2_STRCMP(name, (axis2_char_t*)OPENSSL_EVP_des_ede3_cbc))
+ if (0 == axis2_strcmp(name, (axis2_char_t*)OPENSSL_EVP_des_ede3_cbc))
{
cipher_url = OXS_HREF_DES3_CBC;
}
- else if (0 == AXIS2_STRCMP(name, (axis2_char_t*)OPENSSL_EVP_aes_128_cbc))
+ else if (0 == axis2_strcmp(name, (axis2_char_t*)OPENSSL_EVP_aes_128_cbc))
{
cipher_url = OXS_HREF_AES_128_CBC;
}
- else if (0 == AXIS2_STRCMP(name, (axis2_char_t*)OPENSSL_EVP_aes_192_cbc))
+ else if (0 == axis2_strcmp(name, (axis2_char_t*)OPENSSL_EVP_aes_192_cbc))
{
cipher_url = OXS_HREF_AES_192_CBC;
}
- else if (0 == AXIS2_STRCMP(name, (axis2_char_t*)OPENSSL_EVP_aes_256_cbc))
+ else if (0 == axis2_strcmp(name, (axis2_char_t*)OPENSSL_EVP_aes_256_cbc))
{
cipher_url = OXS_HREF_AES_256_CBC;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c Sat Mar 17 01:12:54 2007
@@ -700,7 +700,7 @@
AXIS2_FREE(env->allocator, ctx_impl->id);
ctx_impl->id = NULL;
}
- ctx_impl->id = AXIS2_STRDUP(id, env);
+ ctx_impl->id = axis2_strdup(id, env);
return AXIS2_SUCCESS;
}
@@ -722,7 +722,7 @@
AXIS2_FREE(env->allocator, ctx_impl->type);
ctx_impl->type = NULL;
}
- ctx_impl->type = AXIS2_STRDUP(type, env);
+ ctx_impl->type = axis2_strdup(type, env);
return AXIS2_SUCCESS;
}
@@ -744,7 +744,7 @@
AXIS2_FREE(env->allocator, ctx_impl->mime_type);
ctx_impl->mime_type = NULL;
}
- ctx_impl->mime_type = AXIS2_STRDUP(mime_type, env);
+ ctx_impl->mime_type = axis2_strdup(mime_type, env);
return AXIS2_SUCCESS;
}
@@ -766,7 +766,7 @@
AXIS2_FREE(env->allocator, ctx_impl->encoding);
ctx_impl->encoding = NULL;
}
- ctx_impl->encoding = AXIS2_STRDUP(encoding, env);
+ ctx_impl->encoding = axis2_strdup(encoding, env);
return AXIS2_SUCCESS;
}
@@ -788,7 +788,7 @@
AXIS2_FREE(env->allocator, ctx_impl->recipient);
ctx_impl->recipient = NULL;
}
- ctx_impl->recipient = AXIS2_STRDUP(recipient, env);
+ ctx_impl->recipient = axis2_strdup(recipient, env);
return AXIS2_SUCCESS;
}
@@ -810,7 +810,7 @@
AXIS2_FREE(env->allocator, ctx_impl->carried_key_name);
ctx_impl->carried_key_name = NULL;
}
- ctx_impl->carried_key_name = AXIS2_STRDUP(carried_key_name, env);
+ ctx_impl->carried_key_name = axis2_strdup(carried_key_name, env);
return AXIS2_SUCCESS;
}
@@ -832,7 +832,7 @@
AXIS2_FREE(env->allocator, ctx_impl->enc_mtd_algorithm);
ctx_impl->enc_mtd_algorithm = NULL;
}
- ctx_impl->enc_mtd_algorithm = AXIS2_STRDUP(enc_mtd_algorithm, env);
+ ctx_impl->enc_mtd_algorithm = axis2_strdup(enc_mtd_algorithm, env);
return AXIS2_SUCCESS;
}
@@ -854,7 +854,7 @@
AXIS2_FREE(env->allocator, ctx_impl->input_data);
ctx_impl->input_data = NULL;
}
- ctx_impl->input_data = AXIS2_STRDUP(input_data, env) ;
+ ctx_impl->input_data = axis2_strdup(input_data, env) ;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/encryption.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/encryption.c Sat Mar 17 01:12:54 2007
@@ -52,7 +52,7 @@
return AXIS2_FAILURE;
}
/*Get the IV*/
- iv = AXIS2_STRNDUP((axis2_char_t*)oxs_iv_generate_for_algo(
+ iv = axis2_strndup((axis2_char_t*)oxs_iv_generate_for_algo(
env,
OXS_CTX_GET_ENC_MTD_ALGORITHM(enc_ctx, env)),
OPENSSL_CIPHER_PROPERTY_GET_IV_SIZE(cprop, env),
@@ -118,7 +118,7 @@
}
/*Attach the result to the result buf*/
- ret = OXS_BUFFER_POPULATE(result, env, (unsigned char*)AXIS2_STRDUP(encoded_str, env), encodedlen);
+ ret = OXS_BUFFER_POPULATE(result, env, (unsigned char*)axis2_strdup(encoded_str, env), encodedlen);
/*Free*/
OXS_BUFFER_FREE(output, env);
@@ -191,14 +191,14 @@
algorithm = oxs_asym_ctx_get_algorithm(ctx, env);
/* We support RSA v1.5 encryption only. If any other algorithm is specified, replace it with the proper one
- if(0 != (AXIS2_STRCMP(OXS_HREF_RSA_PKCS1, algorithm ))) {
+ if(0 != (axis2_strcmp(OXS_HREF_RSA_PKCS1, algorithm ))) {
oxs_asym_ctx_set_algorithm(ctx, env, OXS_HREF_RSA_PKCS1);
}*/
/*Set the proper padding for the algorithm*/
- if(0 == (AXIS2_STRCMP(OXS_HREF_RSA_OAEP, algorithm))){
+ if(0 == (axis2_strcmp(OXS_HREF_RSA_OAEP, algorithm))){
padding = OPENSSL_RSA_PKCS1_OAEP_PADDING;
- }else if(0 == (AXIS2_STRCMP(OXS_HREF_RSA_PKCS1, algorithm))){
+ }else if(0 == (axis2_strcmp(OXS_HREF_RSA_PKCS1, algorithm))){
padding = OPENSSL_RSA_PKCS1_PADDING;
}
@@ -230,7 +230,7 @@
encodedlen = axis2_base64_encode_len(enclen);
encoded_str = AXIS2_MALLOC(env->allocator, encodedlen);
ret = axis2_base64_encode(encoded_str, (const char *)OXS_BUFFER_GET_DATA(out_buf, env), enclen);
- status = OXS_BUFFER_POPULATE(result, env, (unsigned char*)AXIS2_STRDUP(encoded_str, env), encodedlen);
+ status = OXS_BUFFER_POPULATE(result, env, (unsigned char*)axis2_strdup(encoded_str, env), encodedlen);
/*Free*/
OXS_BUFFER_FREE(out_buf, env);
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c Sat Mar 17 01:12:54 2007
@@ -189,7 +189,7 @@
AXIS2_FREE(env->allocator, oxs_key_impl->name);
oxs_key_impl->name = NULL;
}
- oxs_key_impl->name = AXIS2_STRDUP(name, env);
+ oxs_key_impl->name = axis2_strdup(name, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c Sat Mar 17 01:12:54 2007
@@ -283,7 +283,7 @@
AXIS2_FREE(env->allocator, ctx_impl->iv);
ctx_impl->iv = NULL;
}
- ctx_impl->iv = AXIS2_STRDUP(iv, env);
+ ctx_impl->iv = axis2_strdup(iv, env);
return AXIS2_SUCCESS;
}
@@ -305,7 +305,7 @@
AXIS2_FREE(env->allocator, ctx_impl->pad);
ctx_impl->pad = NULL;
}
- ctx_impl->pad = AXIS2_STRDUP(pad, env);
+ ctx_impl->pad = axis2_strdup(pad, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c Sat Mar 17 01:12:54 2007
@@ -226,7 +226,7 @@
AXIS2_FREE(env->allocator, cprop_impl->name);
cprop_impl->name = NULL;
}
- cprop_impl->name = AXIS2_STRDUP(name, env);
+ cprop_impl->name = axis2_strdup(name, env);
return AXIS2_SUCCESS;
}
@@ -247,7 +247,7 @@
AXIS2_FREE(env->allocator, cprop_impl->url);
cprop_impl->url = NULL;
}
- cprop_impl->url = AXIS2_STRDUP(url, env);
+ cprop_impl->url = axis2_strdup(url, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c Sat Mar 17 01:12:54 2007
@@ -258,7 +258,7 @@
pkey_impl->name = NULL;
}
- pkey_impl->name = AXIS2_STRDUP(name, env);
+ pkey_impl->name = axis2_strdup(name, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c Sat Mar 17 01:12:54 2007
@@ -171,9 +171,9 @@
rsa_impl = AXIS2_INTF_TO_IMPL(rsa);
key = (EVP_PKEY *)OPENSSL_PKEY_GET_KEY(pkey, env);
- if(0 == AXIS2_STRCMP(padding, OPENSSL_RSA_PKCS1_OAEP_PADDING ) ){
+ if(0 == axis2_strcmp(padding, OPENSSL_RSA_PKCS1_OAEP_PADDING ) ){
pad = RSA_PKCS1_OAEP_PADDING;
- }else if(0 == AXIS2_STRCMP(padding, OPENSSL_RSA_PKCS1_PADDING ) ){
+ }else if(0 == axis2_strcmp(padding, OPENSSL_RSA_PKCS1_PADDING ) ){
pad = RSA_PKCS1_PADDING;
}
@@ -213,9 +213,9 @@
rsa_impl = AXIS2_INTF_TO_IMPL(rsa);
key = (EVP_PKEY *)OPENSSL_PKEY_GET_KEY(pkey, env);
- if(0 == AXIS2_STRCMP(padding, OPENSSL_RSA_PKCS1_OAEP_PADDING ) ){
+ if(0 == axis2_strcmp(padding, OPENSSL_RSA_PKCS1_OAEP_PADDING ) ){
pad = RSA_PKCS1_OAEP_PADDING;
- }else if(0 == AXIS2_STRCMP(padding, OPENSSL_RSA_PKCS1_PADDING ) ){
+ }else if(0 == axis2_strcmp(padding, OPENSSL_RSA_PKCS1_PADDING ) ){
pad = RSA_PKCS1_PADDING;
}
@@ -258,9 +258,9 @@
key = (EVP_PKEY *)OPENSSL_PKEY_GET_KEY(pkey, env);
/*Set padding. This is the only diff btwn RSA-v1.5 and RSA-OAEP*/
- if(0 == AXIS2_STRCMP(padding, OPENSSL_RSA_PKCS1_OAEP_PADDING ) ){
+ if(0 == axis2_strcmp(padding, OPENSSL_RSA_PKCS1_OAEP_PADDING ) ){
pad = RSA_PKCS1_OAEP_PADDING;
- }else if(0 == AXIS2_STRCMP(padding, OPENSSL_RSA_PKCS1_PADDING ) ){
+ }else if(0 == axis2_strcmp(padding, OPENSSL_RSA_PKCS1_PADDING ) ){
pad = RSA_PKCS1_PADDING;
}
@@ -303,9 +303,9 @@
key = (EVP_PKEY *)OPENSSL_PKEY_GET_KEY(pkey, env);
/*Set padding. This is the only diff btwn RSA-v1.5 and RSA-OAEP*/
- if(0 == AXIS2_STRCMP(padding, OPENSSL_RSA_PKCS1_OAEP_PADDING ) ){
+ if(0 == axis2_strcmp(padding, OPENSSL_RSA_PKCS1_OAEP_PADDING ) ){
pad = RSA_PKCS1_OAEP_PADDING;
- }else if(0 == AXIS2_STRCMP(padding, OPENSSL_RSA_PKCS1_PADDING ) ){
+ }else if(0 == axis2_strcmp(padding, OPENSSL_RSA_PKCS1_PADDING ) ){
pad = RSA_PKCS1_PADDING;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/util.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/util.c Sat Mar 17 01:12:54 2007
@@ -114,22 +114,22 @@
{
EVP_CIPHER* cipher = NULL;
- if (0 == AXIS2_STRCMP((char*)cipher_name, (char*)OPENSSL_EVP_des_ede3_cbc))
+ if (0 == axis2_strcmp((char*)cipher_name, (char*)OPENSSL_EVP_des_ede3_cbc))
{
cipher = (EVP_CIPHER*) EVP_des_ede3_cbc();
}
- else if (0 == AXIS2_STRCMP((char*)cipher_name, (char*)OPENSSL_EVP_aes_128_cbc))
+ else if (0 == axis2_strcmp((char*)cipher_name, (char*)OPENSSL_EVP_aes_128_cbc))
{
cipher = (EVP_CIPHER*)EVP_aes_128_cbc();
}
- else if (0 == AXIS2_STRCMP((char*)cipher_name, (char*)OPENSSL_EVP_aes_192_cbc))
+ else if (0 == axis2_strcmp((char*)cipher_name, (char*)OPENSSL_EVP_aes_192_cbc))
{
cipher = (EVP_CIPHER*)EVP_aes_192_cbc();
}
- else if (0 == AXIS2_STRCMP((char*)cipher_name, (char*)OPENSSL_EVP_aes_256_cbc))
+ else if (0 == axis2_strcmp((char*)cipher_name, (char*)OPENSSL_EVP_aes_256_cbc))
{
cipher = (EVP_CIPHER*)EVP_aes_256_cbc();
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/x509.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/x509.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/x509.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/x509.c Sat Mar 17 01:12:54 2007
@@ -208,8 +208,8 @@
res = axis2_strstr(core_tail,"-----END");
res = res-1;
res[0] = '\0';
- core = (axis2_char_t*)AXIS2_STRDUP(core_tail,env);
- buffer = (axis2_char_t*)AXIS2_STRDUP(core,env);
+ core = (axis2_char_t*)axis2_strdup(core_tail,env);
+ buffer = (axis2_char_t*)axis2_strdup(core,env);
while(core[i]!='\0')
{
@@ -301,7 +301,7 @@
EVP_EncodeFinal(&ctx, (unsigned char*)(output+len), &ret);
ret += len;
- ski = AXIS2_STRDUP(output, env);
+ ski = axis2_strdup(output, env);
return ski;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org