You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/11/01 04:09:57 UTC
svn commit: r329959 - in /webservices/axis2/trunk/c: include/axis2_error.h
include/axis2_log.h include/axis2_stream.h
modules/util/src/axis2_error_default.h modules/util/src/axis2_log.c
modules/util/src/axis2_log_default.h modules/util/src/axis2_stream.c
Author: damitha
Date: Mon Oct 31 19:09:40 2005
New Revision: 329959
URL: http://svn.apache.org/viewcvs?rev=329959&view=rev
Log:
More changes
Modified:
webservices/axis2/trunk/c/include/axis2_error.h
webservices/axis2/trunk/c/include/axis2_log.h
webservices/axis2/trunk/c/include/axis2_stream.h
webservices/axis2/trunk/c/modules/util/src/axis2_error_default.h
webservices/axis2/trunk/c/modules/util/src/axis2_log.c
webservices/axis2/trunk/c/modules/util/src/axis2_log_default.h
webservices/axis2/trunk/c/modules/util/src/axis2_stream.c
Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=329959&r1=329958&r2=329959&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Mon Oct 31 19:09:40 2005
@@ -71,7 +71,7 @@
#define AXIS2_ERROR_FREE(error) ((error->ops)->free(error))
-#define AXIS2_ERROR_GET_MESSAGE(error) ((error)->ops->axis2_error_ops_get_message())
+#define AXIS2_ERROR_GET_MESSAGE(error) ((error)->ops->get_message())
/**
* \brief Axis2 status codes
Modified: webservices/axis2/trunk/c/include/axis2_log.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_log.h?rev=329959&r1=329958&r2=329959&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_log.h (original)
+++ webservices/axis2/trunk/c/include/axis2_log.h Mon Oct 31 19:09:40 2005
@@ -71,7 +71,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_status_t (AXIS2_CALL *axis2_log_ops_write) (const void *buffer, size_t count);
+ axis2_status_t (AXIS2_CALL *write) (const void *buffer, size_t count);
} axis2_log_ops_t;
/**
@@ -89,16 +89,9 @@
axis2_bool_t enabled;
} axis2_log_t;
- /**
- * Creates a log struct
- * @param allocator allocator to be used. Mandatory, cannot be NULL
- * @return pointer to the newly created log struct
- */
- /* AXIS2_DECLARE(axis2_log_t *) axis2_log_create (axis2_allocator_t * allocator,
- axis2_log_ops_t * operations);*/
#define AXIS2_LOG_FREE(log) ((log->ops)->free(log))
-#define AXIS22_LOG_WRITE(log, buffer, count) ((log)->ops->axis2_log_ops_write(buffer, count))
+#define AXIS22_LOG_WRITE(log, buffer, count) ((log)->ops->write(buffer, count))
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_stream.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_stream.h?rev=329959&r1=329958&r2=329959&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stream.h Mon Oct 31 19:09:40 2005
@@ -54,7 +54,7 @@
* @param size size of the buffer
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *axis2_stream_ops_read) (void *buffer
+ axis2_status_t (AXIS2_CALL *read) (void *buffer
, size_t count);
/**
* writes into stream
@@ -62,7 +62,7 @@
* @param size size of the buffer
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *axis2_stream_ops_write)
+ axis2_status_t (AXIS2_CALL *write)
(const void *buffer, size_t count);
/**
@@ -71,7 +71,7 @@
* @param options file options given.
* @return status code
*/
- void * (AXIS2_CALL *axis2_stream_ops_file_open)
+ void * (AXIS2_CALL *file_open)
(const char *file_name, const char *options);
/**
@@ -79,14 +79,14 @@
* @param file_ptr file pointer of the file need to be closed
* @return status code
*/
- axis2_status_t (AXIS2_CALL *axis2_stream_ops_file_close)
+ axis2_status_t (AXIS2_CALL *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_char_t (AXIS2_CALL *axis2_stream_ops_file_get_char)
+ axis2_char_t (AXIS2_CALL *file_get_char)
(void *file_ptr);
/** write a previously read character back to the file stream
@@ -95,7 +95,7 @@
* and need to be written back to
* @return status code
*/
- axis2_status_t (AXIS2_CALL *axis2_stream_ops_file_unget_char)
+ axis2_status_t (AXIS2_CALL *file_unget_char)
(const char chr, void *file_ptr);
} axis2_stream_ops_t;
@@ -115,17 +115,17 @@
#define AXIS2_STREAM_FREE(stream) ((stream->ops)->free(stream))
#define AXIS2_STREAM_READ(stream, buffer, count) \
- ((stream)->ops->axis2_stream_ops_read(buffer, count))
+ ((stream)->ops->read(buffer, count))
#define AXIS2_STREAM_WRITE(stream, buffer, count) \
- ((stream)->ops->axis2_stream_ops_write(buffer, count))
+ ((stream)->ops->write(buffer, count))
#define AXIS2_STREAM_FILE_OPEN(stream, file_name, options) \
- ((stream)->ops->axis2_stream_ops_file_open(file_name, options))
+ ((stream)->file_open(file_name, options))
#define AXIS2_STREAM_FILE_CLOSE(stream, file_ptr) \
- ((stream)->ops->axis2_stream_ops_file_close(file_ptr))
+ ((stream)->ops->file_close(file_ptr))
#define AXIS2_STREAM_FILE_GET_CHAR(stream, file_ptr) \
- ((stream)->ops->axis2_stream_ops_file_get_char(file_ptr))
+ ((stream)->ops->file_get_char(file_ptr))
#define AXIS2_STREAM_FILE_UNGET_CHAR(stream, chr, file_ptr) \
- ((stream)->ops->axis2_stream_ops_file_unget_char(chr, file_ptr))
+ ((stream)->ops->file_unget_char(chr, file_ptr))
/** @} */
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_error_default.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_error_default.h?rev=329959&r1=329958&r2=329959&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_error_default.h (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_error_default.h Mon Oct 31 19:09:40 2005
@@ -26,9 +26,6 @@
{
#endif
- struct axis2_error;
- struct axis2_error_ops;
-
/**
* @defgroup axis2_error Error
* @ingroup axis2_util
@@ -43,8 +40,6 @@
*/
AXIS2_DECLARE(axis2_error_t *) axis2_error_create (axis2_allocator_t * allocator);
-#define AXIS2_ERROR_FREE(error) ((error->ops)->free(error))
-#define AXIS2_ERROR_GET_MESSAGE(error) ((error)->ops->axis2_error_ops_get_message())
/** @} */
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=329959&r1=329958&r2=329959&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_log.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_log.c Mon Oct 31 19:09:40 2005
@@ -59,7 +59,7 @@
return NULL;
}
- log->ops->axis2_log_ops_write = axis2_log_impl_write;
+ log->ops->write = axis2_log_impl_write;
}
return log;
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_log_default.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_log_default.h?rev=329959&r1=329958&r2=329959&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_log_default.h (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_log_default.h Mon Oct 31 19:09:40 2005
@@ -42,8 +42,6 @@
AXIS2_DECLARE(axis2_log_t *) axis2_log_create (axis2_allocator_t * allocator,
axis2_log_ops_t * operations);
-#define axis2_log_write(log, buffer, count) ((log)->ops->axis2_log_ops_write(buffer, count))
-
/** @} */
#ifdef __cplusplus
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=329959&r1=329958&r2=329959&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_stream.c Mon Oct 31 19:09:40 2005
@@ -44,19 +44,19 @@
{
if(!stream->ops->free)
(stream->ops)->free = axis2_stream_impl_free;
- if(!stream->ops->axis2_stream_ops_read)
- stream->ops->axis2_stream_ops_read = axis2_stream_impl_read;
- if(!stream->ops->axis2_stream_ops_write)
- stream->ops->axis2_stream_ops_write = axis2_stream_impl_write;
- if(!stream->ops->axis2_stream_ops_file_open)
- stream->ops->axis2_stream_ops_file_open = axis2_stream_impl_file_open;
- if(!stream->ops->axis2_stream_ops_file_close)
- stream->ops->axis2_stream_ops_file_close = axis2_stream_impl_file_close;
- if(!stream->ops->axis2_stream_ops_file_get_char)
- stream->ops->axis2_stream_ops_file_get_char
+ if(!stream->ops->read)
+ stream->ops->read = axis2_stream_impl_read;
+ if(!stream->ops->write)
+ stream->ops->write = axis2_stream_impl_write;
+ if(!stream->ops->file_open)
+ stream->ops->file_open = axis2_stream_impl_file_open;
+ if(!stream->ops->file_close)
+ stream->ops->file_close = axis2_stream_impl_file_close;
+ if(!stream->ops->file_get_char)
+ stream->ops->file_get_char
= axis2_stream_impl_file_get_char;
- if(!stream->ops->axis2_stream_ops_file_unget_char)
- stream->ops->axis2_stream_ops_file_unget_char
+ if(!stream->ops->file_unget_char)
+ stream->ops->file_unget_char
= axis2_stream_impl_file_unget_char;
}
else if (allocator)
@@ -73,13 +73,13 @@
if(!stream->ops->free)
(stream->ops)->free = axis2_stream_impl_free;
- stream->ops->axis2_stream_ops_read = axis2_stream_impl_read;
- stream->ops->axis2_stream_ops_write = axis2_stream_impl_write;
- stream->ops->axis2_stream_ops_file_open = axis2_stream_impl_file_open;
- stream->ops->axis2_stream_ops_file_close = axis2_stream_impl_file_close;
- stream->ops->axis2_stream_ops_file_get_char
+ stream->ops->read = axis2_stream_impl_read;
+ stream->ops->write = axis2_stream_impl_write;
+ stream->ops->file_open = axis2_stream_impl_file_open;
+ stream->ops->file_close = axis2_stream_impl_file_close;
+ stream->ops->file_get_char
= axis2_stream_impl_file_get_char;
- stream->ops->axis2_stream_ops_file_unget_char
+ stream->ops->file_unget_char
= axis2_stream_impl_file_unget_char;
}
else
@@ -106,13 +106,13 @@
AXIS2_FREE (allocator, stream);
return NULL;
}
- stream->ops->axis2_stream_ops_read = axis2_stream_impl_read;
- stream->ops->axis2_stream_ops_write = axis2_stream_impl_write;
- stream->ops->axis2_stream_ops_file_open = axis2_stream_impl_file_open;
- stream->ops->axis2_stream_ops_file_close = axis2_stream_impl_file_close;
- stream->ops->axis2_stream_ops_file_get_char
+ stream->ops->read = axis2_stream_impl_read;
+ stream->ops->write = axis2_stream_impl_write;
+ stream->ops->file_open = axis2_stream_impl_file_open;
+ stream->ops->file_close = axis2_stream_impl_file_close;
+ stream->ops->file_get_char
= axis2_stream_impl_file_get_char;
- stream->ops->axis2_stream_ops_file_unget_char
+ stream->ops->file_unget_char
= axis2_stream_impl_file_unget_char;
stream->axis2_eof = EOF;