Modified: webservices/sandesha/trunk/c/src/util/msg_init.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/util/msg_init.c (original) +++ webservices/sandesha/trunk/c/src/util/msg_init.c Sun Mar 18 21:54:50 2007 @@ -139,7 +139,7 @@ if(!addressing_ns && !axis2_msg_ctx_get_server_side(msg_ctx, env)) { - addressing_ns = AXIS2_STRDUP(AXIS2_WSA_NAMESPACE, env); + addressing_ns = axis2_strdup(AXIS2_WSA_NAMESPACE, env); } if(addressing_ns) rm_elements = sandesha2_rm_elements_create(env, addressing_ns); @@ -424,7 +424,7 @@ temp_flow = axis2_msg_ctx_get_flow(temp_msg_ctx, env); if(temp_flow == AXIS2_IN_FLOW) { - prop_key = AXIS2_STRDUP(seq_id, env); + prop_key = axis2_strdup(seq_id, env); } else { @@ -453,7 +453,7 @@ } if(seq_rm_ns && rm_ns) { - if(0 != AXIS2_STRCMP(seq_rm_ns, rm_ns)) + if(0 != axis2_strcmp(seq_rm_ns, rm_ns)) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_RM_NS_VALUE_IS_DIFFERENT_FROM_REGISTERED_NS_FOR_SEQ,
Modified: webservices/sandesha/trunk/c/src/util/property_bean.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_bean.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/util/property_bean.c (original) +++ webservices/sandesha/trunk/c/src/util/property_bean.c Sun Mar 18 21:54:50 2007 @@ -133,13 +133,13 @@ AXIS2_PARAM_CHECK(env->error, units, AXIS2_FAILURE); - if(0 == AXIS2_STRCMP(units, "seconds")) + if(0 == axis2_strcmp(units, "seconds")) multiplier = 1000; - else if(0 == AXIS2_STRCMP(units, "minutes")) + else if(0 == axis2_strcmp(units, "minutes")) multiplier = 60*1000; - else if(0 == AXIS2_STRCMP(units, "hours")) + else if(0 == axis2_strcmp(units, "hours")) multiplier = 60*60*1000; - else if(0 == AXIS2_STRCMP(units, "days")) + else if(0 == axis2_strcmp(units, "days")) multiplier = 24*60*60*1000; else return AXIS2_FAILURE; Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original) +++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Sun Mar 18 21:54:50 2007 @@ -159,9 +159,9 @@ prop_bean = (sandesha2_property_bean_t *)sandesha2_utils_get_property_bean( env, conf); value = sandesha2_property_bean_get_storage_mgr(prop_bean, env); - if(0 == AXIS2_STRCMP(value, SANDESHA2_INMEMORY_STORAGE_MGR)) + if(0 == axis2_strcmp(value, SANDESHA2_INMEMORY_STORAGE_MGR)) storage_mgr = sandesha2_utils_get_inmemory_storage_mgr(env, conf_ctx); - else if (0 == AXIS2_STRCMP(value, SANDESHA2_PERMANENT_STORAGE_MGR)) + else if (0 == axis2_strcmp(value, SANDESHA2_PERMANENT_STORAGE_MGR)) storage_mgr = sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx); else { @@ -229,12 +229,12 @@ axis2_array_list_t *ret = NULL; AXIS2_ENV_CHECK(env, NULL); - if(!str || 0 == AXIS2_STRCMP("", str)) + if(!str || 0 == axis2_strcmp("", str)) { ret = axis2_array_list_create(env, AXIS2_ARRAY_LIST_DEFAULT_CAPACITY); return ret; } - if(2 > AXIS2_STRLEN(str)) + if(2 > axis2_strlen(str)) { axis2_char_t *ret_str = NULL; @@ -259,9 +259,9 @@ AXIS2_FREE(env->allocator, ret_str); return NULL; } - dup_str = AXIS2_STRDUP(temp_str, env); - if(']' == dup_str[AXIS2_STRLEN(dup_str) - 1]) - dup_str[AXIS2_STRLEN(dup_str) - 1] = '\0'; + dup_str = axis2_strdup(temp_str, env); + if(']' == dup_str[axis2_strlen(dup_str) - 1]) + dup_str[axis2_strlen(dup_str) - 1] = '\0'; else { axis2_char_t *ret_str = NULL; @@ -281,7 +281,7 @@ { if(!sandesha2_utils_array_list_contains(env, ret, temp_str)) { - axis2_char_t *temp_element = AXIS2_STRDUP(temp_str, env); + axis2_char_t *temp_element = axis2_strdup(temp_str, env); axis2_array_list_add(ret, env, temp_element); } temp_str = strtok(NULL, ","); @@ -304,7 +304,7 @@ for(i = 0; i < axis2_array_list_size(list, env); i++) { axis2_char_t *element = axis2_array_list_get(list, env, i); - if(element && 0 == AXIS2_STRCMP(element, str)) + if(element && 0 == axis2_strcmp(element, str)) return AXIS2_TRUE; } return AXIS2_FAILURE; @@ -322,7 +322,7 @@ AXIS2_ENV_CHECK(env, NULL); AXIS2_PARAM_CHECK(env->error, list, NULL); - list_str = AXIS2_STRDUP("[", env); + list_str = axis2_strdup("[", env); size = axis2_array_list_size(list, env); for(i = 0; i < size; i++) { @@ -544,10 +544,10 @@ AXIS2_PARAM_CHECK(env->error, incoming_seq_id, NULL); start_str = axis2_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", NULL); - start_len = AXIS2_STRLEN(start_str); + start_len = axis2_strlen(start_str); if(0 != AXIS2_STRNCMP(incoming_seq_id, start_str, start_len)) return NULL; - ret = AXIS2_STRDUP((incoming_seq_id + start_len * sizeof(axis2_char_t)), env); + ret = axis2_strdup((incoming_seq_id + start_len * sizeof(axis2_char_t)), env); return ret; } @@ -590,11 +590,11 @@ } else if(!to) { - return AXIS2_STRDUP(seq_key, env); + return axis2_strdup(seq_key, env); } else if(!seq_key) { - return AXIS2_STRDUP(to, env); + return axis2_strdup(to, env); } else { @@ -763,7 +763,7 @@ AXIS2_FALSE); if(property) { - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); + axis2_property_set_scope(property, env, AXIS2_SCOPE_APPLICATION); axis2_msg_ctx_set_property(new_msg, env, AXIS2_TRANSPORT_OUT, AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE); }*/ @@ -824,7 +824,7 @@ while(' ' == *tmp) tmp++; - tmp2 = orig_str + AXIS2_STRLEN(orig_str); + tmp2 = orig_str + axis2_strlen(orig_str); while(' ' == *tmp2 && tmp2 != orig_str) tmp2--; @@ -852,9 +852,9 @@ if(!action) return AXIS2_FALSE; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ)) ret = AXIS2_TRUE; - else if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ)) + else if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ)) ret = AXIS2_TRUE; return ret; @@ -909,26 +909,26 @@ if(seq_element) is_global_msg = AXIS2_TRUE; - if(0 == AXIS2_STRCMP(action, + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_SEQ_ACKNOWLEDGEMENT)) is_global_msg = AXIS2_TRUE; - if(0 == AXIS2_STRCMP(action, + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ_RESPONSE)) is_global_msg = AXIS2_TRUE; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ)) is_global_msg = AXIS2_TRUE; - if(0 == AXIS2_STRCMP(action, + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_SEQ_ACKNOWLEDGEMENT)) is_global_msg = AXIS2_TRUE; - if(0 == AXIS2_STRCMP(action, + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ_RESPONSE)) is_global_msg = AXIS2_TRUE; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ)) is_global_msg = AXIS2_TRUE; return is_global_msg; @@ -1120,7 +1120,7 @@ axis2_char_t *dup_str = NULL; axis2_char_t *temp_str = NULL; - dup_str = AXIS2_STRDUP(msg_no_str, env); + dup_str = axis2_strdup(msg_no_str, env); msg_numbers = axis2_array_list_create(env, 0); temp_str = strtok(dup_str, delim); while(temp_str) @@ -1287,9 +1287,9 @@ return AXIS2_TRUE; address_l = AXIS2_STRTRIM(env, address, NULL); - if(0 == AXIS2_STRCMP(AXIS2_WSA_ANONYMOUS_URL, address_l)) + if(0 == axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL, address_l)) return AXIS2_TRUE; - if(0 == AXIS2_STRCMP(AXIS2_WSA_ANONYMOUS_URL_SUBMISSION, address_l)) + if(0 == axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL_SUBMISSION, address_l)) return AXIS2_TRUE; else if (sandesha2_utils_is_wsrm_anon_reply_to(env, (axis2_char_t *) address)) return AXIS2_TRUE; @@ -1310,12 +1310,12 @@ while(ptr) { ptr[0] = AXIS2_EOLN; - value = AXIS2_STRDUP(str, env); + value = axis2_strdup(str, env); axis2_array_list_add(list, env, value); str = ptr + 3; ptr = AXIS2_STRSTR(str, pattern); } - value = AXIS2_STRDUP(str, env); + value = axis2_strdup(str, env); axis2_array_list_add(list, env, value); return list; @@ -1328,7 +1328,7 @@ const axis2_char_t *acks_to_addr) { if(sandesha2_utils_is_anon_uri(env, acks_to_addr) && - (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, rm_version))) + (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, rm_version))) return AXIS2_TRUE; else return AXIS2_FALSE; } Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original) +++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Sun Mar 18 21:54:50 2007 @@ -173,13 +173,13 @@ } msg_rm_ns = sandesha2_iom_rm_element_get_namespace_value( (sandesha2_iom_rm_element_t *) create_seq, env); - if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_2005_02_NS_URI, msg_rm_ns)) + if(0 == axis2_strcmp(SANDESHA2_SPEC_2005_02_NS_URI, msg_rm_ns)) { - spec_version = AXIS2_STRDUP(SANDESHA2_SPEC_VERSION_1_0, env); + spec_version = axis2_strdup(SANDESHA2_SPEC_VERSION_1_0, env); } - else if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_2006_08_NS_URI, msg_rm_ns)) + else if(0 == axis2_strcmp(SANDESHA2_SPEC_2006_08_NS_URI, msg_rm_ns)) { - spec_version = AXIS2_STRDUP(SANDESHA2_SPEC_VERSION_1_1, env); + spec_version = axis2_strdup(SANDESHA2_SPEC_VERSION_1_1, env); } else { @@ -449,7 +449,7 @@ int_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR, acks_to_str); if(!axis2_msg_ctx_get_server_side(first_app_msg, env) && - 0 != AXIS2_STRCMP(acks_to_str, anon_uri)) + 0 != axis2_strcmp(acks_to_str, anon_uri)) { ctx = axis2_msg_ctx_get_base(first_app_msg, env); /* TODO currently axis2 doesn't expose the *options* at msg ctx level. Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original) +++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Sun Mar 18 21:54:50 2007 @@ -99,7 +99,7 @@ { axis2_allocator_switch_to_global_pool(env->allocator); axis2_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id, - AXIS2_HASH_KEY_STRING, AXIS2_STRDUP( + AXIS2_HASH_KEY_STRING, axis2_strdup( SANDESHA2_CLEANED_ON_TERMINATE_MSG, env)); axis2_allocator_switch_to_local_pool(env->allocator); sandesha2_terminate_mgr_clean_recv_side_after_invocation(env, conf_ctx, @@ -122,7 +122,7 @@ { axis2_allocator_switch_to_global_pool(env->allocator); axis2_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id, - AXIS2_HASH_KEY_STRING, AXIS2_STRDUP( + AXIS2_HASH_KEY_STRING, axis2_strdup( SANDESHA2_CLEANED_ON_TERMINATE_MSG, env)); axis2_allocator_switch_to_local_pool(env->allocator); } @@ -194,7 +194,7 @@ { axis2_allocator_switch_to_global_pool(env->allocator); axis2_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id, - AXIS2_HASH_KEY_STRING, AXIS2_STRDUP( + AXIS2_HASH_KEY_STRING, axis2_strdup( SANDESHA2_CLEANED_AFTER_INVOCATION, env)); axis2_allocator_switch_to_local_pool(env->allocator); } Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original) +++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Sun Mar 18 21:54:50 2007 @@ -129,7 +129,7 @@ { axis2_char_t *tmp_id = NULL; tmp_id = axis2_array_list_get(invoker->working_seqs, env, i); - if(0 == AXIS2_STRCMP(seq_id, tmp_id)) + if(0 == axis2_strcmp(seq_id, tmp_id)) { axis2_array_list_remove(invoker->working_seqs, env, i); break; @@ -371,7 +371,7 @@ SANDESHA2_POST_FAILURE_MESSAGE, AXIS2_FALSE); if(property) post_failure_str = AXIS2_PROPERTY_GET_VALUE(property, env); - if(post_failure_str && 0 == AXIS2_STRCMP( + if(post_failure_str && 0 == axis2_strcmp( post_failure_str, AXIS2_VALUE_TRUE)) post_failure_invocation = AXIS2_TRUE; engine = axis2_engine_create(env, invoker->conf_ctx); Modified: webservices/sandesha/trunk/c/src/workers/sender.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/workers/sender.c (original) +++ webservices/sandesha/trunk/c/src/workers/sender.c Sun Mar 18 21:54:50 2007 @@ -148,7 +148,7 @@ { axis2_char_t *tmp_id = NULL; tmp_id = axis2_array_list_get(sender->working_seqs, env, i); - if(0 == AXIS2_STRCMP(seq_id, tmp_id)) + if(0 == axis2_strcmp(seq_id, tmp_id)) { axis2_array_list_remove(sender->working_seqs, env, i); break; Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original) +++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Sun Mar 18 21:54:50 2007 @@ -126,7 +126,7 @@ sender_worker->conf_ctx = conf_ctx; sender_worker->mutex = NULL; sender_worker->counter = 0; - sender_worker->msg_id = AXIS2_STRDUP(msg_id, env); + sender_worker->msg_id = axis2_strdup(msg_id, env); sender_worker->msg_ctx = NULL; sender_worker->transport_out = NULL; sender_worker->status = AXIS2_FAILURE; @@ -340,7 +340,7 @@ SANDESHA2_QUALIFIED_FOR_SENDING, AXIS2_FALSE); if(property) qualified_for_sending = AXIS2_PROPERTY_GET_VALUE(property, env); - if(qualified_for_sending && 0 != AXIS2_STRCMP( + if(qualified_for_sending && 0 != axis2_strcmp( qualified_for_sending, AXIS2_VALUE_TRUE)) { printf("not qualified for sending\n"); Modified: webservices/sandesha/trunk/c/src/wsrm/accept.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/accept.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/accept.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/accept.c Sun Mar 18 21:54:50 2007 @@ -94,8 +94,8 @@ return NULL; } - accept_impl->rm_ns_val = (axis2_char_t *)AXIS2_STRDUP(rm_ns_val, env); - accept_impl->addr_ns_val = (axis2_char_t *)AXIS2_STRDUP(addr_ns_val, env); + accept_impl->rm_ns_val = (axis2_char_t *)axis2_strdup(rm_ns_val, env); + accept_impl->addr_ns_val = (axis2_char_t *)axis2_strdup(addr_ns_val, env); accept_impl->acks_to = NULL; accept_impl->accept.element.ops->get_namespace_value = @@ -250,11 +250,11 @@ const axis2_env_t *env, axis2_char_t *namespace) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/ack_final.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_final.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/ack_final.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/ack_final.c Sun Mar 18 21:54:50 2007 @@ -89,7 +89,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - ack_final_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + ack_final_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); ack_final_impl->ack_final.element.ops->get_namespace_value = sandesha2_ack_final_get_namespace_value; @@ -211,11 +211,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ack_final_impl = SANDESHA2_INTF_TO_IMPL(ack_final); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_FALSE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/ack_none.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_none.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/ack_none.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/ack_none.c Sun Mar 18 21:54:50 2007 @@ -89,7 +89,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - ack_none_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + ack_none_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); ack_none_impl->ack_none.element.ops->get_namespace_value = sandesha2_ack_none_get_namespace_value; ack_none_impl->ack_none.element.ops->from_om_node = @@ -214,11 +214,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ack_none_impl = SANDESHA2_INTF_TO_IMPL(ack_none); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_FALSE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/ack_range.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_range.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/ack_range.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/ack_range.c Sun Mar 18 21:54:50 2007 @@ -101,8 +101,8 @@ return NULL; } - ack_range_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); - ack_range_impl->prefix = (axis2_char_t *)AXIS2_STRDUP(prefix, env); + ack_range_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); + ack_range_impl->prefix = (axis2_char_t *)axis2_strdup(prefix, env); ack_range_impl->upper_val = 0; ack_range_impl->lower_val = 0; @@ -295,11 +295,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ack_range_impl = SANDESHA2_INTF_TO_IMPL(ack_range); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/ack_requested.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_requested.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/ack_requested.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/ack_requested.c Sun Mar 18 21:54:50 2007 @@ -111,7 +111,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - ack_requested_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + ack_requested_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); ack_requested_impl->ack_requested.part.element.ops->get_namespace_value = sandesha2_ack_requested_get_namespace_value; @@ -281,11 +281,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); ack_requested_impl = SANDESHA2_INTF_TO_IMPL(ack_requested); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/acks_to.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/acks_to.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/acks_to.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/acks_to.c Sun Mar 18 21:54:50 2007 @@ -81,8 +81,8 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - acks_to_impl->rm_ns_val = (axis2_char_t *)AXIS2_STRDUP(rm_ns_val, env); - acks_to_impl->addr_ns_val = (axis2_char_t *)AXIS2_STRDUP(addr_ns_val, env); + acks_to_impl->rm_ns_val = (axis2_char_t *)axis2_strdup(rm_ns_val, env); + acks_to_impl->addr_ns_val = (axis2_char_t *)axis2_strdup(addr_ns_val, env); acks_to_impl->address = address; acks_to_impl->acks_to.element.ops = AXIS2_MALLOC(env->allocator, @@ -244,11 +244,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FALSE); acks_to_impl = SANDESHA2_INTF_TO_IMPL(acks_to); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/address.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/address.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/address.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/address.c Sun Mar 18 21:54:50 2007 @@ -77,7 +77,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - address_impl->ns_val = AXIS2_STRDUP(ns_val, env); + address_impl->ns_val = axis2_strdup(ns_val, env); address_impl->epr = epr; address_impl->address.element.ops = NULL; @@ -177,7 +177,7 @@ return NULL; } str_address = axiom_element_get_text(addr_part, env, addr_node); - if(!str_address || 0 == AXIS2_STRLEN(str_address)) + if(!str_address || 0 == axis2_strlen(str_address)) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_EMPTY_OM_ELEMENT, AXIS2_FAILURE); @@ -207,7 +207,7 @@ AXIS2_PARAM_CHECK(env->error, om_node, NULL); address_impl = SANDESHA2_INTF_TO_IMPL(address); if(!address_impl->epr || !axis2_endpoint_ref_get_address( - address_impl->epr, env) || 0 == AXIS2_STRLEN( + address_impl->epr, env) || 0 == axis2_strlen( axis2_endpoint_ref_get_address(address_impl->epr, env))) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT, @@ -242,11 +242,11 @@ sandesha2_address_impl_t *address_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); address_impl = SANDESHA2_INTF_TO_IMPL(address); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/close_seq.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/close_seq.c Sun Mar 18 21:54:50 2007 @@ -108,7 +108,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - close_seq_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + close_seq_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); close_seq_impl->close_seq.part.element.ops->get_namespace_value = sandesha2_close_seq_get_namespace_value; @@ -256,11 +256,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); close_seq_impl = SANDESHA2_INTF_TO_IMPL(close_seq); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c Sun Mar 18 21:54:50 2007 @@ -113,7 +113,7 @@ return NULL; } - close_seq_res_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + close_seq_res_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); close_seq_res_impl->close_seq_res.part.element.ops->get_namespace_value = sandesha2_close_seq_res_get_namespace_value; @@ -255,11 +255,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); close_seq_res_impl = SANDESHA2_INTF_TO_IMPL(close_seq_res); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/create_seq.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/create_seq.c Sun Mar 18 21:54:50 2007 @@ -94,8 +94,8 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - create_seq_impl->rm_ns_val = (axis2_char_t*)AXIS2_STRDUP(rm_ns_val, env); - create_seq_impl->addr_ns_val = (axis2_char_t*)AXIS2_STRDUP(addr_ns_val, env); + create_seq_impl->rm_ns_val = (axis2_char_t*)axis2_strdup(rm_ns_val, env); + create_seq_impl->addr_ns_val = (axis2_char_t*)axis2_strdup(addr_ns_val, env); create_seq_impl->acks_to = NULL; create_seq_impl->expires = NULL; create_seq_impl->seq_offer = NULL; @@ -335,11 +335,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c Sun Mar 18 21:54:50 2007 @@ -125,8 +125,8 @@ return NULL; } - create_seq_res_impl->rm_ns_val = (axis2_char_t *)AXIS2_STRDUP(rm_ns_val, env); - create_seq_res_impl->addr_ns_val = (axis2_char_t *)AXIS2_STRDUP(addr_ns_val, + create_seq_res_impl->rm_ns_val = (axis2_char_t *)axis2_strdup(rm_ns_val, env); + create_seq_res_impl->addr_ns_val = (axis2_char_t *)axis2_strdup(addr_ns_val, env); create_seq_res_impl->create_seq_res.part.element.ops->get_namespace_value = @@ -332,11 +332,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); create_seq_res_impl = SANDESHA2_INTF_TO_IMPL(create_seq_res); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/expires.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/expires.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/expires.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/expires.c Sun Mar 18 21:54:50 2007 @@ -92,7 +92,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - expires_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + expires_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); expires_impl->expires.element.ops->get_namespace_value = sandesha2_expires_get_namespace_value; @@ -201,7 +201,7 @@ AXIS2_FAILURE); return NULL; } - expires_impl->duration = AXIS2_STRDUP(text, env); + expires_impl->duration = axis2_strdup(text, env); if(NULL == expires_impl->duration) { return NULL; @@ -225,7 +225,7 @@ AXIS2_PARAM_CHECK(env->error, om_node, NULL); expires_impl = SANDESHA2_INTF_TO_IMPL(expires); - if(NULL == expires_impl->duration || 0 == AXIS2_STRLEN( + if(NULL == expires_impl->duration || 0 == axis2_strlen( expires_impl->duration)) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT, @@ -260,11 +260,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); expires_impl = SANDESHA2_INTF_TO_IMPL(expires); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/fault_code.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/fault_code.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/fault_code.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/fault_code.c Sun Mar 18 21:54:50 2007 @@ -93,7 +93,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - fault_code_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + fault_code_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); fault_code_impl->fault_code.element.ops->get_namespace_value = sandesha2_fault_code_get_namespace_value; @@ -192,7 +192,7 @@ AXIS2_FAILURE) return NULL; } - fault_code_impl->str_fault_code = AXIS2_STRDUP(fault_text, env); + fault_code_impl->str_fault_code = axis2_strdup(fault_text, env); if(NULL == fault_code_impl->str_fault_code) { return NULL; @@ -214,7 +214,7 @@ AXIS2_PARAM_CHECK(env->error, om_node, NULL); fault_code_impl = SANDESHA2_INTF_TO_IMPL(fault_code); - if(NULL == fault_code_impl->str_fault_code || 0 == AXIS2_STRLEN( + if(NULL == fault_code_impl->str_fault_code || 0 == axis2_strlen( fault_code_impl->str_fault_code)) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT, @@ -249,11 +249,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); fault_code_impl = SANDESHA2_INTF_TO_IMPL(fault_code); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } @@ -285,6 +285,6 @@ { AXIS2_FREE(env->allocator, fault_code_impl->str_fault_code); } - fault_code_impl->str_fault_code = AXIS2_STRDUP(str_fault_code, env); + fault_code_impl->str_fault_code = axis2_strdup(str_fault_code, env); return AXIS2_SUCCESS; } Modified: webservices/sandesha/trunk/c/src/wsrm/identifier.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/identifier.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/identifier.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/identifier.c Sun Mar 18 21:54:50 2007 @@ -100,7 +100,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - identifier_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + identifier_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); identifier_impl->identifier.element.ops->get_namespace_value = sandesha2_identifier_get_namespace_value; @@ -202,7 +202,7 @@ AXIS2_FAILURE); return NULL; } - identifier_impl->str_id = AXIS2_STRDUP(ident_str, env); + identifier_impl->str_id = axis2_strdup(ident_str, env); if(NULL == identifier_impl->str_id) { return NULL; @@ -225,7 +225,7 @@ AXIS2_PARAM_CHECK(env->error, om_node, NULL); identifier_impl = SANDESHA2_INTF_TO_IMPL(identifier); - if(!identifier_impl->str_id || 0 == AXIS2_STRLEN( + if(!identifier_impl->str_id || 0 == axis2_strlen( identifier_impl->str_id)) { AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT, @@ -260,11 +260,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); identifier_impl = SANDESHA2_INTF_TO_IMPL(identifier); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } @@ -300,7 +300,7 @@ identifier_impl->str_id = NULL; } - identifier_impl->str_id = (axis2_char_t *)AXIS2_STRDUP(str_id, env); + identifier_impl->str_id = (axis2_char_t *)axis2_strdup(str_id, env); return AXIS2_SUCCESS; } Modified: webservices/sandesha/trunk/c/src/wsrm/last_msg.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/last_msg.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/last_msg.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/last_msg.c Sun Mar 18 21:54:50 2007 @@ -93,7 +93,7 @@ return NULL; } - last_msg_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + last_msg_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); last_msg_impl->last_msg.element.ops->get_namespace_value = sandesha2_last_msg_get_namespace_value; @@ -223,11 +223,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); last_msg_impl = SANDESHA2_INTF_TO_IMPL(last_msg); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/make_connection.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/make_connection.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/make_connection.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/make_connection.c Sun Mar 18 21:54:50 2007 @@ -125,7 +125,7 @@ return NULL; } - make_conn_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + make_conn_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); make_conn_impl->make_conn.part.element.ops->get_namespace_value = sandesha2_make_connection_get_namespace_value; @@ -325,11 +325,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); make_conn_impl = SANDESHA2_INTF_TO_IMPL(make_conn); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_FALSE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/msg_number.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/msg_number.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/msg_number.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/msg_number.c Sun Mar 18 21:54:50 2007 @@ -112,7 +112,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - msg_number_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + msg_number_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); msg_number_impl->msg_number.element.ops->get_namespace_value = sandesha2_msg_number_get_namespace_value; @@ -270,11 +270,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); msg_number_impl = SANDESHA2_INTF_TO_IMPL(msg_num); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/msg_pending.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/msg_pending.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/msg_pending.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/msg_pending.c Sun Mar 18 21:54:50 2007 @@ -91,7 +91,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - msg_pending_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + msg_pending_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); msg_pending_impl->pending = AXIS2_TRUE; msg_pending_impl->msg_pending.part.ops = NULL; msg_pending_impl->msg_pending.part.element.ops = NULL; @@ -218,9 +218,9 @@ AXIS2_FAILURE); } value = axiom_attribute_get_value(pending_attr, env); - if(0 == AXIS2_STRCMP(value, AXIS2_VALUE_TRUE)) + if(0 == axis2_strcmp(value, AXIS2_VALUE_TRUE)) pending = AXIS2_TRUE; - if(0 == AXIS2_STRCMP(value, AXIS2_VALUE_FALSE)) + if(0 == axis2_strcmp(value, AXIS2_VALUE_FALSE)) pending = AXIS2_FALSE; else { @@ -291,11 +291,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); msg_pending_impl = SANDESHA2_INTF_TO_IMPL(msg_pending); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_FALSE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/nack.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/nack.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/nack.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/nack.c Sun Mar 18 21:54:50 2007 @@ -111,7 +111,7 @@ return NULL; } - nack_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + nack_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); nack_impl->nack.element.ops->get_namespace_value = sandesha2_nack_get_namespace_value; @@ -265,11 +265,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); nack_impl = SANDESHA2_INTF_TO_IMPL(nack); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/rm_elements.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/rm_elements.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Sun Mar 18 21:54:50 2007 @@ -76,7 +76,7 @@ rm_elements->make_connection = NULL; rm_elements->msg_pending = NULL; - rm_elements->addr_ns_val = AXIS2_STRDUP(addr_ns_val, env); + rm_elements->addr_ns_val = axis2_strdup(addr_ns_val, env); return rm_elements; } @@ -623,30 +623,30 @@ if(!action) return NULL; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ)) return SANDESHA2_SPEC_2005_02_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ_RESPONSE)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ_RESPONSE)) return SANDESHA2_SPEC_2005_02_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2005_02_ACTION_SEQ_ACKNOWLEDGEMENT)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_SEQ_ACKNOWLEDGEMENT)) return SANDESHA2_SPEC_2005_02_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ)) return SANDESHA2_SPEC_2005_02_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ_RESPONSE)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ_RESPONSE)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_SEQ_ACKNOWLEDGEMENT)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_SEQ_ACKNOWLEDGEMENT)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ_RESPONSE)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ_RESPONSE)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ_RESPONSE)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ_RESPONSE)) return SANDESHA2_SPEC_2006_08_NS_URI; - if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_MAKE_CONNECTION)) + if(0 == axis2_strcmp(action, SANDESHA2_SPEC_2006_08_ACTION_MAKE_CONNECTION)) return SANDESHA2_SPEC_2006_08_NS_URI; return NULL; Modified: webservices/sandesha/trunk/c/src/wsrm/seq_ack.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_ack.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Sun Mar 18 21:54:50 2007 @@ -125,7 +125,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - seq_ack_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + seq_ack_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); seq_ack_impl->ack_range_list = axis2_array_list_create(env, AXIS2_ARRAY_LIST_DEFAULT_CAPACITY); seq_ack_impl->nack_list = axis2_array_list_create(env, @@ -470,11 +470,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); seq_ack_impl = SANDESHA2_INTF_TO_IMPL(seq_ack); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/seq_fault.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_fault.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/seq_fault.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/seq_fault.c Sun Mar 18 21:54:50 2007 @@ -94,7 +94,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - seq_fault_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + seq_fault_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); seq_fault_impl->seq_fault.element.ops->get_namespace_value = sandesha2_seq_fault_get_namespace_value; @@ -243,11 +243,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); seq_fault_impl = SANDESHA2_INTF_TO_IMPL(seq_fault); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/seq_offer.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_offer.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/seq_offer.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/seq_offer.c Sun Mar 18 21:54:50 2007 @@ -83,7 +83,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - seq_offer_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + seq_offer_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); seq_offer_impl->identifier = NULL; seq_offer_impl->expires = NULL; seq_offer_impl->seq_offer.element.ops = NULL; @@ -273,11 +273,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); seq_offer_impl = SANDESHA2_INTF_TO_IMPL(seq_offer); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/sequence.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/sequence.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Sun Mar 18 21:54:50 2007 @@ -125,7 +125,7 @@ return NULL; } - seq_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + seq_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); seq_impl->seq.part.element.ops->get_namespace_value = sandesha2_seq_get_namespace_value; @@ -306,11 +306,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); seq_impl = SANDESHA2_INTF_TO_IMPL(seq); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c Sun Mar 18 21:54:50 2007 @@ -111,7 +111,7 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - terminate_seq_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + terminate_seq_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); terminate_seq_impl->terminate_seq.part.element.ops->get_namespace_value = sandesha2_terminate_seq_get_namespace_value; @@ -245,11 +245,11 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); terminate_seq_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI)) { return AXIS2_TRUE; } - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c?view=diff&rev=519842&r1=519841&r2=519842 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c Sun Mar 18 21:54:50 2007 @@ -115,7 +115,7 @@ env->allocator, sizeof(sandesha2_iom_rm_element_ops_t)); - terminate_seq_res_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); + terminate_seq_res_impl->ns_val = (axis2_char_t *)axis2_strdup(ns_val, env); terminate_seq_res_impl->terminate_seq_res.part.element.ops-> get_namespace_value = @@ -254,7 +254,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); terminate_seq_res_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq_res); - if(0 == AXIS2_STRCMP(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) + if(0 == axis2_strcmp(namespace, SANDESHA2_SPEC_2006_08_NS_URI)) { return AXIS2_TRUE; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
