axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r328792 - in /webservices/axis2/trunk/c: include/ modules/util/src/
Date Thu, 27 Oct 2005 05:25:49 GMT
Author: samisa
Date: Wed Oct 26 22:24:52 2005
New Revision: 328792

URL: http://svn.apache.org/viewcvs?rev=328792&view=rev
Log:
Applied calling conventions

Modified:
    webservices/axis2/trunk/c/include/axis2.h
    webservices/axis2/trunk/c/include/axis2_allocator.h
    webservices/axis2/trunk/c/include/axis2_error.h
    webservices/axis2/trunk/c/include/axis2_hash.h
    webservices/axis2/trunk/c/include/axis2_log.h
    webservices/axis2/trunk/c/include/axis2_qname.h
    webservices/axis2/trunk/c/include/axis2_stream.h
    webservices/axis2/trunk/c/include/axis2_string.h
    webservices/axis2/trunk/c/modules/util/src/axis2_allocator.c
    webservices/axis2/trunk/c/modules/util/src/axis2_environment.c
    webservices/axis2/trunk/c/modules/util/src/axis2_error.c
    webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c
    webservices/axis2/trunk/c/modules/util/src/axis2_hash.c
    webservices/axis2/trunk/c/modules/util/src/axis2_log.c
    webservices/axis2/trunk/c/modules/util/src/axis2_qname.c
    webservices/axis2/trunk/c/modules/util/src/axis2_stream.c
    webservices/axis2/trunk/c/modules/util/src/axis2_string.c

Modified: webservices/axis2/trunk/c/include/axis2.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2.h?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2.h (original)
+++ webservices/axis2/trunk/c/include/axis2.h Wed Oct 26 22:24:52 2005
@@ -25,4 +25,4 @@
 }
 #endif
 
-#endif                          /* AXIS2_H */
+#endif /* AXIS2_H */

