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 du...@apache.org on 2008/10/06 07:55:04 UTC
svn commit: r701952 - in
/webservices/axis2/branches/c/xpath_integration/axiom/src: Makefile.am
xpath/xpath_internals_engine.c xpath/xpath_internals_iterators.c
Author: dumindu
Date: Sun Oct 5 22:55:04 2008
New Revision: 701952
URL: http://svn.apache.org/viewvc?rev=701952&view=rev
Log:
fixed build issues.
Modified:
webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am
webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_engine.c
webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_iterators.c
Modified: webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am?rev=701952&r1=701951&r2=701952&view=diff
==============================================================================
--- webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am (original)
+++ webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am Sun Oct 5 22:55:04 2008
@@ -1 +1 @@
-SUBDIRS = parser attachments soap util om xpath
+SUBDIRS = parser attachments soap util xpath om
Modified: webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_engine.c?rev=701952&r1=701951&r2=701952&view=diff
==============================================================================
--- webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_engine.c (original)
+++ webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_engine.c Sun Oct 5 22:55:04 2008
@@ -810,7 +810,7 @@
if (!func)
{
#ifdef AXIOM_XPATH_DEBUG
- printf("Function %s not found\n", op->par1);
+ printf("Function %s not found\n", (char *)op->par1);
#endif
return AXIOM_XPATH_EVALUATION_ERROR;
Modified: webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_iterators.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_iterators.c?rev=701952&r1=701951&r2=701952&view=diff
==============================================================================
--- webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_iterators.c (original)
+++ webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/xpath_internals_iterators.c Sun Oct 5 22:55:04 2008
@@ -385,8 +385,11 @@
axiom_element_t *element;
axutil_hash_t *ht;
axutil_hash_index_t *hi;
- void *key;
- axis2_ssize_t klen;
+
+/* void *key;
+ * axis2_ssize_t klen;
+ */
+ void *attr;
AXIOM_XPATH_ITERATOR_INITIALIZE;
@@ -409,9 +412,10 @@
hi;
hi = axutil_hash_next(context->env, hi))
{
- axutil_hash_this(hi, &key, &klen, (void **)&context->attribute);
+ attr = &context->attribute;
+ axutil_hash_this(hi, NULL, NULL, attr);
- if (axiom_xpath_node_test_match(
+ if (axiom_xpath_node_test_match(
context, (axiom_xpath_node_test_t *)node_test_op->par1))
{
n_nodes +=
@@ -440,8 +444,12 @@
axiom_element_t *element;
axutil_hash_t *ht;
axutil_hash_index_t *hi;
- void *key;
- axis2_ssize_t klen;
+
+/* void *key;
+ * axis2_ssize_t klen;
+ */
+
+ void *ns;
AXIOM_XPATH_ITERATOR_INITIALIZE;
@@ -464,7 +472,8 @@
hi;
hi = axutil_hash_next(context->env, hi))
{
- axutil_hash_this(hi, &key, &klen, (void **)&context->ns);
+ ns = &context->ns;
+ axutil_hash_this(hi, NULL, NULL, ns);
if (axiom_xpath_node_test_match(
context, (axiom_xpath_node_test_t *)node_test_op->par1))