You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/22 17:11:52 UTC
svn commit: r521321 - in /webservices/axis2/trunk/c: axiom/src/om/
modules/core/deployment/ modules/core/transport/http/common/
modules/core/transport/http/server/apache2/
Author: dinesh
Date: Thu Mar 22 09:11:51 2007
New Revision: 521321
URL: http://svn.apache.org/viewvc?view=rev&rev=521321
Log:
fixed axis2c linux build failure
Modified:
webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
webservices/axis2/trunk/c/axiom/src/om/om_element.c
webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
Modified: webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_attribute.c?view=diff&rev=521321&r1=521320&r2=521321
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_attribute.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_attribute.c Thu Mar 22 09:11:51 2007
@@ -70,7 +70,7 @@
if (!(attribute->value))
{
AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- axis2_string_free(env->allocator, attribute->localname);
+ axis2_string_free(attribute->localname, env);
AXIS2_FREE(env->allocator, attribute);
return NULL;
}
@@ -198,7 +198,7 @@
{
if (attribute->localname)
{
- return axis2_string_get_buffer(attribute->localname, env);
+ return (axis2_char_t *)axis2_string_get_buffer(attribute->localname, env);
}
return NULL;
}
@@ -209,7 +209,7 @@
{
if (attribute->value)
{
- return axis2_string_get_buffer(attribute->value, env);
+ return (axis2_char_t *)axis2_string_get_buffer(attribute->value, env);
}
return NULL;
}
@@ -348,7 +348,7 @@
if (!(attribute->value))
{
AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- axis2_string_free(env->allocator, attribute->localname);
+ axis2_string_free(attribute->localname, env);
AXIS2_FREE(env->allocator, attribute);
return NULL;
}
@@ -415,5 +415,3 @@
}
return AXIS2_SUCCESS;
}
-
-
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c?view=diff&rev=521321&r1=521320&r2=521321
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c Thu Mar 22 09:11:51 2007
@@ -18,10 +18,6 @@
#include <axiom_children_qname_iterator.h>
#include <axiom_element.h>
-static axis2_bool_t AXIS2_CALL
-axiom_children_qname_iterator_qname_matches(const axis2_env_t *env,
- axis2_qname_t *element_qname, axis2_qname_t *qname_to_match);
-
struct axiom_children_qname_iterator
{
axiom_node_t *current_child;
@@ -136,10 +132,6 @@
iterator->current_child, env);
}
- /*if (om_element &&
- axiom_children_qname_iterator_qname_matches(env,
- axiom_element_get_qname(om_element, env, iterator->current_child),
- iterator->given_qname))*/
if (om_element &&
axis2_qname_equals(
axiom_element_get_qname(om_element, env, iterator->current_child),
@@ -190,42 +182,6 @@
AXIOM_NODE_GET_NEXT_SIBLING(iterator->current_child, env);
}
return iterator->last_child;
-}
-
-static axis2_bool_t AXIS2_CALL
-axiom_children_qname_iterator_qname_matches(const axis2_env_t *env,
- axis2_qname_t *element_qname,
- axis2_qname_t *qname_to_match)
-{
- int lparts_match = 0;
- int uris_match = 0;
- axis2_char_t *ele_lpart = NULL;
- axis2_char_t *match_lpart = NULL;
- axis2_char_t *ele_nsuri = NULL;
- axis2_char_t *match_nsuri = NULL;
-
- if (!(qname_to_match))
- return AXIS2_TRUE;
- if (qname_to_match)
- {
- match_lpart = axis2_qname_get_localpart(qname_to_match, env);
- match_nsuri = axis2_qname_get_uri(qname_to_match, env);
- }
- if (element_qname)
- {
- ele_lpart = axis2_qname_get_localpart(element_qname, env);
- ele_nsuri = axis2_qname_get_localpart(element_qname, env);
- }
-
- lparts_match = (!match_lpart ||
- (axis2_strcmp(match_lpart, "") == 0) ||
- (element_qname && (axis2_strcmp(ele_lpart, match_lpart) == 0)));
-
-
- uris_match = (!match_nsuri || (axis2_strcmp(match_nsuri, "") == 0) ||
- (element_qname && (axis2_strcmp(ele_nsuri, match_nsuri) == 0)));
-
- return lparts_match && uris_match;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=521321&r1=521320&r2=521321
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Thu Mar 22 09:11:51 2007
@@ -774,7 +774,7 @@
const axis2_env_t *env)
{
if (om_element->localname)
- return axis2_string_get_buffer(om_element->localname, env);
+ return (axis2_char_t *)axis2_string_get_buffer(om_element->localname, env);
else
return NULL;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_namespace.c?view=diff&rev=521321&r1=521320&r2=521321
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_namespace.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_namespace.c Thu Mar 22 09:11:51 2007
@@ -187,7 +187,7 @@
{
if (om_namespace->uri)
{
- return axis2_string_get_buffer(om_namespace->uri, env);
+ return (axis2_char_t *)axis2_string_get_buffer(om_namespace->uri, env);
}
return NULL;
}
@@ -199,7 +199,7 @@
{
if (om_namespace->prefix)
{
- return axis2_string_get_buffer(om_namespace->prefix, env);
+ return (axis2_char_t *)axis2_string_get_buffer(om_namespace->prefix, env);
}
return NULL;
}
@@ -351,7 +351,7 @@
om_namespace->uri = NULL;
}
- om_namespace->uri = axis2_string_clone(env, uri);
+ om_namespace->uri = axis2_string_clone(uri, env);
if (!(om_namespace->uri))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h?view=diff&rev=521321&r1=521320&r2=521321
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h Thu Mar 22 09:11:51 2007
@@ -39,7 +39,6 @@
#include "axis2_conf_builder.h"
#include "axis2_repos_listener.h"
-
#ifdef __cplusplus
extern "C"
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c?view=diff&rev=521321&r1=521320&r2=521321
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c Thu Mar 22 09:11:51 2007
@@ -145,6 +145,7 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+
axis2_http_header_get_value(
const axis2_http_header_t *http_header,
const axis2_env_t *env)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am?view=diff&rev=521321&r1=521320&r2=521321
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am Thu Mar 22 09:11:51 2007
@@ -1,5 +1,4 @@
lib_LTLIBRARIES = libmod_axis2.la
-
libmod_axis2_la_SOURCES = mod_axis2.c\
apache2_stream.c\
apache2_out_transport_info.c\
@@ -12,7 +11,6 @@
$(top_builddir)/modules/core/engine/libaxis2_engine.la\
$(top_builddir)/util/src/libaxis2_util.la \
$(top_builddir)/modules/core/transport/http/util/libaxis2_http_util.la\
- $(top_builddir)/modules/core/transport/http/common/libaxis2_http_common.la\
$(top_builddir)/axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la\
-lpthread \
-L$(top_builddir)$(GUTHTHILA_LIBS) \
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org