Modified: webservices/axis2/trunk/c/include/axis2_allocator.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_allocator.h?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_allocator.h (original)
+++ webservices/axis2/trunk/c/include/axis2_allocator.h Wed Oct 26 22:24:52 2005
@@ -34,32 +34,34 @@
  * @ingroup axis2_util 
  * @{
  */
+ 
+ 
 
 /** 
   * \brief Axis2 memory allocator
   *
   * Encapsulator for memory allocating routines
   */
-    typedef struct axis2_allocator
+   AXIS2_DECLARE_DATA typedef struct axis2_allocator
     {
       /**
         * allocates memory
         * @param size size of the memory block to be allocated
         * @return pointer to the allocated memory block
         */
-        AXIS2_DECLARE_DATA void * (AXIS2_CALL *axis2_allocator_malloc) (size_t size);
+         void * (*axis2_allocator_malloc) (size_t size);
       /**
         * re-llocates memory
         * @param ptr memory block who's size to be changed
         * @param size size of the memory block to be allocated
         * @return pointer to the allocated memory block
         */
-        AXIS2_DECLARE_DATA void * (AXIS2_CALL *axis2_allocator_realloc) (void *ptr, size_t
size);
+         void * (*axis2_allocator_realloc) (void *ptr, size_t size);
       /**
         * frees memory
         * @param ptr pointer to be freed
         */
-        AXIS2_DECLARE_DATA void (AXIS2_CALL *axis2_allocator_free) (void *ptr);
+         void (*axis2_allocator_free) (void *ptr);
     } axis2_allocator_t;
 
   /**
@@ -79,4 +81,4 @@
 }
 #endif
 
-#endif                          /* AXIS2_ALLOCATOR_H */
+#endif    /* AXIS2_ALLOCATOR_H */

Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Wed Oct 26 22:24:52 2005
@@ -39,13 +39,13 @@
     *
     * Encapsulator struct for operations of axis2_error
     */
-    typedef struct axis2_error_ops
+   AXIS2_DECLARE_DATA typedef struct axis2_error_ops
     {
       /**
         * get error message for the last error
         * @return error message for the last error. NULL on error.
         */
-        AXIS2_DECLARE_DATA axis2_char_t * (AXIS2_CALL *axis2_error_ops_get_message) ();
+         axis2_char_t * (AXIS2_CALL *axis2_error_ops_get_message) ();
     } axis2_error_ops_t;
 
   /** 

Modified: webservices/axis2/trunk/c/include/axis2_hash.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_hash.h?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_hash.h (original)
+++ webservices/axis2/trunk/c/include/axis2_hash.h Wed Oct 26 22:24:52 2005
@@ -78,7 +78,7 @@
  * @param environment The environment to allocate the hash table out of
  * @return The hash table just created
   */
-    axis2_hash_t *axis2_hash_make (axis2_environment_t * environment);
+  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_make (axis2_environment_t * environment);
 
 /**
  * Create a hash table with a custom hash function
@@ -86,7 +86,7 @@
  * @param hash_func A custom hash function.
  * @return The hash table just created
   */
-    axis2_hash_t *axis2_hash_make_custom (axis2_environment_t * environment,
+   AXIS2_DECLARE(axis2_hash_t*) axis2_hash_make_custom (axis2_environment_t * environment,
                                           axis2_hashfunc_t hash_func);
 
 /**
@@ -96,7 +96,7 @@
  * @return The hash table just created
  * @remark Makes a shallow copy
  */
-    axis2_hash_t *axis2_hash_copy (axis2_environment_t * environment,
+  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_copy (axis2_environment_t * environment,
                                    const axis2_hash_t * h);
 
 /**
@@ -107,7 +107,7 @@
  * @param val Value to associate with the key
  * @remark If the value is NULL the hash entry is deleted.
  */
-    void axis2_hash_set (axis2_hash_t * ht, const void *key,
+  AXIS2_DECLARE(void) axis2_hash_set (axis2_hash_t * ht, const void *key,
                          axis2_ssize_t klen, const void *val);
 
 /**
@@ -117,7 +117,7 @@
  * @param klen Length of the key. Can be AXIS2_HASH_KEY_STRING to use the string length.
  * @return Returns NULL if the key is not present.
  */
-    void *axis2_hash_get (axis2_hash_t * ht, const void *key,
+   AXIS2_DECLARE(void*) axis2_hash_get (axis2_hash_t * ht, const void *key,
                           axis2_ssize_t klen);
 
 /**
@@ -148,7 +148,7 @@
  * }
  * </PRE>
  */
-    axis2_hash_index_t *axis2_hash_first (axis2_environment_t * environment,
+ AXIS2_DECLARE(axis2_hash_index_t*) axis2_hash_first (axis2_environment_t * environment,
                                           axis2_hash_t * ht);
 
 /**
@@ -157,7 +157,7 @@
  * @return a pointer to the updated iteration state.  NULL if there are no more  
  *         entries.
  */
-    axis2_hash_index_t *axis2_hash_next (axis2_environment_t * environment, axis2_hash_index_t
* hi);
+ AXIS2_DECLARE(axis2_hash_index_t*) axis2_hash_next (axis2_environment_t * environment, axis2_hash_index_t
* hi);
 
 /**
  * Get the current entry's details from the iteration state.
@@ -168,7 +168,7 @@
  * @remark The return pointers should point to a variable that will be set to the
  *         corresponding data, or they may be NULL if the data isn't interesting.
  */
-    void axis2_hash_this (axis2_hash_index_t * hi, const void **key,
+ AXIS2_DECLARE(void) axis2_hash_this (axis2_hash_index_t * hi, const void **key,
                           axis2_ssize_t * klen, void **val);
 
 /**
@@ -187,7 +187,7 @@
  * @param base The table that represents the initial values of the new table
  * @return A new hash table containing all of the data from the two passed in
  */
-    axis2_hash_t *axis2_hash_overlay (axis2_environment_t * environment,
+  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_overlay (axis2_environment_t * environment,
                                       const axis2_hash_t * overlay,
                                       const axis2_hash_t * base);
 
@@ -205,7 +205,7 @@
  * @param data Client data to pass to the merger function
  * @return A new hash table containing all of the data from the two passed in
  */
-    axis2_hash_t *axis2_hash_merge (axis2_environment_t * environment,
+  AXIS2_DECLARE(axis2_hash_t*) axis2_hash_merge (axis2_environment_t * environment,
                                     const axis2_hash_t * h1,
                                     const axis2_hash_t * h2,
                                     void *(*merger) (axis2_environment_t *
@@ -216,6 +216,7 @@
                                                      const void *h2_val,
                                                      const void *data),
                                     const void *data);
+
 									
 /**
  * @param environment The environment to use for hash table
@@ -224,9 +225,10 @@
  *
  */
 									
-	axis2_status_t axis2_hash_free(axis2_environment_t *environment,
+AXIS2_DECLARE(axis2_status_t) axis2_hash_free(axis2_environment_t *environment,
 									axis2_hash_t *ht);
 									
+
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_log.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_log.h?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_log.h (original)
+++ webservices/axis2/trunk/c/include/axis2_log.h Wed Oct 26 22:24:52 2005
@@ -63,7 +63,7 @@
         * @param size size of the buffer to be written to log
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-        AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_log_ops_write) (const void *buffer,
size_t count);
+        axis2_status_t (AXIS2_CALL *axis2_log_ops_write) (const void *buffer, size_t count);
     } axis2_log_ops_t;
 
   /** 

Modified: webservices/axis2/trunk/c/include/axis2_qname.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_qname.h?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_qname.h (original)
+++ webservices/axis2/trunk/c/include/axis2_qname.h Wed Oct 26 22:24:52 2005
@@ -43,13 +43,13 @@
  * Encapsulator struct for operations of axis2_qname
  */
                       
-typedef struct axis2_qname_ops
+AXIS2_DECLARE_DATA typedef struct axis2_qname_ops
 {
     /**
      *  Free a qname struct
      *  @return Status code
      */
-    axis2_status_t (*axis2_qname_ops_free) (axis2_environment_t * environment,
+    axis2_status_t (AXIS2_CALL *axis2_qname_ops_free) (axis2_environment_t * environment,
                                             struct axis2_qname * qname);
 
      /** 
@@ -59,7 +59,7 @@
       * @return true if qname1 equals qname2, false otherwise 
       */
 
-    axis2_bool_t (*axis2_qname_ops_equals) (axis2_environment_t * environment,
+    axis2_bool_t (AXIS2_CALL *axis2_qname_ops_equals) (axis2_environment_t * environment,
                                             struct axis2_qname * qname1,
                                             struct axis2_qname * qname2);
 
@@ -93,7 +93,7 @@
  * @return a pointer to newly created qname struct
  */
 
-axis2_qname_t *axis2_qname_create (axis2_environment_t * environment,
+AXIS2_DECLARE(axis2_qname_t *) axis2_qname_create (axis2_environment_t * environment,
                                    const axis2_char_t * localpart,
                                    const axis2_char_t * namespace_uri,
                                    const axis2_char_t * prefix);

Modified: webservices/axis2/trunk/c/include/axis2_stream.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_stream.h?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stream.h Wed Oct 26 22:24:52 2005
@@ -38,7 +38,7 @@
     *
     * Encapsulator struct for operations of axis2_stream
     */
-    typedef struct axis2_stream_ops
+  AXIS2_DECLARE_DATA  typedef struct axis2_stream_ops
     {
       /**
         * reads from stream
@@ -46,7 +46,7 @@
         * @param size size of the buffer
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-        AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_stream_ops_read) (void *buffer
+        axis2_status_t (AXIS2_CALL *axis2_stream_ops_read) (void *buffer
 			, size_t count);
 		/**
         * writes into stream
@@ -54,7 +54,7 @@
         * @param size size of the buffer
         * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
         */
-        AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_stream_ops_write) 
+        axis2_status_t (AXIS2_CALL *axis2_stream_ops_write) 
 			(const void *buffer, size_t count);
 		
 		/**
@@ -63,7 +63,7 @@
 		 * @param options file options given.
 		 * @return status code
 		 */ 
-		AXIS2_DECLARE_DATA void * (AXIS2_CALL  *axis2_stream_ops_file_open)
+		void * (AXIS2_CALL  *axis2_stream_ops_file_open)
 			(const char *file_name, const char *options);
 		
 		/**
@@ -71,14 +71,14 @@
 		 * @param file_ptr file pointer of the file need to be closed
 		 * @return status code
 		 */
-		AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_stream_ops_file_close) 
+		axis2_status_t (AXIS2_CALL *axis2_stream_ops_file_close) 
 				(void *file_ptr);
 		
 		/** reads a once character from a file
 		 * @param file_ptr pointer to the file to be read from
 		 * @return char read
 		 */
-		AXIS2_DECLARE_DATA axis2_char_t (AXIS2_CALL *axis2_stream_ops_file_get_char) 
+		axis2_char_t (AXIS2_CALL *axis2_stream_ops_file_get_char) 
 				(void *file_ptr);
 		
 		/** write a previously read character back to the file stream
@@ -87,7 +87,7 @@
 		 *        and need to be written back to
 		 * @return status code
 		 */
-		AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_stream_ops_file_unget_char) 
+		axis2_status_t (AXIS2_CALL *axis2_stream_ops_file_unget_char) 
 				(const char chr, void *file_ptr);
 				
     } axis2_stream_ops_t;

Modified: webservices/axis2/trunk/c/include/axis2_string.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_string.h?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/include/axis2_string.h Wed Oct 26 22:24:52 2005
@@ -37,21 +37,21 @@
   *
   * Encapsulator for string handling routines
   */
-    typedef struct axis2_string
+   AXIS2_DECLARE_DATA typedef struct axis2_string
     {
       /**
         * duplicates the given string
         * @param ptr string to be duplicated
         * @return pointer to the duplicated string
         */
-        AXIS2_DECLARE_DATA void * (AXIS2_CALL *axis2_string_strdup) (const void *ptr);
+        void * (AXIS2_CALL *axis2_string_strdup) (const void *ptr);
       /**
         * compares the given two strings
         * @param s1 first string to be compared
         * @param s2 second string to be compared
         * @return 0 if the two strings are equal, else non zero
         */
-        AXIS2_DECLARE_DATA int (AXIS2_CALL *axis2_string_strcmp) (const axis2_char_t * s1,
+        int (AXIS2_CALL *axis2_string_strcmp) (const axis2_char_t * s1,
                                     const axis2_char_t * s2);
     } axis2_string_t;
 

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_allocator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_allocator.c?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_allocator.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_allocator.c Wed Oct 26 22:24:52 2005
@@ -17,7 +17,7 @@
 #include <axis2_allocator.h>
 #include <stdlib.h>
 
-axis2_allocator_t *
+AXIS2_DECLARE(axis2_allocator_t *)
 axis2_allocator_init (axis2_allocator_t * allocator)
 {
     if (allocator)

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_environment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_environment.c?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_environment.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_environment.c Wed Oct 26 22:24:52 2005
@@ -16,7 +16,7 @@
 
 #include <axis2_environment.h>
 
-axis2_environment_t *
+AXIS2_DECLARE(axis2_environment_t *)
 axis2_environment_create (axis2_allocator_t * allocator,
                           axis2_error_t * error, axis2_stream_t * stream,
                           axis2_log_t * log, axis2_string_t * string)

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_error.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_error.c?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_error.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_error.c Wed Oct 26 22:24:52 2005
@@ -18,7 +18,7 @@
 
 axis2_char_t * AXIS2_CALL axis2_error_impl_get_message ();
 
-axis2_error_t *
+AXIS2_DECLARE(axis2_error_t*)
 axis2_error_create (axis2_allocator_t * allocator)
 {
     axis2_error_t *error;
@@ -46,7 +46,7 @@
     return error;
 }
 
-axis2_char_t *
+axis2_char_t * AXIS2_CALL
 axis2_error_impl_get_message ()
 {
     /** TODO: Need to fill in the error message list and get the error from that list */

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_file_diff.c Wed Oct 26 22:24:52 2005
@@ -24,6 +24,10 @@
 axis2_status_t axis2_file_diff(axis2_environment_t *env
 		, axis2_char_t* expected_file_name, axis2_char_t* actual_file_name)
 {
+    int ch1, ch2;
+    int j = 0, k = 0;
+   	axis2_char_t *buffer1, *buffer2;
+   	int flag1 = 0, flag2 = 0;
 	expected_file = axis2_stream_file_open (env->stream
 		, expected_file_name, "rt");
 	 
@@ -37,16 +41,14 @@
 		return AXIS2_ERROR_COULD_NOT_OPEN_FILE;
 	}
 	
-   	int ch1, ch2;
-   	axis2_char_t *buffer1, *buffer2;
-   	int flag1 = 0, flag2 = 0;
+   	
    
    	buffer1 = (axis2_char_t*) axis2_malloc(env->allocator, 8096 * sizeof(axis2_char_t));
    	buffer2 = (axis2_char_t*) axis2_malloc(env->allocator, 8096 * sizeof(axis2_char_t));
    	ch1 = axis2_stream_file_get_char (env->stream, expected_file);
    	ch2 = axis2_stream_file_get_char (env->stream, actual_file);
 	
-   	int j = 0, k = 0;
+   	
    	while(1)
    	{
         

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_hash.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_hash.c?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_hash.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_hash.c Wed Oct 26 22:24:52 2005
@@ -86,7 +86,7 @@
                    sizeof (*ht->array) * (max + 1));
 }
 
-axis2_hash_t *
+AXIS2_DECLARE(axis2_hash_t*)
 axis2_hash_make (axis2_environment_t * environment)
 {
     axis2_hash_t *ht;
@@ -100,7 +100,7 @@
     return ht;
 }
 
-axis2_hash_t *
+AXIS2_DECLARE(axis2_hash_t*)
 axis2_hash_make_custom (axis2_environment_t * environment,
                         axis2_hashfunc_t hash_func)
 {
@@ -114,7 +114,7 @@
  * Hash iteration functions.
  */
 
-axis2_hash_index_t *
+AXIS2_DECLARE(axis2_hash_index_t*)
 axis2_hash_next (axis2_environment_t * environment, axis2_hash_index_t * hi)
 {
     hi->this = hi->next;
@@ -132,7 +132,7 @@
     return hi;
 }
 
-axis2_hash_index_t *
+AXIS2_DECLARE(axis2_hash_index_t*)
 axis2_hash_first (axis2_environment_t * environment, axis2_hash_t * ht)
 {
     axis2_hash_index_t *hi;
@@ -148,7 +148,7 @@
     return axis2_hash_next (environment, hi);
 }
 
-void
+AXIS2_DECLARE(void)
 axis2_hash_this (axis2_hash_index_t * hi,
                  const void **key, axis2_ssize_t * klen, void **val)
 {
@@ -295,7 +295,7 @@
     return hep;
 }
 
-axis2_hash_t *
+AXIS2_DECLARE(axis2_hash_t*)
 axis2_hash_copy (axis2_environment_t * environment, const axis2_hash_t * orig)
 {
     axis2_hash_t *ht;
@@ -334,7 +334,7 @@
     return ht;
 }
 
-void *
+AXIS2_DECLARE(void*)
 axis2_hash_get (axis2_hash_t * ht, const void *key, axis2_ssize_t klen)
 {
     axis2_hash_entry_t *he;
@@ -345,7 +345,7 @@
         return NULL;
 }
 
-void
+AXIS2_DECLARE(void)
 axis2_hash_set (axis2_hash_t * ht,
                 const void *key, axis2_ssize_t klen, const void *val)
 {
@@ -382,14 +382,14 @@
     return ht->count;
 }
 
-axis2_hash_t *
+AXIS2_DECLARE(axis2_hash_t*)
 axis2_hash_overlay (axis2_environment_t * environment,
                     const axis2_hash_t * overlay, const axis2_hash_t * base)
 {
     return axis2_hash_merge (environment, overlay, base, NULL, NULL);
 }
 
-axis2_hash_t *
+AXIS2_DECLARE(axis2_hash_t*)
 axis2_hash_merge (axis2_environment_t * environment,
                   const axis2_hash_t * overlay,
                   const axis2_hash_t * base,
@@ -498,7 +498,6 @@
     return res;
 }
 
-
 static void
 axis2_hash_entry_free (axis2_environment_t * environment,
                        axis2_hash_entry_t * hash_entry)
@@ -517,7 +516,7 @@
     return;
 }
 
-axis2_status_t
+AXIS2_DECLARE(axis2_status_t)
 axis2_hash_free (axis2_environment_t * environment, axis2_hash_t * ht)
 {
     if (ht)

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_log.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_log.c?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_log.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_log.c Wed Oct 26 22:24:52 2005
@@ -19,7 +19,7 @@
 
 axis2_status_t AXIS2_CALL axis2_log_impl_write (const void *buffer, size_t count);
 
-axis2_log_t *
+AXIS2_DECLARE(axis2_log_t *)
 axis2_log_create (axis2_allocator_t * allocator, axis2_log_ops_t * operations)
 {
     axis2_log_t *log;
@@ -51,7 +51,7 @@
     return log;
 }
 
-axis2_status_t
+axis2_status_t AXIS2_CALL
 axis2_log_impl_write (const void *buffer, size_t count)
 {
     int i;

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_qname.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_qname.c?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_qname.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_qname.c Wed Oct 26 22:24:52 2005
@@ -24,13 +24,13 @@
 axis2_bool_t AXIS2_CALL  axis2_qname_impl_equals (axis2_environment_t * environment,
                                       axis2_qname_t * qn1,
                                       axis2_qname_t * qn2);
-axis2_qname_t AXIS2_CALL  *axis2_qname_create (axis2_environment_t * environment,
+/*AXIS2_DECLARE(axis2_qname_t*) axis2_qname_create (axis2_environment_t * environment,
                                    const axis2_char_t * localpart,
                                    const axis2_char_t * namespace_uri,
                                    const axis2_char_t * prefix);
+*/
 
-
-axis2_status_t
+axis2_status_t AXIS2_CALL
 axis2_qname_impl_free (axis2_environment_t * environment,
                        axis2_qname_t * qname)
 {
@@ -60,7 +60,7 @@
 
 }
 
-axis2_bool_t
+axis2_bool_t AXIS2_CALL
 axis2_qname_impl_equals (axis2_environment_t * environment,
                          axis2_qname_t * qn1, axis2_qname_t * qn2)
 {
@@ -100,7 +100,7 @@
 }
 
 
-axis2_qname_t *
+AXIS2_DECLARE(axis2_qname_t *)
 axis2_qname_create (axis2_environment_t * environment,
                     const axis2_char_t * localpart,
                     const axis2_char_t * namespace_uri,

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_stream.c?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_stream.c Wed Oct 26 22:24:52 2005
@@ -31,7 +31,7 @@
 
 axis2_status_t AXIS2_CALL axis2_stream_impl_file_unget_char(const char chr, void *file_ptr);
 
-axis2_stream_t *
+AXIS2_DECLARE(axis2_stream_t *)
 axis2_stream_create (axis2_allocator_t * allocator,
                      axis2_stream_t * stream)
 {
@@ -115,7 +115,7 @@
     return NULL;
 }
 
-axis2_status_t
+axis2_status_t AXIS2_CALL
 axis2_stream_impl_read (void *buffer, size_t count)
 {
     int i;
@@ -131,7 +131,7 @@
     return 0;
 }
 
-axis2_status_t
+axis2_status_t AXIS2_CALL
 axis2_stream_impl_write (const void *buffer, size_t count)
 {
     int i;
@@ -145,30 +145,32 @@
     return 0;
 }
 
-void *axis2_stream_impl_file_open(const char *file_name, const char *options)
+void* AXIS2_CALL axis2_stream_impl_file_open(const char *file_name, const char *options)
 {
+    FILE *file_ptr;
+    char *f_opt;
 	char *f_name = (char*) strdup(file_name);
 	if(!f_name) return NULL;
-	char *f_opt = (char*) strdup(options);
+	    f_opt = (char*) strdup(options);
 	if(!f_opt) return NULL;
 	
-	FILE *file_ptr = fopen (f_name, f_opt);
+	file_ptr = fopen (f_name, f_opt);
 	return file_ptr;
 }
 
-axis2_status_t axis2_stream_impl_file_close(void *file_ptr)
+axis2_status_t AXIS2_CALL axis2_stream_impl_file_close(void *file_ptr)
 {
 	if(!file_ptr) return -1;
 	return (axis2_status_t) fclose(file_ptr);
 }
 
-axis2_char_t axis2_stream_impl_file_get_char(void *file_ptr)
+axis2_char_t AXIS2_CALL axis2_stream_impl_file_get_char(void *file_ptr)
 {
 	if(!file_ptr) return -1;
 	return (axis2_char_t) fgetc(file_ptr);
 }
 
-axis2_status_t axis2_stream_impl_file_unget_char(const char chr, void *file_ptr)
+axis2_status_t AXIS2_CALL axis2_stream_impl_file_unget_char(const char chr, void *file_ptr)
 {
 	if(!file_ptr) return -1;
 	return (axis2_status_t) ungetc(chr, file_ptr);

Modified: webservices/axis2/trunk/c/modules/util/src/axis2_string.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_string.c?rev=328792&r1=328791&r2=328792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_string.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_string.c Wed Oct 26 22:24:52 2005
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-void *
+void* AXIS2_CALL
 axis2_string_ops_strdup (const void *ptr)
 {
     if (ptr)
@@ -31,7 +31,7 @@
     }
 }
 
-int
+int AXIS2_CALL
 axis2_string_ops_strcmp (const axis2_char_t * s1, const axis2_char_t * s2)
 {
     if (s1 && s2)
@@ -40,7 +40,7 @@
         return -1;
 }
 
-axis2_string_t *
+AXIS2_DECLARE(axis2_string_t *)
 axis2_string_create (axis2_allocator_t * allocator, axis2_string_t * string)
 {
 	if(string)



Mime
View raw message