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 sh...@apache.org on 2009/01/27 09:04:44 UTC

svn commit: r738025 - in /webservices/axis2/trunk/c/axiom: include/axiom_xpath.h src/xpath/xpath.c src/xpath/xpath_internals_parser.c

Author: shankar
Date: Tue Jan 27 08:04:44 2009
New Revision: 738025

URL: http://svn.apache.org/viewvc?rev=738025&view=rev
Log:
Exporting function symbols

Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_xpath.h
    webservices/axis2/trunk/c/axiom/src/xpath/xpath.c
    webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_parser.c

Modified: webservices/axis2/trunk/c/axiom/include/axiom_xpath.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_xpath.h?rev=738025&r1=738024&r2=738025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_xpath.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_xpath.h Tue Jan 27 08:04:44 2009
@@ -195,7 +195,7 @@
       * @return The parsed XPath expression. Returns NULL if an error occured
       *         while parsing.
       */
-    axiom_xpath_expression_t * AXIS2_CALL axiom_xpath_compile_expression(
+    AXIS2_EXTERN axiom_xpath_expression_t * AXIS2_CALL axiom_xpath_compile_expression(
         const axutil_env_t *env,
         const axis2_char_t* xpath_expr);
 
@@ -206,7 +206,7 @@
       * @param root_node A pointer to the root of the tree
       * @return The initialized XPath context.
       */
-    axiom_xpath_context_t * AXIS2_CALL axiom_xpath_context_create(
+    AXIS2_EXTERN axiom_xpath_context_t * AXIS2_CALL axiom_xpath_context_create(
         axutil_env_t *env,
         axiom_node_t * root_node);
 
@@ -219,7 +219,7 @@
       * @param xpath_expr XPath expression to be evaluated
       * @return The set of results.
       */
-    axiom_xpath_result_t * AXIS2_CALL axiom_xpath_evaluate(
+    AXIS2_EXTERN axiom_xpath_result_t * AXIS2_CALL axiom_xpath_evaluate(
         axiom_xpath_context_t *context,
         axiom_xpath_expression_t *xpath_expr);
 
@@ -235,7 +235,7 @@
       * @param node A pointer to the XPath result
       * @return The boolean value.
       */
-    axis2_bool_t AXIS2_CALL axiom_xpath_cast_node_to_boolean(
+    AXIS2_EXTERN axis2_bool_t AXIS2_CALL axiom_xpath_cast_node_to_boolean(
         const axutil_env_t *env,
         axiom_xpath_result_node_t * node);
 
@@ -249,7 +249,7 @@
       * @param node A pointer to the XPath result
       * @return The numerical value.
       */
-    double AXIS2_CALL axiom_xpath_cast_node_to_number(
+    AXIS2_EXTERN double AXIS2_CALL axiom_xpath_cast_node_to_number(
         const axutil_env_t *env,
         axiom_xpath_result_node_t * node);
 
@@ -265,7 +265,7 @@
       * @param node A pointer to the XPath result
       * @return The text value.
       */
-    axis2_char_t * AXIS2_CALL axiom_xpath_cast_node_to_string(
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL axiom_xpath_cast_node_to_string(
         const axutil_env_t *env,
         axiom_xpath_result_node_t * node);
 
@@ -277,7 +277,7 @@
       * @param node A pointer to the XPath result
       * @return The axiom node.
       */
-    axiom_node_t * AXIS2_CALL axiom_xpath_cast_node_to_axiom_node(
+    AXIS2_EXTERN axiom_node_t * AXIS2_CALL axiom_xpath_cast_node_to_axiom_node(
         const axutil_env_t *env,
         axiom_xpath_result_node_t * node);
 
@@ -288,7 +288,7 @@
       * @param env Environment must not be null
       * @param context XPath context must not be null
       */
-    void AXIS2_CALL axiom_xpath_free_context(
+    AXIS2_EXTERN void AXIS2_CALL axiom_xpath_free_context(
         const axutil_env_t *env,
         axiom_xpath_context_t *context);
 
@@ -298,7 +298,7 @@
       * @param env Environment must not be null
       * @param xpath_expr XPath expression must not be null
       */
-    void AXIS2_CALL axiom_xpath_free_expression(
+    AXIS2_EXTERN void AXIS2_CALL axiom_xpath_free_expression(
         const axutil_env_t *env,
         axiom_xpath_expression_t * xpath_expr);
 
@@ -308,7 +308,7 @@
       * @param env Environment must not be null
       * @param result XPath result set must not be null
       */
-    void AXIS2_CALL axiom_xpath_free_result(
+    AXIS2_EXTERN void AXIS2_CALL axiom_xpath_free_result(
         const axutil_env_t *env,
         axiom_xpath_result_t* result);
 
@@ -318,7 +318,7 @@
       * @param context XPath Context, must not be null
       * @param ns AXIOM namespace, must not be null
       */
-    void AXIS2_CALL axiom_xpath_register_namespace(
+    AXIS2_EXTERN void AXIS2_CALL axiom_xpath_register_namespace(
         axiom_xpath_context_t *context,
         axiom_namespace_t *ns);
 
@@ -330,7 +330,7 @@
       * @param prefix Prefix of the namespace, must not be null
       * @return The namespace corresponding to the prefix.
       */
-    axiom_namespace_t * AXIS2_CALL axiom_xpath_get_namespace(
+    AXIS2_EXTERN axiom_namespace_t * AXIS2_CALL axiom_xpath_get_namespace(
         axiom_xpath_context_t *context,
         axis2_char_t *prefix);
 
@@ -339,7 +339,7 @@
       *
       * @param context XPath Context, must not be null
       */
-    void AXIS2_CALL axiom_xpath_clear_namespaces(
+    AXIS2_EXTERN void AXIS2_CALL axiom_xpath_clear_namespaces(
         axiom_xpath_context_t *context);
 
     /**
@@ -350,7 +350,7 @@
       * @param context XPath Context, must not be null
       * @param xpath_expr XPath expression to be evaluated
       */
-    axiom_xpath_result_t * AXIS2_CALL axiom_xpath_evaluate_streaming(
+    AXIS2_EXTERN axiom_xpath_result_t * AXIS2_CALL axiom_xpath_evaluate_streaming(
         axiom_xpath_context_t *context,
         axiom_xpath_expression_t *xpath_expr);
 
@@ -362,7 +362,7 @@
       * @param expr Complied XPath expression, must not be null
       * @return A boolean indicating whether the expression can be evaluated on streaming XML.
       */
-    axis2_bool_t AXIS2_CALL axiom_xpath_streaming_check(
+    AXIS2_EXTERN axis2_bool_t AXIS2_CALL axiom_xpath_streaming_check(
         const axutil_env_t *env,
         axiom_xpath_expression_t* expr);
 
@@ -371,7 +371,7 @@
       *
       * @param context XPath Context, must not be null
       */
-    void AXIS2_CALL axiom_xpath_register_default_functions_set(
+    AXIS2_EXTERN void AXIS2_CALL axiom_xpath_register_default_functions_set(
         axiom_xpath_context_t *context);
 
     /**
@@ -381,7 +381,7 @@
       * @param name Name of the function, must not be null
       * @param func Pointer to the function, must not be null
       */
-    void AXIS2_CALL axiom_xpath_register_function(
+    AXIS2_EXTERN void AXIS2_CALL axiom_xpath_register_function(
         axiom_xpath_context_t *context,
         axis2_char_t *name,
         axiom_xpath_function_t func);
@@ -394,7 +394,7 @@
       * @param name Name of the function, must not be null
       * @return The corresponding function.
       */
-    axiom_xpath_function_t AXIS2_CALL axiom_xpath_get_function(
+    AXIS2_EXTERN axiom_xpath_function_t AXIS2_CALL axiom_xpath_get_function(
         axiom_xpath_context_t *context,
         axis2_char_t *name);
 

Modified: webservices/axis2/trunk/c/axiom/src/xpath/xpath.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/xpath/xpath.c?rev=738025&r1=738024&r2=738025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/xpath/xpath.c (original)
+++ webservices/axis2/trunk/c/axiom/src/xpath/xpath.c Tue Jan 27 08:04:44 2009
@@ -24,7 +24,7 @@
 #include "xpath_streaming.h"
 
 /* Create XPath context */
-axiom_xpath_context_t * AXIS2_CALL axiom_xpath_context_create(
+AXIS2_EXTERN axiom_xpath_context_t * AXIS2_CALL axiom_xpath_context_create(
     axutil_env_t *env,
     axiom_node_t * root_node)
 {
@@ -47,7 +47,7 @@
 }
 
 /* Compile XPath expression */
-axiom_xpath_expression_t * AXIS2_CALL axiom_xpath_compile_expression(
+AXIS2_EXTERN axiom_xpath_expression_t * AXIS2_CALL axiom_xpath_compile_expression(
     const axutil_env_t *env,
     const axis2_char_t* xpath_expr)
 {
@@ -70,7 +70,7 @@
 }
 
 /* Evaluate compiled XPath expression */
-axiom_xpath_result_t * AXIS2_CALL axiom_xpath_evaluate(
+AXIS2_EXTERN axiom_xpath_result_t * AXIS2_CALL axiom_xpath_evaluate(
     axiom_xpath_context_t *context,
     axiom_xpath_expression_t *xpath_expr)
 {
@@ -81,7 +81,7 @@
     return axiom_xpath_run(context);
 }
 
-axiom_xpath_result_t * AXIS2_CALL axiom_xpath_evaluate_streaming(
+AXIS2_EXTERN axiom_xpath_result_t * AXIS2_CALL axiom_xpath_evaluate_streaming(
     axiom_xpath_context_t *context,
     axiom_xpath_expression_t *xpath_expr)
 {
@@ -105,7 +105,7 @@
     }
 }
 
-void AXIS2_CALL axiom_xpath_register_default_functions_set(
+AXIS2_EXTERN void AXIS2_CALL axiom_xpath_register_default_functions_set(
     axiom_xpath_context_t *context)
 {
     axiom_xpath_register_function(
@@ -113,7 +113,7 @@
 }
 
 
-void AXIS2_CALL axiom_xpath_register_function(
+AXIS2_EXTERN void AXIS2_CALL axiom_xpath_register_function(
     axiom_xpath_context_t *context,
     axis2_char_t *name,
     axiom_xpath_function_t func)
@@ -129,7 +129,7 @@
     }
 }
 
-axiom_xpath_function_t AXIS2_CALL axiom_xpath_get_function(
+AXIS2_EXTERN axiom_xpath_function_t AXIS2_CALL axiom_xpath_get_function(
     axiom_xpath_context_t *context,
     axis2_char_t *name)
 {
@@ -143,7 +143,7 @@
     return func;
 }
 
-void AXIS2_CALL axiom_xpath_register_namespace(
+AXIS2_EXTERN void AXIS2_CALL axiom_xpath_register_namespace(
     axiom_xpath_context_t *context,
     axiom_namespace_t *ns)
 {
@@ -163,7 +163,7 @@
     }
 }
 
-axiom_namespace_t * AXIS2_CALL axiom_xpath_get_namespace(
+AXIS2_EXTERN axiom_namespace_t * AXIS2_CALL axiom_xpath_get_namespace(
     axiom_xpath_context_t *context,
     axis2_char_t *prefix)
 {
@@ -177,7 +177,7 @@
     return ns;
 }
 
-void AXIS2_CALL axiom_xpath_clear_namespaces(axiom_xpath_context_t *context)
+AXIS2_EXTERN void AXIS2_CALL axiom_xpath_clear_namespaces(axiom_xpath_context_t *context)
 {
     axutil_hash_index_t *hi;
     void *val;
@@ -199,7 +199,7 @@
 }
 
 /* Cast to boolean */
-axis2_bool_t AXIS2_CALL axiom_xpath_cast_node_to_boolean(
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL axiom_xpath_cast_node_to_boolean(
     const axutil_env_t *env,
     axiom_xpath_result_node_t * node)
 {
@@ -232,7 +232,7 @@
 }
 
 /* Cast to double */
-double AXIS2_CALL axiom_xpath_cast_node_to_number(
+AXIS2_EXTERN double AXIS2_CALL axiom_xpath_cast_node_to_number(
     const axutil_env_t *env,
     axiom_xpath_result_node_t * node)
 {
@@ -262,7 +262,7 @@
 }
 
 /* Cast to text */
-axis2_char_t * AXIS2_CALL axiom_xpath_cast_node_to_string(
+AXIS2_EXTERN axis2_char_t * AXIS2_CALL axiom_xpath_cast_node_to_string(
     const axutil_env_t *env,
     axiom_xpath_result_node_t * node)
 {
@@ -328,7 +328,7 @@
 }
 
 /* Cast to axiom node */
-axiom_node_t * AXIS2_CALL axiom_xpath_cast_node2axiom_node(
+AXIS2_EXTERN axiom_node_t * AXIS2_CALL axiom_xpath_cast_node2axiom_node(
     const axutil_env_t *env,
     axiom_xpath_result_node_t * node)
 {
@@ -343,7 +343,7 @@
 }
 
 /* Free context */
-void AXIS2_CALL axiom_xpath_free_context(
+AXIS2_EXTERN void AXIS2_CALL axiom_xpath_free_context(
     const axutil_env_t *env,
     axiom_xpath_context_t *context)
 {
@@ -362,7 +362,7 @@
 }
 
 /* Free expression */
-void AXIS2_CALL axiom_xpath_free_expression(
+AXIS2_EXTERN void AXIS2_CALL axiom_xpath_free_expression(
     const axutil_env_t *env,
     axiom_xpath_expression_t * xpath_expr)
 {
@@ -380,7 +380,7 @@
 }
 
 /* Free result set */
-void AXIS2_CALL axiom_xpath_free_result(
+AXIS2_EXTERN void AXIS2_CALL axiom_xpath_free_result(
     const axutil_env_t *env,
     axiom_xpath_result_t* result)
 {
@@ -396,7 +396,7 @@
 }
 
 /* Check if the expression can be evaluated on streaming XML */
-axis2_bool_t AXIS2_CALL axiom_xpath_streaming_check(
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL axiom_xpath_streaming_check(
     const axutil_env_t *env,
     axiom_xpath_expression_t* expr)
 {

Modified: webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_parser.c?rev=738025&r1=738024&r2=738025&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_parser.c Tue Jan 27 08:04:44 2009
@@ -19,6 +19,7 @@
 #include <axiom_xpath.h>
 #include "xpath_internals.h"
 #include "xpath_internals_parser.h"
+#include <ctype.h>
 
 /* Compile an XPath expression */
 int axiom_xpath_compile(