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 sa...@apache.org on 2006/06/04 05:09:41 UTC
svn commit: r411506 [19/27] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
guththila/src/ include/ modules/core/...
Modified: webservices/axis2/trunk/c/util/include/axis2_file_diff.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_file_diff.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_file_diff.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_file_diff.h Sat Jun 3 20:09:08 2006
@@ -39,6 +39,6 @@
* @return status code
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_file_diff(const axis2_env_t *env
- , axis2_char_t *expected_file_name, axis2_char_t *actual_file_name);
+ , axis2_char_t *expected_file_name, axis2_char_t *actual_file_name);
#endif /* AXIS2_FILE_DIFF_H */
Modified: webservices/axis2/trunk/c/util/include/axis2_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_generic_obj.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_generic_obj.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_generic_obj.h Sat Jun 3 20:09:08 2006
@@ -83,7 +83,7 @@
*/
AXIS2_DECLARE_DATA struct axis2_generic_obj
{
- axis2_generic_obj_ops_t *ops;
+ axis2_generic_obj_ops_t *ops;
};
/**
@@ -96,19 +96,19 @@
/*************************** Function macros **********************************/
#define AXIS2_GENERIC_OBJ_FREE(generic_obj, env) \
- (((axis2_generic_obj_t *) generic_obj)->ops->free (generic_obj, env))
+ (((axis2_generic_obj_t *) generic_obj)->ops->free (generic_obj, env))
#define AXIS2_GENERIC_OBJ_SET_FREE_FUNC(generic_obj, env, free_func) \
- ((generic_obj)->ops->set_free_func (generic_obj, env, free_func))
+ ((generic_obj)->ops->set_free_func (generic_obj, env, free_func))
#define AXIS2_GENERIC_OBJ_SET_VALUE(generic_obj, env, value) \
- ((generic_obj)->ops->set_value (generic_obj, env, value))
+ ((generic_obj)->ops->set_value (generic_obj, env, value))
#define AXIS2_GENERIC_OBJ_GET_VALUE(generic_obj, env) \
((generic_obj)->ops->get_value(generic_obj, env))
#define AXIS2_GENERIC_OBJ_SET_TYPE(generic_obj, env, type) \
- ((generic_obj)->ops->set_type (generic_obj, env, type))
+ ((generic_obj)->ops->set_type (generic_obj, env, type))
#define AXIS2_GENERIC_OBJ_GET_TYPE(generic_obj, env) \
((generic_obj)->ops->get_type(generic_obj, env))
Modified: webservices/axis2/trunk/c/util/include/axis2_hash.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_hash.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_hash.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_hash.h Sat Jun 3 20:09:08 2006
@@ -85,7 +85,7 @@
* @return The hash table just created
*/
AXIS2_EXTERN axis2_hash_t* AXIS2_CALL axis2_hash_make_custom (const axis2_env_t *env
- , axis2_hashfunc_t hash_func);
+ , axis2_hashfunc_t hash_func);
/**
* Make a copy of a hash table
@@ -95,7 +95,7 @@
* @remark Makes a shallow copy
*/
AXIS2_EXTERN axis2_hash_t* AXIS2_CALL axis2_hash_copy (const axis2_hash_t *ht
- , const axis2_env_t *env);
+ , const axis2_env_t *env);
/**
* Associate a value with a key in a hash table.
@@ -106,7 +106,7 @@
* @remark If the value is NULL the hash entry is deleted.
*/
AXIS2_EXTERN void AXIS2_CALL axis2_hash_set (axis2_hash_t *ht, const void *key
- , axis2_ssize_t klen, const void *val);
+ , axis2_ssize_t klen, const void *val);
/**
* Look up the value associated with a key in a hash table.
@@ -116,7 +116,7 @@
* @return Returns NULL if the key is not present.
*/
AXIS2_EXTERN void* AXIS2_CALL axis2_hash_get (axis2_hash_t *ht, const void *key
- , axis2_ssize_t klen);
+ , axis2_ssize_t klen);
/**
* Start iterating over the entries in a hash table.
@@ -147,7 +147,7 @@
* </PRE>
*/
AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL axis2_hash_first (axis2_hash_t *ht
- ,const axis2_env_t *env);
+ ,const axis2_env_t *env);
/**
* Continue iterating over the entries in a hash table.
@@ -156,7 +156,7 @@
* entries.
*/
AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL axis2_hash_next (const axis2_env_t *env
- , axis2_hash_index_t *hi);
+ , axis2_hash_index_t *hi);
/**
* Get the current entry's details from the iteration state.
@@ -187,7 +187,7 @@
* @return A new hash table containing all of the data from the two passed in
*/
AXIS2_EXTERN axis2_hash_t* AXIS2_CALL axis2_hash_overlay (const axis2_hash_t *overlay
- ,const axis2_env_t *env, const axis2_hash_t *base);
+ ,const axis2_env_t *env, const axis2_hash_t *base);
/**
* Merge two hash tables into one new hash table. If the same key
@@ -204,22 +204,22 @@
* @return A new hash table containing all of the data from the two passed in
*/
AXIS2_EXTERN axis2_hash_t* AXIS2_CALL axis2_hash_merge (const axis2_hash_t *h1
- , const axis2_env_t *env, const axis2_hash_t *h2
+ , const axis2_env_t *env, const axis2_hash_t *h2
, void *(*merger) (const axis2_env_t *env, const void *key
, axis2_ssize_t klen, const void *h1_val, const void *h2_val
, const void *data), const void *data);
-
+
/**
* @param ht hash table to be freed
* @param env The environment to use for hash table
* @return return status code
*
*/
-
+
AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_hash_free(axis2_hash_t *ht
- , const axis2_env_t *env);
-
+ , const axis2_env_t *env);
+
/**
* Free a hash table with hash table given as void
* @param ht hash table to be freed as a void *
Modified: webservices/axis2/trunk/c/util/include/axis2_log.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_log.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_log.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_log.h Sat Jun 3 20:09:08 2006
@@ -25,7 +25,7 @@
#endif
typedef struct axis2_log_ops axis2_log_ops_t;
- typedef struct axis2_log axis2_log_t;
+ typedef struct axis2_log axis2_log_t;
#define AXIS2_LOG_SI __FILE__,__LINE__
@@ -38,18 +38,18 @@
/*TODO:log_xml*/
- /**
- *Examples
- *To write debug information to log
- *AXIS2_LOG_DEBUG(log,AXIS2_LOG_SI,"log this %s %d","test",123);
- *This would log
- *"log this test 123" into the log file
- *
- *similar macros are defined for different log levels: CRITICAL,ERROR,WARNING and INFO
- *
- *CRITICAL and ERROR logs are always written to file and other logs are written
- *depending on the log level set (log->level)
- */
+ /**
+ *Examples
+ *To write debug information to log
+ *AXIS2_LOG_DEBUG(log,AXIS2_LOG_SI,"log this %s %d","test",123);
+ *This would log
+ *"log this test 123" into the log file
+ *
+ *similar macros are defined for different log levels: CRITICAL,ERROR,WARNING and INFO
+ *
+ *CRITICAL and ERROR logs are always written to file and other logs are written
+ *depending on the log level set (log->level)
+ */
/**
* \brief Axis2 log levels
*/
@@ -89,8 +89,8 @@
*/
axis2_status_t (AXIS2_CALL *
- free) (axis2_allocator_t *allocator,
- struct axis2_log *log);
+ free) (axis2_allocator_t *allocator,
+ struct axis2_log *log);
/**
* writes to the log
@@ -99,11 +99,11 @@
* @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- write) (axis2_log_t *log,
- const axis2_char_t *buffer,
- axis2_log_levels_t level,
- const axis2_char_t *file,
- const int line);
+ write) (axis2_log_t *log,
+ const axis2_char_t *buffer,
+ axis2_log_levels_t level,
+ const axis2_char_t *file,
+ const int line);
};
/**
@@ -124,43 +124,43 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_log_impl_log_critical(axis2_log_t *log,
- const axis2_char_t *filename,
- const int linenumber,
- const axis2_char_t *format,...);
+ const axis2_char_t *filename,
+ const int linenumber,
+ const axis2_char_t *format,...);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_log_impl_log_error(axis2_log_t *log,
- const axis2_char_t *filename,
- const int linenumber,
- const axis2_char_t *format,...);
+ const axis2_char_t *filename,
+ const int linenumber,
+ const axis2_char_t *format,...);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_log_impl_log_warning(axis2_log_t *log,
- const axis2_char_t *filename,
- const int linenumber,
- const axis2_char_t *format,...);
+ const axis2_char_t *filename,
+ const int linenumber,
+ const axis2_char_t *format,...);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_log_impl_log_info(axis2_log_t *log,
- const axis2_char_t *format,...);
+ const axis2_char_t *format,...);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_log_impl_log_debug(axis2_log_t *log,
- const axis2_char_t *filename,
- const int linenumber,
- const axis2_char_t *format,...);
+ const axis2_char_t *filename,
+ const int linenumber,
+ const axis2_char_t *format,...);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_log_impl_log_trace(axis2_log_t *log,
const axis2_char_t *filename,
- const int linenumber,
- const axis2_char_t *format,...);
+ const int linenumber,
+ const axis2_char_t *format,...);
#define AXIS2_LOG_FREE(allocator, log) \
- ((log->ops)->free(allocator, log))
+ ((log->ops)->free(allocator, log))
#define AXIS2_LOG_WRITE(log, buffer, level) \
- ((log)->ops->write(log, buffer, level,AXIS2_LOG_SI))
+ ((log)->ops->write(log, buffer, level,AXIS2_LOG_SI))
#define AXIS2_LOG_DEBUG axis2_log_impl_log_debug
#define AXIS2_LOG_INFO axis2_log_impl_log_info
Modified: webservices/axis2/trunk/c/util/include/axis2_network_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_network_handler.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_network_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_network_handler.h Sat Jun 3 20:09:08 2006
@@ -45,8 +45,8 @@
*/
AXIS2_EXTERN axis2_socket_t AXIS2_CALL
axis2_network_handler_open_socket(const axis2_env_t *env,
- char *server,
- int port);
+ char *server,
+ int port);
/**
* creates a server socket for a given port
@@ -55,7 +55,7 @@
*/
AXIS2_EXTERN axis2_socket_t AXIS2_CALL
axis2_network_handler_create_server_socket(const axis2_env_t *env,
- int port);
+ int port);
/**
* closes a socket
@@ -64,7 +64,7 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_network_handler_close_socket (const axis2_env_t *env,
- axis2_socket_t socket);
+ axis2_socket_t socket);
/**
* used to set up socket options such as timeouts, non-blocking ..etc
@@ -75,17 +75,17 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_network_handler_set_sock_option(const axis2_env_t *env,
- axis2_socket_t socket,
- int option,
- int value);
+ axis2_socket_t socket,
+ int option,
+ int value);
/**
* Accepts remote connections for a server socket
* @param socket valid server socket (obtained by socket() or similar call)
* @return created socket to handle the incoming client connection
- */
-AXIS2_EXTERN axis2_socket_t AXIS2_CALL
+ */
+AXIS2_EXTERN axis2_socket_t AXIS2_CALL
axis2_network_handler_svr_socket_accept(const axis2_env_t *env,
- axis2_socket_t socket);
+ axis2_socket_t socket);
/**
* Returns the ip address of the server associated with the socket
@@ -94,7 +94,7 @@
*/
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
axis2_network_handler_get_svr_ip(const axis2_env_t *env,
- axis2_socket_t socket);
+ axis2_socket_t socket);
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/util/include/axis2_param.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param.h Sat Jun 3 20:09:08 2006
@@ -62,25 +62,25 @@
* @return name of the param
*/
axis2_char_t* (AXIS2_CALL *
- get_name)(struct axis2_param *param,
- const axis2_env_t *env);
+ get_name)(struct axis2_param *param,
+ const axis2_env_t *env);
/**
* Parameter value accessor
* @return Object
*/
void* (AXIS2_CALL *
- get_value)(struct axis2_param *param,
- const axis2_env_t *env);
+ get_value)(struct axis2_param *param,
+ const axis2_env_t *env);
/**
* param name mutator
* @param name
*/
axis2_status_t (AXIS2_CALL *
- set_name)(struct axis2_param *param,
- const axis2_env_t *env,
- axis2_char_t *name);
+ set_name)(struct axis2_param *param,
+ const axis2_env_t *env,
+ axis2_char_t *name);
/**
* Method setValue
@@ -88,9 +88,9 @@
* @param value
*/
axis2_status_t (AXIS2_CALL *
- set_value)(struct axis2_param *param,
- const axis2_env_t *env,
- void *value);
+ set_value)(struct axis2_param *param,
+ const axis2_env_t *env,
+ void *value);
/**
* Method isLocked
@@ -98,8 +98,8 @@
* @return boolean
*/
axis2_bool_t (AXIS2_CALL *
- is_locked)(struct axis2_param *param,
- const axis2_env_t *env);
+ is_locked)(struct axis2_param *param,
+ const axis2_env_t *env);
/**
* Method setLocked
@@ -107,9 +107,9 @@
* @param value
*/
axis2_status_t (AXIS2_CALL *
- set_locked)(struct axis2_param *param,
- const axis2_env_t *env,
- axis2_bool_t value);
+ set_locked)(struct axis2_param *param,
+ const axis2_env_t *env,
+ axis2_bool_t value);
/**
* Method getParameterType
@@ -117,17 +117,17 @@
* @return int
*/
int (AXIS2_CALL *
- get_param_type)(struct axis2_param *param,
- const axis2_env_t *env);
+ get_param_type)(struct axis2_param *param,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- set_param_type)(struct axis2_param *param,
- const axis2_env_t *env,
- int type);
+ set_param_type)(struct axis2_param *param,
+ const axis2_env_t *env,
+ int type);
axis2_status_t (AXIS2_CALL *
- free)(struct axis2_param *param,
- const axis2_env_t *env);
+ free)(struct axis2_param *param,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_attributes) (
@@ -161,8 +161,8 @@
*/
typedef struct axis2_param
{
- /** Parameter related ops */
- axis2_param_ops_t *ops;
+ /** Parameter related ops */
+ axis2_param_ops_t *ops;
}axis2_param_t;
/**
@@ -170,8 +170,8 @@
*/
AXIS2_EXTERN axis2_param_t* AXIS2_CALL
axis2_param_create(const axis2_env_t *env,
- axis2_char_t *name,
- void *value);
+ axis2_char_t *name,
+ void *value);
#define AXIS2_PARAM_FREE(param, env) \
((param)->ops->free (param, env))
@@ -205,13 +205,13 @@
#define AXIS2_PARAM_GET_ATTRIBUTES(param, env) \
((param)->ops->get_attributes (param, env))
-
+
#define AXIS2_PARAM_SET_VALUE_LIST(param, env, value_list) \
((param)->ops->set_value_list (param , env, value_list))
#define AXIS2_PARAM_GET_VALUE_LIST(param, env) \
((param)->ops->get_value_list (param, env))
-
+
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/util/include/axis2_param_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param_container.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param_container.h Sat Jun 3 20:09:08 2006
@@ -61,57 +61,57 @@
*/
AXIS2_DECLARE_DATA typedef struct axis2_param_container_ops
{
- /** De-allocate memory
- * @return status code
- */
- axis2_status_t (AXIS2_CALL *
- free)(struct axis2_param_container *param_container,
- const axis2_env_t *env);
+ /** De-allocate memory
+ * @return status code
+ */
+ axis2_status_t (AXIS2_CALL *
+ free)(struct axis2_param_container *param_container,
+ const axis2_env_t *env);
- /** Add a param
+ /** Add a param
* @param param param to be added
* @return status code
*/
- axis2_status_t (AXIS2_CALL *
- add_param)(struct axis2_param_container *param_container,
- const axis2_env_t *env,
- axis2_param_t *param);
+ axis2_status_t (AXIS2_CALL *
+ add_param)(struct axis2_param_container *param_container,
+ const axis2_env_t *env,
+ axis2_param_t *param);
- /** To get a param in a given description
+ /** To get a param in a given description
* @param name param name
* @return param
*/
- axis2_param_t *(AXIS2_CALL *
- get_param) (struct axis2_param_container *param_container,
- const axis2_env_t *env,
- const axis2_char_t *name);
-
-
- /** To get all the params in a given description
- * @return all the params contained
- */
- axis2_array_list_t *(AXIS2_CALL *
- get_params)(struct axis2_param_container *param_container,
- const axis2_env_t *env);
-
- /** To check whether the paramter is locked at any level
- * @param param_name name of the param
- * @return whether param is locked
- */
- axis2_bool_t (AXIS2_CALL *
- is_param_locked)(struct axis2_param_container *param_container,
- const axis2_env_t *env,
- const axis2_char_t *param_name) ;
+ axis2_param_t *(AXIS2_CALL *
+ get_param) (struct axis2_param_container *param_container,
+ const axis2_env_t *env,
+ const axis2_char_t *name);
+
+
+ /** To get all the params in a given description
+ * @return all the params contained
+ */
+ axis2_array_list_t *(AXIS2_CALL *
+ get_params)(struct axis2_param_container *param_container,
+ const axis2_env_t *env);
+
+ /** To check whether the paramter is locked at any level
+ * @param param_name name of the param
+ * @return whether param is locked
+ */
+ axis2_bool_t (AXIS2_CALL *
+ is_param_locked)(struct axis2_param_container *param_container,
+ const axis2_env_t *env,
+ const axis2_char_t *param_name) ;
}axis2_param_container_ops_t;
/**
* @brief Param container struct
- * Container for params
+ * Container for params
*/
AXIS2_DECLARE_DATA typedef struct axis2_param_container
{
- axis2_param_container_ops_t *ops;
+ axis2_param_container_ops_t *ops;
}axis2_param_container_t;
/**
@@ -133,20 +133,20 @@
/*************************** Function macros **********************************/
#define AXIS2_PARAM_CONTAINER_FREE(param_container, env) \
- ((param_container)->ops->free (param_container, env))
+ ((param_container)->ops->free (param_container, env))
#define AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container, env, param) \
- ((param_container)->ops->add_param (param_container, env, param))
+ ((param_container)->ops->add_param (param_container, env, param))
#define AXIS2_PARAM_CONTAINER_GET_PARAM(param_container, env, name) \
- ((param_container)->ops->get_param (param_container, env, name))
+ ((param_container)->ops->get_param (param_container, env, name))
#define AXIS2_PARAM_CONTAINER_GET_PARAMS(param_container, env) \
- ((param_container)->ops->get_params (param_container, env))
+ ((param_container)->ops->get_params (param_container, env))
#define AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(param_container, env, param_name) \
- ((param_container)->ops->is_param_locked (param_container, env, \
- param_name))
+ ((param_container)->ops->is_param_locked (param_container, env, \
+ param_name))
/*************************** End of function macros ***************************/
Modified: webservices/axis2/trunk/c/util/include/axis2_property.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_property.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_property.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_property.h Sat Jun 3 20:09:08 2006
@@ -74,7 +74,7 @@
*/
AXIS2_DECLARE_DATA struct axis2_property
{
- axis2_property_ops_t *ops;
+ axis2_property_ops_t *ops;
};
/**
@@ -87,16 +87,16 @@
/*************************** Function macros **********************************/
#define AXIS2_PROPERTY_FREE(property, env) \
- ((property)->ops->free (property, env))
+ ((property)->ops->free (property, env))
#define AXIS2_PROPERTY_SET_FREE_FUNC(property, env, free_func) \
- ((property)->ops->set_free_func (property, env, free_func))
+ ((property)->ops->set_free_func (property, env, free_func))
#define AXIS2_PROPERTY_SET_SCOPE(property, env, scope) \
- ((property)->ops->set_scope (property, env, scope))
+ ((property)->ops->set_scope (property, env, scope))
#define AXIS2_PROPERTY_SET_VALUE(property, env, value) \
- ((property)->ops->set_value (property, env, value))
+ ((property)->ops->set_value (property, env, value))
#define AXIS2_PROPERTY_GET_VALUE(property, env) \
((property)->ops->get_value(property, env))
Modified: webservices/axis2/trunk/c/util/include/axis2_qname.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_qname.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_qname.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_qname.h Sat Jun 3 20:09:08 2006
@@ -57,7 +57,7 @@
* @return Status code
*/
axis2_status_t (AXIS2_CALL *
- free) (struct axis2_qname * qname,
+ free) (struct axis2_qname * qname,
const axis2_env_t *env);
/**
@@ -68,7 +68,7 @@
*/
axis2_bool_t (AXIS2_CALL *
- equals) (struct axis2_qname * qname,
+ equals) (struct axis2_qname * qname,
const axis2_env_t *env,
struct axis2_qname * qname1);
/**
@@ -79,19 +79,19 @@
*/
struct axis2_qname* (AXIS2_CALL *
- clone)(struct axis2_qname *qname,
+ clone)(struct axis2_qname *qname,
const axis2_env_t *env);
axis2_char_t* (AXIS2_CALL *
- get_uri)(struct axis2_qname *qname,
+ get_uri)(struct axis2_qname *qname,
const axis2_env_t *env);
axis2_char_t* (AXIS2_CALL *
- get_prefix)(struct axis2_qname *qname,
+ get_prefix)(struct axis2_qname *qname,
const axis2_env_t *env);
axis2_char_t* (AXIS2_CALL *
- get_localpart)(struct axis2_qname *qname,
+ get_localpart)(struct axis2_qname *qname,
const axis2_env_t *env);
/**
@@ -101,7 +101,7 @@
* The returned char* is freed when qname free function is called.
*/
axis2_char_t* (AXIS2_CALL *
- to_string)(struct axis2_qname *qname,
+ to_string)(struct axis2_qname *qname,
const axis2_env_t *env);
@@ -115,7 +115,7 @@
} axis2_qname_t;
/**
- * creates a qname struct
+ * creates a qname struct
* returns a pointer to a qname struct
* @localpart mandatory
* @prefix mandatory
@@ -143,7 +143,7 @@
AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
axis2_qname_create_from_string(const axis2_env_t *env,
const axis2_char_t *string);
-
+
#define AXIS2_QNAME_FREE(qname, env) \
((qname)->ops->free(qname,env))
Modified: webservices/axis2/trunk/c/util/include/axis2_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_stream.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_stream.h Sat Jun 3 20:09:08 2006
@@ -45,9 +45,9 @@
*/
enum axis2_stream_type
{
- AXIS2_STREAM_BASIC = 0,
- AXIS2_STREAM_FILE,
- AXIS2_STREAM_SOCKET,
+ AXIS2_STREAM_BASIC = 0,
+ AXIS2_STREAM_FILE,
+ AXIS2_STREAM_SOCKET,
AXIS2_STREAM_MANAGED /* Example Wrapper stream for Apache2 read mechanism */
};
@@ -61,88 +61,88 @@
AXIS2_DECLARE_DATA struct axis2_stream_ops
{
- /**
- * Deletes the stream
- * @return axis2_status_t AXIS2_SUCCESS on success else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(axis2_stream_t *stream,
- const axis2_env_t *env);
-
+ /**
+ * Deletes the stream
+ * @return axis2_status_t AXIS2_SUCCESS on success else AXIS2_FAILURE
+ */
+ axis2_status_t (AXIS2_CALL *
+ free)(axis2_stream_t *stream,
+ const axis2_env_t *env);
+
axis2_status_t (AXIS2_CALL *
free_void_arg) (void *stream,
- const axis2_env_t *env);
+ const axis2_env_t *env);
- /**
- * reads from stream
- * @param buffer buffer into which the content is to be read
- * @param count size of the buffer
- * @return no: of bytes read
- */
+ /**
+ * reads from stream
+ * @param buffer buffer into which the content is to be read
+ * @param count size of the buffer
+ * @return no: of bytes read
+ */
+
+ int (AXIS2_CALL *
+ read) (axis2_stream_t *stream,
+ const axis2_env_t *env,
+ void *buffer,
+ size_t count);
+ /**
+ * writes into stream
+ * @param buffer buffer to be written
+ * @param count size of the buffer
+ * @return no: of bytes actually written
+ */
+ int (AXIS2_CALL *
+ write) (axis2_stream_t *stream,
+ const axis2_env_t *env,
+ const void *buffer,
+ size_t count);
+ /**
+ * Skips over and discards n bytes of data from this input stream.
+ * @param count number of bytes to be discarded
+ * @return no: of bytes actually skipped
+ */
+ int (AXIS2_CALL *
+ skip) (axis2_stream_t *stream,
+ const axis2_env_t *env,
+ int count);
+
+ /**
+ * Reads the next character from stream and returns it as an unsigned char
+ * cast to an int, or EOF on end of file or error.
+ * @return next character in the stream
+ */
+ int (AXIS2_CALL *
+ get_char) (axis2_stream_t *stream,
+ const axis2_env_t *env);
+
+ /**
+ * Pushes a character back to stream, cast to unsigned char, where it is
+ * available for subsequent read operations
+ * @param charachter to be pushed
+ * @return the pushed character or EOF if an error
+ */
+ int (AXIS2_CALL *
+ unget_char) (axis2_stream_t *stream,
+ const axis2_env_t *env,
+ int ch);
+
+ /**
+ * Returns the length of the stream (applicable only to basic stream)
+ * @return Length of the buffer if its type is basic, else -1
+ * (we can't define a length of a stream unless it is just a buffer)
+ */
+ int (AXIS2_CALL *
+ get_len) (axis2_stream_t *stream,
+ const axis2_env_t *env);
+
+ /**
+ * Returns the type of the stream as axis2_stream_type_t
+ * @return Type of the stream
+ */
+ axis2_stream_type_t (AXIS2_CALL *
+ get_type) (axis2_stream_t *stream,
+ const axis2_env_t *env);
- int (AXIS2_CALL *
- read) (axis2_stream_t *stream,
- const axis2_env_t *env,
- void *buffer,
- size_t count);
- /**
- * writes into stream
- * @param buffer buffer to be written
- * @param count size of the buffer
- * @return no: of bytes actually written
- */
- int (AXIS2_CALL *
- write) (axis2_stream_t *stream,
- const axis2_env_t *env,
- const void *buffer,
- size_t count);
- /**
- * Skips over and discards n bytes of data from this input stream.
- * @param count number of bytes to be discarded
- * @return no: of bytes actually skipped
- */
- int (AXIS2_CALL *
- skip) (axis2_stream_t *stream,
- const axis2_env_t *env,
- int count);
-
- /**
- * Reads the next character from stream and returns it as an unsigned char
- * cast to an int, or EOF on end of file or error.
- * @return next character in the stream
- */
- int (AXIS2_CALL *
- get_char) (axis2_stream_t *stream,
- const axis2_env_t *env);
-
- /**
- * Pushes a character back to stream, cast to unsigned char, where it is
- * available for subsequent read operations
- * @param charachter to be pushed
- * @return the pushed character or EOF if an error
- */
- int (AXIS2_CALL *
- unget_char) (axis2_stream_t *stream,
- const axis2_env_t *env,
- int ch);
-
- /**
- * Returns the length of the stream (applicable only to basic stream)
- * @return Length of the buffer if its type is basic, else -1
- * (we can't define a length of a stream unless it is just a buffer)
- */
- int (AXIS2_CALL *
- get_len) (axis2_stream_t *stream,
- const axis2_env_t *env);
-
- /**
- * Returns the type of the stream as axis2_stream_type_t
- * @return Type of the stream
- */
- axis2_stream_type_t (AXIS2_CALL *
- get_type) (axis2_stream_t *stream,
- const axis2_env_t *env);
-
};
/**
@@ -152,8 +152,8 @@
*/
AXIS2_DECLARE_DATA struct axis2_stream
{
- /** Stream related ops */
- axis2_stream_ops_t *ops;
+ /** Stream related ops */
+ axis2_stream_ops_t *ops;
/** Stream End of File */
int axis2_eof;
};
@@ -192,23 +192,23 @@
((stream->ops)->free_void_arg(stream, env))
#define AXIS2_STREAM_READ(stream, env, buffer, count) \
- ((stream)->ops->read(stream, env, buffer, count))
-
+ ((stream)->ops->read(stream, env, buffer, count))
+
#define AXIS2_STREAM_WRITE(stream, env, buffer, count) \
- ((stream)->ops->write(stream, env, buffer, count))
-
+ ((stream)->ops->write(stream, env, buffer, count))
+
#define AXIS2_STREAM_SKIP(stream, env, count) \
- ((stream)->ops->write(stream, env, count))
-
+ ((stream)->ops->write(stream, env, count))
+
#define AXIS2_STREAM_GET_CHAR(stream, env) \
- ((stream)->ops->get_char(stream, env))
-
+ ((stream)->ops->get_char(stream, env))
+
#define AXIS2_STREAM_UNGET_CHAR(stream, env, ch) \
- ((stream)->ops->unget_char(stream, env, ch))
+ ((stream)->ops->unget_char(stream, env, ch))
#define AXIS2_STREAM_BASIC_GET_LEN(stream, env) \
- ((stream)->ops->get_len(stream, env))
-
+ ((stream)->ops->get_len(stream, env))
+
#define AXIS2_STREAM_GET_TYPE(stream, env)\
((stream)->ops->get_type(stream, env))
/** @} */
Modified: webservices/axis2/trunk/c/util/include/axis2_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_thread.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_thread.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_thread.h Sat Jun 3 20:09:08 2006
@@ -38,13 +38,13 @@
* @ingroup axis2_utils
* @{
*/
-
+
/**
* Thread callbacks from axis2 functions must be declared with AXIS2_THREAD_FUNC
* so that they follow the platform's calling convention.
*/
/*#define AXIS2_THREAD_FUNC*/
-
+
/** Thread structure. */
typedef struct axis2_thread_t axis2_thread_t;
Modified: webservices/axis2/trunk/c/util/include/axis2_thread_pool.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_thread_pool.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_thread_pool.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_thread_pool.h Sat Jun 3 20:09:08 2006
@@ -49,45 +49,45 @@
AXIS2_DECLARE_DATA struct axis2_thread_pool_ops
{
/**
- * Retrives a thread from the thread pool
- * @param func function to be executed in the new thread
- * @param data arguments to be passed to the function
- * @return pointer to a thread in ready state.
- */
- axis2_thread_t * (AXIS2_CALL *
- get_thread) (axis2_thread_pool_t *pool,
- axis2_thread_start_t func,
- void *data);
+ * Retrives a thread from the thread pool
+ * @param func function to be executed in the new thread
+ * @param data arguments to be passed to the function
+ * @return pointer to a thread in ready state.
+ */
+ axis2_thread_t * (AXIS2_CALL *
+ get_thread) (axis2_thread_pool_t *pool,
+ axis2_thread_start_t func,
+ void *data);
/**
- * Blocks until the desired thread stops executing.
- * @param thd The thread to joined
- * @return status of the operation
- */
- axis2_status_t (AXIS2_CALL *
- join_thread) (axis2_thread_pool_t *pool,
- axis2_thread_t *thd);
+ * Blocks until the desired thread stops executing.
+ * @param thd The thread to joined
+ * @return status of the operation
+ */
+ axis2_status_t (AXIS2_CALL *
+ join_thread) (axis2_thread_pool_t *pool,
+ axis2_thread_t *thd);
/**
- * Stop the execution of current thread
- * @param thd thread to be stopped
- * @return status of the operation
- */
- axis2_status_t (AXIS2_CALL *
- exit_thread) (axis2_thread_pool_t *pool,
- axis2_thread_t *thd);
+ * Stop the execution of current thread
+ * @param thd thread to be stopped
+ * @return status of the operation
+ */
+ axis2_status_t (AXIS2_CALL *
+ exit_thread) (axis2_thread_pool_t *pool,
+ axis2_thread_t *thd);
/**
- * Detaches a thread
- * @param thd thread to be detached
- * @return status of the operation
- */
- axis2_status_t (AXIS2_CALL *
- thread_detach) (axis2_thread_pool_t *pool,
- axis2_thread_t *thd);
+ * Detaches a thread
+ * @param thd thread to be detached
+ * @return status of the operation
+ */
+ axis2_status_t (AXIS2_CALL *
+ thread_detach) (axis2_thread_pool_t *pool,
+ axis2_thread_t *thd);
/**
- * Frees resources used by thread_pool
- * @param pool thread_pool to be freed
- */
- axis2_status_t (AXIS2_CALL *
- free) (axis2_thread_pool_t *pool);
+ * Frees resources used by thread_pool
+ * @param pool thread_pool to be freed
+ */
+ axis2_status_t (AXIS2_CALL *
+ free) (axis2_thread_pool_t *pool);
};
/**
@@ -96,7 +96,7 @@
*/
AXIS2_DECLARE_DATA struct axis2_thread_pool
{
- axis2_thread_pool_ops_t *ops;
+ axis2_thread_pool_ops_t *ops;
};
/**
* Initializes (creates) an thread_pool.
@@ -104,7 +104,7 @@
* @return initialized thread_pool. NULL on error.
*/
AXIS2_EXTERN axis2_thread_pool_t * AXIS2_CALL axis2_thread_pool_init(
- axis2_allocator_t *allocator);
+ axis2_allocator_t *allocator);
/**
* This function can be used to initialize the environment in case of
@@ -114,19 +114,19 @@
axis2_init_thread_env(const struct axis2_env *system_env);
#define AXIS2_THREAD_POOL_GET_THREAD(thread_pool, func, data) \
- ((thread_pool)->ops->get_thread(thread_pool, func, data))
+ ((thread_pool)->ops->get_thread(thread_pool, func, data))
#define AXIS2_THREAD_POOL_JOIN_THREAD(thread_pool, thd) \
- ((thread_pool)->ops->join_thread(thread_pool, thd))
+ ((thread_pool)->ops->join_thread(thread_pool, thd))
#define AXIS2_THREAD_POOL_EXIT_THREAD(thread_pool, thd) \
- ((thread_pool)->ops->exit_thread(thread_pool, thd))
+ ((thread_pool)->ops->exit_thread(thread_pool, thd))
#define AXIS2_THREAD_POOL_THREAD_DETACH(thread_pool, thd) \
- ((thread_pool)->ops->thread_detach(thread_pool, thd))
+ ((thread_pool)->ops->thread_detach(thread_pool, thd))
#define AXIS2_THREAD_POOL_FREE(thread_pool) \
- ((thread_pool)->ops->free(thread_pool))
+ ((thread_pool)->ops->free(thread_pool))
/** @} */
Modified: webservices/axis2/trunk/c/util/include/axis2_url.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_url.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_url.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_url.h Sat Jun 3 20:09:08 2006
@@ -48,49 +48,49 @@
AXIS2_DECLARE_DATA struct axis2_url_ops
{
axis2_char_t* (AXIS2_CALL *
- to_external_form) (axis2_url_t *url,
+ to_external_form) (axis2_url_t *url,
const axis2_env_t *env);
-
+
axis2_status_t (AXIS2_CALL *
- set_protocol)(axis2_url_t *url,
+ set_protocol)(axis2_url_t *url,
const axis2_env_t *env,
- axis2_char_t *protocol);
-
-
- axis2_char_t* (AXIS2_CALL *
- get_protocol) (axis2_url_t *url,
+ axis2_char_t *protocol);
+
+
+ axis2_char_t* (AXIS2_CALL *
+ get_protocol) (axis2_url_t *url,
const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_server)(axis2_url_t *url,
+
+ axis2_status_t (AXIS2_CALL *
+ set_server)(axis2_url_t *url,
const axis2_env_t *env,
- axis2_char_t *server);
-
-
+ axis2_char_t *server);
+
+
axis2_char_t* (AXIS2_CALL *
- get_server)(axis2_url_t *url,
+ get_server)(axis2_url_t *url,
const axis2_env_t *env);
-
-
- axis2_status_t (AXIS2_CALL *
- set_port)(axis2_url_t *url,
+
+
+ axis2_status_t (AXIS2_CALL *
+ set_port)(axis2_url_t *url,
const axis2_env_t *env,
- int port);
-
-
+ int port);
+
+
int (AXIS2_CALL *
- get_port) (axis2_url_t *url,
+ get_port) (axis2_url_t *url,
const axis2_env_t *env);
-
-
- axis2_status_t (AXIS2_CALL *
- set_path)(axis2_url_t *url,
+
+
+ axis2_status_t (AXIS2_CALL *
+ set_path)(axis2_url_t *url,
const axis2_env_t *env,
- axis2_char_t *path);
-
-
- axis2_char_t* (AXIS2_CALL *
- get_path)(axis2_url_t *url,
+ axis2_char_t *path);
+
+
+ axis2_char_t* (AXIS2_CALL *
+ get_path)(axis2_url_t *url,
const axis2_env_t *env);
axis2_url_t* (AXIS2_CALL *
@@ -99,7 +99,7 @@
const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- free) (axis2_url_t *url,
+ free) (axis2_url_t *url,
const axis2_env_t *env);
};
@@ -115,8 +115,8 @@
AXIS2_EXTERN axis2_url_t * AXIS2_CALL
axis2_url_create (const axis2_env_t *env,
- axis2_char_t *protocol,
- axis2_char_t *server,
+ axis2_char_t *protocol,
+ axis2_char_t *server,
int port,
axis2_char_t *path);
@@ -127,37 +127,37 @@
/************************** Start of function macros **************************/
#define AXIS2_URL_TO_EXTERNAL_FORM(url, env) \
- ((url)->ops->to_external_form(url, env))
+ ((url)->ops->to_external_form(url, env))
#define AXIS2_URL_SET_PROTOCOL(url, env, protocol) \
((url)->ops->set_prtocol(url, env, protocol))
-
+
#define AXIS2_URL_GET_PROTOCOL(url, env) \
- ((url)->ops->get_protocol(url, env))
-
+ ((url)->ops->get_protocol(url, env))
+
#define AXIS2_URL_SET_SERVER(url, env, server) \
((url)->ops->set_server(url, env, server))
-
+
#define AXIS2_URL_GET_SERVER(url, env) \
- ((url)->ops->get_server(url, env))
-
+ ((url)->ops->get_server(url, env))
+
#define AXIS2_URL_SET_PORT(url, env, port) \
- ((url)->ops->set_port(url, env, port))
-
+ ((url)->ops->set_port(url, env, port))
+
#define AXIS2_URL_GET_PORT(url, env) \
- ((url)->ops->get_port(url, env))
-
+ ((url)->ops->get_port(url, env))
+
#define AXIS2_URL_SET_PATH(url, env, path) \
((url)->ops->set_path(url, env, path))
-
+
#define AXIS2_URL_GET_PATH(url, env) \
- ((url)->ops->get_path(url, env))
-
+ ((url)->ops->get_path(url, env))
+
#define AXIS2_URL_CLONE(url, env) \
- ((url)->ops->clone(url, env))
-
+ ((url)->ops->clone(url, env))
+
#define AXIS2_URL_FREE(url, env) \
- ((url)->ops->free(url, env))
+ ((url)->ops->free(url, env))
/************************** End of function macros ****************************/
Modified: webservices/axis2/trunk/c/util/include/axis2_utils_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_utils_defines.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_utils_defines.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_utils_defines.h Sat Jun 3 20:09:08 2006
@@ -41,7 +41,7 @@
*/
#define AXIS2_EOLN '\0'
-
+
/**
* Boolean values
*/
@@ -50,7 +50,7 @@
/**
- * Exporting
+ * Exporting
*/
#if defined(WIN32)
#define AXIS2_EXPORT __declspec(dllexport)
@@ -59,7 +59,7 @@
#endif
/**
- * Importing
+ * Importing
*/
#if defined(WIN32)
#define AXIS2_IMPORT __declspec(dllimport)
@@ -68,7 +68,7 @@
#endif
/**
- * Calling Conventions
+ * Calling Conventions
*/
#if defined(__GNUC__)
#if defined(__i386)
@@ -162,7 +162,7 @@
typedef enum _axis2_xml_parser_type
{
AXIS2_XML_PARSER_TYPE_BUFFER = 1,
- AXIS2_XML_PARSER_TYPE_FILE,
+ AXIS2_XML_PARSER_TYPE_FILE,
AXIS2_XML_PARSER_TYPE_DOC
} axis2_xml_parser_type;
Modified: webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h Sat Jun 3 20:09:08 2006
@@ -34,7 +34,7 @@
* @ingroup axis2_util
* @{
*/
-
+
/**
* generate a uuid
* @return generated uuid as a string
Modified: webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h Sat Jun 3 20:09:08 2006
@@ -34,10 +34,10 @@
*/
#if defined( WIN32 )
- #include "windows/axis2_windows.h"
- #include "windows/axis2_dir_windows.h"
- #include "windows/axis2_uuid_gen_windows.h"
- #include "windows/axis2_getopt_windows.h"
+ #include "windows/axis2_windows.h"
+ #include "windows/axis2_dir_windows.h"
+ #include "windows/axis2_uuid_gen_windows.h"
+ #include "windows/axis2_getopt_windows.h"
#elif defined ( __OS400__ )
#include <os400/axis2_os400.h>
#elif defined ( AIX )
Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h Sat Jun 3 20:09:08 2006
@@ -48,7 +48,7 @@
#define AXIS2_PLATFORM_LOG_PATH "/usr/local/axis2/log/axis2_log"
#define AXIS2_PLATFORM_CLIENTLOG_PATH "/usr/local/axis2/log/axis2_client_log"
#define AXIS2_PLATFORM_CONFIG_PATH "/etc/axiscpp.conf"
-#define AXIS2_PLATFORM_SECUREINFO ""
+#define AXIS2_PLATFORM_SECUREINFO ""
/**
* Resource that contains the configuration
*/
@@ -237,7 +237,7 @@
/** minizip functions */
#define axis2_fill_win32_filefunc(ffunc) NULL
-#define AXIS2_UNZOPEN2(zipfilename,ffunc) unzOpen2(zipfilename,NULL)
+#define AXIS2_UNZOPEN2(zipfilename,ffunc) unzOpen2(zipfilename,NULL)
/**
* handling variable number of arguments (for log.c)
Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axis2_uuid_gen_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axis2_uuid_gen_unix.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axis2_uuid_gen_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axis2_uuid_gen_unix.h Sat Jun 3 20:09:08 2006
@@ -38,11 +38,11 @@
struct axis2_uuid {
- unsigned int time_low;
- unsigned short int time_mid;
- unsigned short int time_high_version;
- short int clock_variant;
- unsigned char mac_addr[6];
+ unsigned int time_low;
+ unsigned short int time_mid;
+ unsigned short int time_high_version;
+ short int clock_variant;
+ unsigned char mac_addr[6];
};
/* bits 0-59 time field
@@ -52,7 +52,7 @@
* bits 80-107 node MAC address
*/
struct axis2_uuid_st {
- unsigned char mac[6]; /* pre-determined MAC address */
+ unsigned char mac[6]; /* pre-determined MAC address */
struct timeval time_last; /* last retrieved timestamp */
unsigned long time_seq; /* last timestamp sequence counter */
short int clock; /* clock tick - incremented random number */
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h Sat Jun 3 20:09:08 2006
@@ -28,23 +28,23 @@
/* struct dirent - same as Unix dirent.h */
AXIS2_DECLARE_DATA struct dirent
{
- long d_ino; /* inode number (always 1 in WIN32) */
- off_t d_off; /* offset to this dirent */
- unsigned short d_reclen; /* length of d_name */
- char d_name[_MAX_FNAME + 1]; /* filename (null terminated) */
- /*unsigned char d_type;*/ /*type of file*/
+ long d_ino; /* inode number (always 1 in WIN32) */
+ off_t d_off; /* offset to this dirent */
+ unsigned short d_reclen; /* length of d_name */
+ char d_name[_MAX_FNAME + 1]; /* filename (null terminated) */
+ /*unsigned char d_type;*/ /*type of file*/
};
/* def struct DIR - different from Unix DIR */
AXIS2_DECLARE_DATA typedef struct
{
- long handle; /* _findfirst/_findnext handle */
- short offset; /* offset into directory */
- short finished; /* 1 if there are not more files */
- struct _finddata_t fileinfo; /* from _findfirst/_findnext */
- char *dirname; /* the dir we are reading */
- struct dirent dent; /* the dirent to return */
+ long handle; /* _findfirst/_findnext handle */
+ short offset; /* offset into directory */
+ short finished; /* 1 if there are not more files */
+ struct _finddata_t fileinfo; /* from _findfirst/_findnext */
+ char *dirname; /* the dir we are reading */
+ struct dirent dent; /* the dirent to return */
} DIR;
/* Function prototypes */
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h Sat Jun 3 20:09:08 2006
@@ -7,7 +7,7 @@
* @brief windows cutdown version of getopt function in unix
*/
-#ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
#endif
@@ -16,9 +16,9 @@
* @{
*/
-AXIS2_DECLARE_DATA int opterr;
-AXIS2_DECLARE_DATA int optopt;
-AXIS2_DECLARE_DATA char *optarg;
+AXIS2_DECLARE_DATA int opterr;
+AXIS2_DECLARE_DATA int optopt;
+AXIS2_DECLARE_DATA char *optarg;
/**
* return and log error
@@ -41,7 +41,7 @@
/** @} */
-#ifdef __cplusplus
+#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h Sat Jun 3 20:09:08 2006
@@ -29,7 +29,7 @@
struct axis2_thread_t
{
- HANDLE *td;
+ HANDLE *td;
void *data;
axis2_thread_start_t func;
};
@@ -42,12 +42,12 @@
struct axis2_threadkey_t
{
- DWORD key;
+ DWORD key;
};
struct axis2_thread_once_t
{
- long value;
+ long value;
};
#endif /* AXIS2_THREAD_WINDOWS_H */
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h Sat Jun 3 20:09:08 2006
@@ -36,8 +36,8 @@
/*enum platform_error_codes
{
- PLATFORM_ERROR_UUID_NO_ADDRESS = 0,
- PLATFORM_ERROR_OUT_OF_MEMORY = 1
+ PLATFORM_ERROR_UUID_NO_ADDRESS = 0,
+ PLATFORM_ERROR_OUT_OF_MEMORY = 1
};*/
#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
@@ -76,7 +76,7 @@
#define AXIS2_PLATFORM_LOG_PATH "" /*/usr/local/axis2/log/axis2_log*/
#define AXIS2_PLATFORM_CLIENTLOG_PATH "" /* /usr/local/axis2/log/axis2_client_log*/
#define AXIS2_PLATFORM_CONFIG_PATH "" /* /etc/axiscpp.conf */
-#define AXIS2_PLATFORM_SECUREINFO ""
+#define AXIS2_PLATFORM_SECUREINFO ""
/**
* Resource that contains the configuration
@@ -180,25 +180,25 @@
/**
* windows specific directory handling functions
*/
-#define AXIS2_SCANDIR scandir
-#define AXIS2_ALPHASORT alphasort
-#define AXIS2_OPENDIR opendir
-#define AXIS2_CLOSEDIR closedir
-#define AXIS2_READDIR readdir
-#define AXIS2_READDIR_R readdir_r
-#define AXIS2_REWINDDIR rewinddir
+#define AXIS2_SCANDIR scandir
+#define AXIS2_ALPHASORT alphasort
+#define AXIS2_OPENDIR opendir
+#define AXIS2_CLOSEDIR closedir
+#define AXIS2_READDIR readdir
+#define AXIS2_READDIR_R readdir_r
+#define AXIS2_REWINDDIR rewinddir
/**
* network specific functions and defs
*/
-#define axis2_socket_t SOCKET
+#define axis2_socket_t SOCKET
-#define AXIS2_INVALID_SOCKET INVALID_SOCKET
-#define AXIS2_INADDR_NONE INADDR_NONE
-#define axis2_unsigned_short_t u_short
-#define AXIS2_CLOSE_SOCKET(sock) closesocket(sock)
-#define AXIS2_CLOSE_SOCKET_ON_EXIT(sock)
-#define axis2_socket_len_t int
+#define AXIS2_INVALID_SOCKET INVALID_SOCKET
+#define AXIS2_INADDR_NONE INADDR_NONE
+#define axis2_unsigned_short_t u_short
+#define AXIS2_CLOSE_SOCKET(sock) closesocket(sock)
+#define AXIS2_CLOSE_SOCKET_ON_EXIT(sock)
+#define axis2_socket_len_t int
#define AXIS2_SHUT_WR SD_SEND
/**
Modified: webservices/axis2/trunk/c/util/src/array_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/array_list.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/array_list.c (original)
+++ webservices/axis2/trunk/c/util/src/array_list.c Sat Jun 3 20:09:08 2006
@@ -20,7 +20,7 @@
typedef struct axis2_array_list_impl
{
/** handler description */
- axis2_array_list_t array_list;
+ axis2_array_list_t array_list;
/**The number of elements in this list. */
int size;
/**Current capacity of this list. */
@@ -121,7 +121,7 @@
array_list_impl->size = 0;
array_list_impl->capacity = 0;
array_list_impl->data = NULL;
-
+
/* Check capacity, and set the default if error */
if (capacity <= 0)
capacity = AXIS2_ARRAY_LIST_DEFAULT_CAPACITY;
Modified: webservices/axis2/trunk/c/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Sat Jun 3 20:09:08 2006
@@ -40,25 +40,25 @@
{
axis2_array_list_t *file_list = NULL;
struct stat *buf = NULL;
- int count = 1;
+ int count = 1;
int i = 0;
- struct dirent **files = NULL;
- int file_select();
+ struct dirent **files = NULL;
+ int file_select();
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
file_list = axis2_array_list_create(env, 100);
- count = AXIS2_SCANDIR(pathname, &files, file_select, AXIS2_ALPHASORT);
- /* If no files found, make a non-selectable menu item */
- if (count <= 0)
- {
+ count = AXIS2_SCANDIR(pathname, &files, file_select, AXIS2_ALPHASORT);
+ /* If no files found, make a non-selectable menu item */
+ if (count <= 0)
+ {
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "No files in the path %s.", pathname);
- return NULL;
- }
+ return NULL;
+ }
- for (i = 1; i < (count + 1) ; ++i )
+ for (i = 1; i < (count + 1) ; ++i )
{
axis2_char_t *fname = NULL;
axis2_file_t *arch_file = NULL;
@@ -192,9 +192,9 @@
struct stat *buf = NULL;
int count = 1;
int i = 0;
- struct dirent **files = NULL;
- char cwd[500];
-
+ struct dirent **files = NULL;
+ char cwd[500];
+
/**FIXME:
* This magic number 500 was selected as a temperary solution. It has to be
* replaced with dinamic memory allocation. This will be done once the use of
@@ -203,28 +203,28 @@
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
- /*if ((handle = opendir(pathname)) != NULL && (handle->finished == 1))
- {
- printf("Path Name does not exist:%s\n",pathname);
- return NULL;
- }*/
+ /*if ((handle = opendir(pathname)) != NULL && (handle->finished == 1))
+ {
+ printf("Path Name does not exist:%s\n",pathname);
+ return NULL;
+ }*/
file_list = axis2_array_list_create(env, 0);
- if (!getcwd(cwd, 500)) exit(1);
- chdir(pathname);
- axis2_archive_extract();
-
- count = AXIS2_SCANDIR(pathname, &files, dir_select, AXIS2_ALPHASORT);
- chdir(cwd);
-
- /* If no files found, make a non-selectable menu item */
- if (count <= 0)
- {
+ if (!getcwd(cwd, 500)) exit(1);
+ chdir(pathname);
+ axis2_archive_extract();
+
+ count = AXIS2_SCANDIR(pathname, &files, dir_select, AXIS2_ALPHASORT);
+ chdir(cwd);
+
+ /* If no files found, make a non-selectable menu item */
+ if (count <= 0)
+ {
AXIS2_ARRAY_LIST_FREE(file_list, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "No files in the path %s.", pathname);
- return NULL;
- }
+ return NULL;
+ }
- for (i = 1; i < (count + 1) ; ++i )
+ for (i = 1; i < (count + 1) ; ++i )
{
axis2_char_t *fname = NULL;
axis2_file_t *arch_file = NULL;
@@ -357,43 +357,43 @@
int file_select(struct dirent *entry)
{
- axis2_char_t *ptr;
- /*axis2_char_t *rindex(const axis2_char_t *s, int c);*/
+ axis2_char_t *ptr;
+ /*axis2_char_t *rindex(const axis2_char_t *s, int c);*/
- if ((strcmp(entry->d_name, ".")== 0) ||
- (strcmp(entry->d_name, "..") == 0))
- return (AXIS2_FALSE);
+ if ((strcmp(entry->d_name, ".")== 0) ||
+ (strcmp(entry->d_name, "..") == 0))
+ return (AXIS2_FALSE);
- /* Check for filename extensions */
- ptr = AXIS2_RINDEX(entry->d_name, '.');
- if ((ptr != NULL) &&
- ((strcmp(ptr, AXIS2_LIB_SUFFIX) == 0) ))
+ /* Check for filename extensions */
+ ptr = AXIS2_RINDEX(entry->d_name, '.');
+ if ((ptr != NULL) &&
+ ((strcmp(ptr, AXIS2_LIB_SUFFIX) == 0) ))
{
- return (AXIS2_TRUE);
+ return (AXIS2_TRUE);
}
- else
- return(AXIS2_FALSE);
+ else
+ return(AXIS2_FALSE);
}
int dir_select(struct dirent *entry)
{
- struct stat stat_p;
+ struct stat stat_p;
- if (-1 == stat (entry->d_name, &stat_p))
- return (AXIS2_FALSE);
+ if (-1 == stat (entry->d_name, &stat_p))
+ return (AXIS2_FALSE);
- if ((entry->d_name[0] == '.') || (!S_ISDIR(stat_p.st_mode)))
+ if ((entry->d_name[0] == '.') || (!S_ISDIR(stat_p.st_mode)))
{
- return (AXIS2_FALSE);
- }
+ return (AXIS2_FALSE);
+ }
- /* Check for filename extensions */
- /*ptr = AXIS2_RINDEX(entry->d_name, '.');
- if (ptr != NULL)
+ /* Check for filename extensions */
+ /*ptr = AXIS2_RINDEX(entry->d_name, '.');
+ if (ptr != NULL)
{
- return (AXIS2_FALSE);
+ return (AXIS2_FALSE);
}*/
- return AXIS2_TRUE;
+ return AXIS2_TRUE;
}
Modified: webservices/axis2/trunk/c/util/src/dll_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dll_desc.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Sat Jun 3 20:09:08 2006
@@ -23,7 +23,7 @@
*/
typedef struct axis2_dll_desc_impl
{
- axis2_dll_desc_t dll_desc;
+ axis2_dll_desc_t dll_desc;
axis2_char_t *dll_name;
axis2_char_t *path_qualified_dll_name;
@@ -39,7 +39,7 @@
} axis2_dll_desc_impl_t;
#define AXIS2_INTF_TO_IMPL(dll_desc) ((axis2_dll_desc_impl_t *) dll_desc)
-
+
/*************************** Function headers *********************************/
axis2_status_t AXIS2_CALL
@@ -125,7 +125,7 @@
const axis2_env_t *env,
axis2_char_t *class_name);
-/************************* End of function headers ****************************/
+/************************* End of function headers ****************************/
AXIS2_EXTERN axis2_dll_desc_t * AXIS2_CALL
axis2_dll_desc_create (const axis2_env_t *env)
@@ -134,10 +134,10 @@
AXIS2_ENV_CHECK(env, NULL);
- dll_desc_impl = (axis2_dll_desc_impl_t *) AXIS2_MALLOC (env->allocator
- , sizeof (axis2_dll_desc_impl_t));
+ dll_desc_impl = (axis2_dll_desc_impl_t *) AXIS2_MALLOC (env->allocator
+ , sizeof (axis2_dll_desc_impl_t));
- if(NULL == dll_desc_impl)
+ if(NULL == dll_desc_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -157,14 +157,14 @@
dll_desc_impl->dll_desc.ops = (axis2_dll_desc_ops_t *) AXIS2_MALLOC(
env->allocator, sizeof(axis2_dll_desc_ops_t));
- if(NULL == dll_desc_impl->dll_desc.ops)
- {
+ if(NULL == dll_desc_impl->dll_desc.ops)
+ {
axis2_dll_desc_free(&(dll_desc_impl->dll_desc), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- dll_desc_impl->dll_desc.ops->free = axis2_dll_desc_free;
+ dll_desc_impl->dll_desc.ops->free = axis2_dll_desc_free;
dll_desc_impl->dll_desc.ops->get_name = axis2_dll_desc_get_name;
dll_desc_impl->dll_desc.ops->set_name = axis2_dll_desc_set_name;
dll_desc_impl->dll_desc.ops->get_load_options = axis2_dll_desc_get_load_options;
@@ -179,11 +179,11 @@
dll_desc_impl->dll_desc.ops->get_type = axis2_dll_desc_get_type;
dll_desc_impl->dll_desc.ops->get_timestamp = axis2_dll_desc_get_timestamp;
dll_desc_impl->dll_desc.ops->set_timestamp = axis2_dll_desc_set_timestamp;
- dll_desc_impl->dll_desc.ops->set_error_code = axis2_dll_desc_set_error_code;
- dll_desc_impl->dll_desc.ops->get_error_code = axis2_dll_desc_get_error_code;
- dll_desc_impl->dll_desc.ops->create_platform_specific_dll_name =
- axis2_dll_desc_create_platform_specific_dll_name;
- return &(dll_desc_impl->dll_desc);
+ dll_desc_impl->dll_desc.ops->set_error_code = axis2_dll_desc_set_error_code;
+ dll_desc_impl->dll_desc.ops->get_error_code = axis2_dll_desc_get_error_code;
+ dll_desc_impl->dll_desc.ops->create_platform_specific_dll_name =
+ axis2_dll_desc_create_platform_specific_dll_name;
+ return &(dll_desc_impl->dll_desc);
}
/******************************************************************************/
@@ -201,7 +201,7 @@
{
axis2_class_loader_delete_dll(env, dll_desc);
}
-
+
if(dll_desc_impl->dll_name)
{
AXIS2_FREE(env->allocator, dll_desc_impl->dll_name);
@@ -213,10 +213,10 @@
AXIS2_FREE(env->allocator, dll_desc_impl->path_qualified_dll_name);
dll_desc_impl->path_qualified_dll_name = NULL;
}
-
+
if(NULL != dll_desc->ops)
{
- AXIS2_FREE(env->allocator, dll_desc->ops);
+ AXIS2_FREE(env->allocator, dll_desc->ops);
dll_desc->ops = NULL;
}
dll_desc_impl->create_funct = NULL;
@@ -228,7 +228,7 @@
dll_desc_impl = NULL;
}
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Sat Jun 3 20:09:08 2006
@@ -48,8 +48,8 @@
{
if(NULL != env && NULL != env->log)
AXIS2_LOG_FREE(env->allocator, env->log);
-
- if(NULL != env && NULL != env->error)
+
+ if(NULL != env && NULL != env->error)
AXIS2_ERROR_FREE(env->error);
if(NULL != env && NULL != env->thread_pool)
@@ -57,14 +57,14 @@
if(NULL != env)
free (env);
-
- return 0;
+
+ return 0;
}
AXIS2_EXTERN axis2_env_t* AXIS2_CALL
axis2_env_create (axis2_allocator_t *allocator)
{
- axis2_env_t *environment;
+ axis2_env_t *environment;
if (NULL == allocator)
return NULL;
@@ -81,8 +81,8 @@
if(NULL == environment->error)
return NULL;
environment->log = NULL;
- environment->thread_pool = NULL;
- return environment;
+ environment->thread_pool = NULL;
+ return environment;
}
@@ -90,8 +90,8 @@
axis2_env_create_with_error (axis2_allocator_t *allocator
, axis2_error_t *error)
{
- return axis2_env_create_with_error_log(allocator, error
- , NULL);
+ return axis2_env_create_with_error_log(allocator, error
+ , NULL);
}
AXIS2_EXTERN axis2_env_t * AXIS2_CALL
@@ -102,7 +102,7 @@
axis2_env_t *environment;
if (NULL == allocator)
return NULL;
- if (NULL == error)
+ if (NULL == error)
return NULL;
environment =
@@ -118,25 +118,25 @@
if (NULL == log)
environment->log_enabled = AXIS2_FALSE;
- environment->log_enabled = AXIS2_TRUE;
+ environment->log_enabled = AXIS2_TRUE;
environment->log = log;
- environment->thread_pool = NULL;
+ environment->thread_pool = NULL;
return environment;
}
AXIS2_EXTERN axis2_env_t * AXIS2_CALL
axis2_env_create_with_error_log_thread_pool (axis2_allocator_t *allocator
- , axis2_error_t *error
+ , axis2_error_t *error
, axis2_log_t *log
- , axis2_thread_pool_t *pool)
+ , axis2_thread_pool_t *pool)
{
- axis2_env_t *environment;
+ axis2_env_t *environment;
if (NULL == allocator)
return NULL;
- if (NULL == error)
+ if (NULL == error)
return NULL;
- if(NULL == pool)
- return NULL;
+ if(NULL == pool)
+ return NULL;
environment =
(axis2_env_t *) AXIS2_MALLOC (allocator, sizeof (axis2_env_t));
@@ -146,11 +146,11 @@
environment->allocator = allocator;
environment->error = error;
- environment->thread_pool = pool;
+ environment->thread_pool = pool;
if (NULL == log)
environment->log_enabled = AXIS2_FALSE;
- environment->log_enabled = AXIS2_TRUE;
+ environment->log_enabled = AXIS2_TRUE;
environment->log = log;
return environment;
@@ -161,7 +161,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
- return AXIS2_ERROR_GET_STATUS_CODE(env->error);
+ return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_env_enable_log (axis2_env_t *env, axis2_bool_t enable)
Modified: webservices/axis2/trunk/c/util/src/error.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/error.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/error.c (original)
+++ webservices/axis2/trunk/c/util/src/error.c Sat Jun 3 20:09:08 2006
@@ -18,7 +18,7 @@
#include "axis2_error_default.h"
axis2_char_t * AXIS2_CALL axis2_error_impl_get_message (axis2_error_t *error);
-
+
axis2_status_t AXIS2_CALL
axis2_error_impl_set_error_number (axis2_error_t *error, axis2_error_codes_t error_number);
@@ -293,8 +293,8 @@
/* wsdl */
axis2_error_messages[AXIS2_ERROR_INTERFACE_OR_PORT_TYPE_NOT_FOUND_FOR_THE_BINDING] =
"Interface or Port Type not found for the binding";
- axis2_error_messages[AXIS2_ERROR_INTERFACES_OR_PORTS_NOT_FOUND_FOR_PARTIALLY_BUILT_WOM] =
- "Interfaces or Ports not found for the partially built WOM";
+ axis2_error_messages[AXIS2_ERROR_INTERFACES_OR_PORTS_NOT_FOUND_FOR_PARTIALLY_BUILT_WOM] =
+ "Interfaces or Ports not found for the partially built WOM";
axis2_error_messages[AXIS2_ERROR_INVALID_STATE_WSDL_OP] =
"Wsdl op accessed has invalid state";
axis2_error_messages[AXIS2_ERROR_INVALID_STATE_WSDL_SVC] =
@@ -374,9 +374,9 @@
"error occured in writing start element with namespace prefix";
axis2_error_messages[AXIS2_ERROR_WRITING_CDATA] =
"error in writing cdata section";
- axis2_error_messages[AXIS2_ERROR_XML_PARSER_INVALID_MEM_TYPE] =
- "AXIS2_XML_PARSER_TYPE_BUFFER or AXIS2_XML_PARSER_TYPE_DOC is expected";
-
+ axis2_error_messages[AXIS2_ERROR_XML_PARSER_INVALID_MEM_TYPE] =
+ "AXIS2_XML_PARSER_TYPE_BUFFER or AXIS2_XML_PARSER_TYPE_DOC is expected";
+
/* invalid type passed */
axis2_error_messages[AXIS2_ERROR_INVALID_BASE_TYPE] =
"invalid type passed";
@@ -496,9 +496,9 @@
}
error->ops->get_message = axis2_error_impl_get_message;
- error->ops->set_error_number = axis2_error_impl_set_error_number;
- error->ops->set_status_code = axis2_error_impl_set_status_code;
- error->ops->get_status_code = axis2_error_impl_get_status_code;
+ error->ops->set_error_number = axis2_error_impl_set_error_number;
+ error->ops->set_status_code = axis2_error_impl_set_status_code;
+ error->ops->get_status_code = axis2_error_impl_get_status_code;
error->ops->free = axis2_error_impl_free;
return error;
Modified: webservices/axis2/trunk/c/util/src/file.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/file.c (original)
+++ webservices/axis2/trunk/c/util/src/file.c Sat Jun 3 20:09:08 2006
@@ -74,12 +74,12 @@
{
axis2_file_impl_t *file_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
- file_impl = (axis2_file_impl_t *) AXIS2_MALLOC(env->allocator,
+ AXIS2_ENV_CHECK(env, NULL);
+
+ file_impl = (axis2_file_impl_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_file_impl_t));
-
- if(NULL == file_impl)
+
+ if(NULL == file_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -89,11 +89,11 @@
file_impl->timestamp = 0;
file_impl->file.ops =
- AXIS2_MALLOC (env->allocator, sizeof(axis2_file_ops_t));
- if(NULL == file_impl->file.ops)
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_file_ops_t));
+ if(NULL == file_impl->file.ops)
{
axis2_file_free(&(file_impl->file), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -105,8 +105,8 @@
file_impl->file.ops->set_timestamp = axis2_file_set_timestamp;
file_impl->file.ops->get_timestamp = axis2_file_get_timestamp;
file_impl->file.ops->clone = axis2_file_clone;
-
- return &(file_impl->file);
+
+ return &(file_impl->file);
}
/***************************Function implementation****************************/
@@ -130,7 +130,7 @@
AXIS2_FREE(env->allocator, file_impl->path);
file_impl->path = NULL;
}
-
+
if(file_impl->file.ops)
{
AXIS2_FREE(env->allocator, file_impl->file.ops);
Modified: webservices/axis2/trunk/c/util/src/file_diff.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file_diff.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/file_diff.c (original)
+++ webservices/axis2/trunk/c/util/src/file_diff.c Sat Jun 3 20:09:08 2006
@@ -26,23 +26,23 @@
axis2_status_t axis2_file_diff_clean(const axis2_env_t *env);
axis2_status_t AXIS2_CALL axis2_file_diff(const axis2_env_t *env
- , axis2_char_t* expected_file_name, axis2_char_t* actual_file_name)
+ , 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_file_handler_open(expected_file_name,"rt");
-
- actual_file = axis2_file_handler_open(actual_file_name,"rt");
-
- if( expected_file == NULL || actual_file == NULL ) {
- /*printf("Unable to open one of datafile %s, %s\n", expected_file_name
- , actual_file_name );*/
- axis2_file_diff_clean(env);
- return AXIS2_ERROR_COULD_NOT_OPEN_FILE;
- }
-
+ axis2_char_t *buffer1, *buffer2;
+ int flag1 = 0, flag2 = 0;
+ expected_file = axis2_file_handler_open(expected_file_name,"rt");
+
+ actual_file = axis2_file_handler_open(actual_file_name,"rt");
+
+ if( expected_file == NULL || actual_file == NULL ) {
+ /*printf("Unable to open one of datafile %s, %s\n", expected_file_name
+ , actual_file_name );*/
+ axis2_file_diff_clean(env);
+ return AXIS2_ERROR_COULD_NOT_OPEN_FILE;
+ }
+
expected_file_stream = axis2_stream_create_file(env, expected_file);
actual_file_stream = axis2_stream_create_file(env, actual_file);
output_stream = axis2_stream_create_file(env, stdout);
@@ -52,18 +52,18 @@
, actual_file_name );*/
axis2_file_diff_clean(env);
return AXIS2_FAILURE;
- }
+ }
- 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_GET_CHAR (expected_file_stream, env);
- ch2 = AXIS2_STREAM_GET_CHAR (actual_file_stream, env);
-
-
- while(1)
- {
+ 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_GET_CHAR (expected_file_stream, env);
+ ch2 = AXIS2_STREAM_GET_CHAR (actual_file_stream, env);
+
+
+ while(1)
+ {
- if(ch1 == ' ' || ch1 == '\n' )
+ if(ch1 == ' ' || ch1 == '\n' )
{
flag1 = 1;
}
@@ -93,25 +93,25 @@
{
if(ch1 != ch2)
{
- AXIS2_STREAM_WRITE(output_stream, env
- , "\n****************************** TEST FAILED *********" \
- "**************************\n", 80);
+ AXIS2_STREAM_WRITE(output_stream, env
+ , "\n****************************** TEST FAILED *********" \
+ "**************************\n", 80);
*buffer1 = '\n';
*buffer2 = '\n';
- AXIS2_STREAM_WRITE(output_stream, env
- , "\n---------------------- Expected file read upto: ----" \
- "--------------------------\n", 80);
+ AXIS2_STREAM_WRITE(output_stream, env
+ , "\n---------------------- Expected file read upto: ----" \
+ "--------------------------\n", 80);
/*printf("%s\n", buffer1); */
- AXIS2_STREAM_WRITE(output_stream, env, buffer1, j);
- AXIS2_STREAM_WRITE(output_stream, env
- , "\n---------------------- Actual file read upto: ------" \
- "--------------------------\n", 80);
+ AXIS2_STREAM_WRITE(output_stream, env, buffer1, j);
+ AXIS2_STREAM_WRITE(output_stream, env
+ , "\n---------------------- Actual file read upto: ------" \
+ "--------------------------\n", 80);
/* printf("%s\n", buffer2); */
- AXIS2_STREAM_WRITE(output_stream, env, buffer2, k);
- AXIS2_STREAM_WRITE(output_stream, env, "\n", 1);
+ AXIS2_STREAM_WRITE(output_stream, env, buffer2, k);
+ AXIS2_STREAM_WRITE(output_stream, env, "\n", 1);
axis2_file_diff_clean(env);
}
@@ -132,14 +132,14 @@
if(ch1 == expected_file_stream->axis2_eof || ch2 == actual_file_stream->axis2_eof)
break;
ch1 = AXIS2_STREAM_GET_CHAR(expected_file_stream, env);
- ch2 = AXIS2_STREAM_GET_CHAR(actual_file_stream, env);
- }
-
- AXIS2_STREAM_WRITE(output_stream, env
- , "\n************************* TEST PASSED **************************" \
- "**************\n", 80);
-
- return AXIS2_SUCCESS;
+ ch2 = AXIS2_STREAM_GET_CHAR(actual_file_stream, env);
+ }
+
+ AXIS2_STREAM_WRITE(output_stream, env
+ , "\n************************* TEST PASSED **************************" \
+ "**************\n", 80);
+
+ return AXIS2_SUCCESS;
}
axis2_status_t axis2_file_diff_clean (const axis2_env_t *env)
@@ -160,9 +160,9 @@
output_stream = NULL;
}
- if(expected_file != NULL )
- axis2_file_handler_close(expected_file);
- if(actual_file != NULL )
- axis2_file_handler_close(actual_file);
- return AXIS2_SUCCESS;
+ if(expected_file != NULL )
+ axis2_file_handler_close(expected_file);
+ if(actual_file != NULL )
+ axis2_file_handler_close(actual_file);
+ return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/util/src/file_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file_handler.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/file_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/file_handler.c Sat Jun 3 20:09:08 2006
@@ -27,22 +27,22 @@
{
FILE *file_ptr;
-
- if (!file_name)
- return NULL;
+
+ if (!file_name)
+ return NULL;
- if (!options)
- return NULL;
-
- file_ptr = fopen (file_name, options);
- return file_ptr;
+ if (!options)
+ return NULL;
+
+ file_ptr = fopen (file_name, options);
+ return file_ptr;
}
axis2_status_t AXIS2_CALL
axis2_file_handler_close(void *file_ptr)
{
- if(!file_ptr) return -1;
- return (axis2_status_t) fclose(file_ptr);
+ if(!file_ptr) return -1;
+ return (axis2_status_t) fclose(file_ptr);
}
axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/util/src/generic_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/generic_obj.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/generic_obj.c (original)
+++ webservices/axis2/trunk/c/util/src/generic_obj.c Sat Jun 3 20:09:08 2006
@@ -65,12 +65,12 @@
{
axis2_generic_obj_impl_t *generic_obj_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
- generic_obj_impl = (axis2_generic_obj_impl_t *) AXIS2_MALLOC(env->allocator,
+ AXIS2_ENV_CHECK(env, NULL);
+
+ generic_obj_impl = (axis2_generic_obj_impl_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_generic_obj_impl_t));
-
- if(NULL == generic_obj_impl)
+
+ if(NULL == generic_obj_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -79,21 +79,21 @@
generic_obj_impl->free_func = 0;
generic_obj_impl->generic_obj.ops =
- AXIS2_MALLOC (env->allocator, sizeof(axis2_generic_obj_ops_t));
- if(NULL == generic_obj_impl->generic_obj.ops)
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_generic_obj_ops_t));
+ if(NULL == generic_obj_impl->generic_obj.ops)
{
axis2_generic_obj_free(&(generic_obj_impl->generic_obj), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
generic_obj_impl->generic_obj.ops->free = axis2_generic_obj_free;
generic_obj_impl->generic_obj.ops->set_free_func = axis2_generic_obj_set_free_func;
generic_obj_impl->generic_obj.ops->set_value = axis2_generic_obj_set_value;
- generic_obj_impl->generic_obj.ops->get_value = axis2_generic_obj_get_value;
+ generic_obj_impl->generic_obj.ops->get_value = axis2_generic_obj_get_value;
generic_obj_impl->generic_obj.ops->set_type = axis2_generic_obj_set_type;
- generic_obj_impl->generic_obj.ops->get_type = axis2_generic_obj_get_type;
- return &(generic_obj_impl->generic_obj);
+ generic_obj_impl->generic_obj.ops->get_type = axis2_generic_obj_get_type;
+ return &(generic_obj_impl->generic_obj);
}
/***************************Function implementation****************************/
Modified: webservices/axis2/trunk/c/util/src/hash.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/hash.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/hash.c (original)
+++ webservices/axis2/trunk/c/util/src/hash.c Sat Jun 3 20:09:08 2006
@@ -394,7 +394,7 @@
AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
axis2_hash_overlay (const axis2_hash_t *overlay, const axis2_env_t *env
- , const axis2_hash_t * base)
+ , const axis2_hash_t * base)
{
AXIS2_ENV_CHECK(env, NULL);
return axis2_hash_merge (overlay, env, base, NULL, NULL);
@@ -402,7 +402,7 @@
AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
axis2_hash_merge (const axis2_hash_t *overlay, const axis2_env_t *env
- , const axis2_hash_t * base, void *(*merger) (const axis2_env_t * env
+ , const axis2_hash_t * base, void *(*merger) (const axis2_env_t * env
, const void *key, axis2_ssize_t klen, const void *h1_val
, const void *h2_val, const void *data), const void *data)
{
Modified: webservices/axis2/trunk/c/util/src/linked_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/linked_list.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/linked_list.c (original)
+++ webservices/axis2/trunk/c/util/src/linked_list.c Sat Jun 3 20:09:08 2006
@@ -20,7 +20,7 @@
typedef struct axis2_linked_list_impl
{
/** handler description */
- axis2_linked_list_t linked_list;
+ axis2_linked_list_t linked_list;
/**The number of elements in this list. */
int size;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org