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 sa...@apache.org on 2007/03/18 13:20:33 UTC
svn commit: r519603 [1/2] - in /webservices/axis2/trunk/c: include/
modules/core/transport/http/common/ modules/core/transport/http/util/
Author: samisa
Date: Sun Mar 18 05:20:32 2007
New Revision: 519603
URL: http://svn.apache.org/viewvc?view=rev&rev=519603
Log:
Removed ops and fixed formatting
Modified:
webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h
webservices/axis2/trunk/c/include/axis2_http_header.h
webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h
webservices/axis2/trunk/c/include/axis2_http_request_line.h
webservices/axis2/trunk/c/include/axis2_http_simple_request.h
webservices/axis2/trunk/c/include/axis2_http_simple_response.h
webservices/axis2/trunk/c/include/axis2_http_status_line.h
webservices/axis2/trunk/c/include/axis2_http_worker.h
webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c
Modified: webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h?view=diff&rev=519603&r1=519602&r2=519603
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h Sun Mar 18 05:20:32 2007
@@ -41,124 +41,90 @@
{
#endif
- /** Type name for struct axis2_http_chunked_stream_ops */
- typedef struct axis2_http_chunked_stream_ops axis2_http_chunked_stream_ops_t;
/** Type name for struct axis2_http_chunked_stream */
typedef struct axis2_http_chunked_stream axis2_http_chunked_stream_t;
/**
- * HTTP Chunked Stream ops struct
- * Encapsulator struct for ops of axis2_http_chunked_stream
- */
- struct axis2_http_chunked_stream_ops
- {
- /**
- * @param chunked_stream pointer to chunked stream
- * @param env pointer to environment struct
- * @param buffer
- * @param count
- */
- int (AXIS2_CALL *
- read)(
- axis2_http_chunked_stream_t *chunked_stream,
- const axis2_env_t *env,
- void *buffer,
- size_t count);
-
- /**
- * @param env pointer to environment struct
- * @param buffer
- * @param count
- */
- int (AXIS2_CALL *
- write)(
- axis2_http_chunked_stream_t *chunked_stream,
- const axis2_env_t *env,
- const void *buffer,
- size_t count);
-
- /**
- * @param chunked_stream pointer to chunked stream
- * @param env pointer to environment struct
- */
- int (AXIS2_CALL *
- get_current_chunk_size)(
- const axis2_http_chunked_stream_t *chunked_stream,
- const axis2_env_t *env);
-
- /**
- * @param chunked_stream pointer to chunked stream
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- write_last_chunk)(
- axis2_http_chunked_stream_t *chunked_stream,
- const axis2_env_t *env);
-
- /**
- * @param chunked_stream pointer to chunked stream
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_http_chunked_stream_t *chunked_stream,
- const axis2_env_t *env);
- };
+ * @param chunked_stream pointer to chunked stream
+ * @param env pointer to environment struct
+ * @param buffer
+ * @param count
+ */
+ AXIS2_EXTERN int AXIS2_CALL
+ axis2_http_chunked_stream_read(axis2_http_chunked_stream_t *chunked_stream,
+ const axis2_env_t *env,
+ void *buffer,
+ size_t count);
/**
- * axis2 http chunked stream
- */
- struct axis2_http_chunked_stream
- {
- /** operations of axis2 http chucnked stream */
- axis2_http_chunked_stream_ops_t *ops;
- };
+ * @param env pointer to environment struct
+ * @param buffer
+ * @param count
+ */
+ AXIS2_EXTERN int AXIS2_CALL
+ axis2_http_chunked_stream_write(axis2_http_chunked_stream_t *chunked_stream,
+ const axis2_env_t *env,
+ const void *buffer,
+ size_t count);
+
+ /**
+ * @param chunked_stream pointer to chunked stream
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN int AXIS2_CALL
+ axis2_http_chunked_stream_get_current_chunk_size(const axis2_http_chunked_stream_t *chunked_stream,
+ const axis2_env_t *env);
+ /**
+ * @param chunked_stream pointer to chunked stream
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_chunked_stream_write_last_chunk(axis2_http_chunked_stream_t *chunked_stream,
+ const axis2_env_t *env);
+
+ /**
+ * @param chunked_stream pointer to chunked stream
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_chunked_stream_free(axis2_http_chunked_stream_t *chunked_stream,
+ const axis2_env_t *env);
/**
* @param env pointer to environment struct
* @param stream pointer to stream
*/
AXIS2_EXTERN axis2_http_chunked_stream_t * AXIS2_CALL
- axis2_http_chunked_stream_create(
- const axis2_env_t *env,
+ axis2_http_chunked_stream_create(const axis2_env_t *env,
axis2_stream_t* stream);
-/********************* Start of function macros ***************************/
-
-/** Read.
- @sa axis2_http_chunked_stream_ops#read */
+/** Read. */
#define AXIS2_HTTP_CHUNKED_STREAM_READ(chunked_stream, env, buffer, count) \
- ((chunked_stream)->ops->read(chunked_stream, env, \
- buffer, count))
+ axis2_http_chunked_stream_read(chunked_stream, env, \
+ buffer, count)
-/** Write.
- @sa axis2_http_chunked_stream_ops#write */
+/** Write. */
#define AXIS2_HTTP_CHUNKED_STREAM_WRITE(chunked_stream, env, buffer, count) \
- ((chunked_stream)->ops->write(chunked_stream, env, \
- buffer, count))
+ axis2_http_chunked_stream_write(chunked_stream, env, \
+ buffer, count)
-/** Gets the current chunk size.
- @sa axis2_http_chunked_stream_ops#get_current_chunk_size */
+/** Gets the current chunk size. */
#define AXIS2_HTTP_CHUNKED_GET_CURRENT_CHUNK_SIZE(chunked_stream, env) \
- ((chunked_stream)->ops->get_current_chunk_size \
- (chunked_stream, env))
+ axis2_http_chunked_stream_get_current_chunk_size \
+ (chunked_stream, env)
-/** Writes the last chunk.
- @sa axis2_http_chunked_stream_ops#write_last_chunk */
+/** Writes the last chunk. */
#define AXIS2_HTTP_CHUNKED_STREAM_WRITE_LAST_CHUNK(chunked_stream, env) \
- ((chunked_stream)->ops->write_last_chunk(chunked_stream\
- , env))
+ axis2_http_chunked_stream_write_last_chunk(chunked_stream\
+ , env)
-/** Free.
- @sa axis2_http_chunked_stream_ops#free */
+/** Free. */
#define AXIS2_HTTP_CHUNKED_STREAM_FREE(chunked_stream, env) \
- ((chunked_stream)->ops->free(chunked_stream, env))
-
-/************************* End of function macros *****************************/
+ axis2_http_chunked_stream_free(chunked_stream, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_http_header.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_header.h?view=diff&rev=519603&r1=519602&r2=519603
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_header.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_header.h Sun Mar 18 05:20:32 2007
@@ -40,66 +40,41 @@
{
#endif
- /** Type name for struct axis2_http_header_ops */
- typedef struct axis2_http_header_ops axis2_http_header_ops_t;
/** Type name for struct axis2_http_header */
typedef struct axis2_http_header axis2_http_header_t;
+ /**
+ * @param header pointer to header
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_header_to_external_form(axis2_http_header_t *header,
+ const axis2_env_t *env);
+
+ /**
+ * @param header pointer to header
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_header_get_name(const axis2_http_header_t *header,
+ const axis2_env_t *env);
/**
- * HTTP Header ops struct
- * Encapsulator struct for ops of axis2_http_header
+ * @param header pointer to header
+ * @param env pointer to environment struct
*/
- struct axis2_http_header_ops
- {
- /**
- * @param header pointer to header
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- to_external_form)(
- axis2_http_header_t *header,
- const axis2_env_t *env);
-
- /**
- * @param header pointer to header
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- get_name)(
- const axis2_http_header_t *header,
- const axis2_env_t *env);
-
- /**
- * @param header pointer to header
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- get_value)(
- const axis2_http_header_t *header,
- const axis2_env_t *env);
-
- /**
- * @param header pointer to header
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_http_header_t *header,
- const axis2_env_t *env);
- };
-
- /**
- * HTTP Header struct
- * Axis2 HTTP Header
- */
- struct axis2_http_header
- {
- /** Operations of http sender */
- axis2_http_header_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_header_get_value(const axis2_http_header_t *header,
+ const axis2_env_t *env);
+ /**
+ * @param header pointer to header
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_header_free(axis2_http_header_t *header,
+ const axis2_env_t *env);
/**
* @param env pointer to environment struct
@@ -107,8 +82,7 @@
* @param value pointer to value
*/
AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL
- axis2_http_header_create (
- const axis2_env_t *env,
+ axis2_http_header_create (const axis2_env_t *env,
const axis2_char_t *name,
const axis2_char_t *value);
@@ -116,34 +90,25 @@
* @param env pointer to environment struct
* @param str pointer to str
*/
- AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL AXIS2_CALL
- axis2_http_header_create_by_str (
- const axis2_env_t *env,
+ AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL
+ axis2_http_header_create_by_str (const axis2_env_t *env,
const axis2_char_t *str);
-/************************** Start of function macros **************************/
-
-/** To external from.
- @sa axis2_http_header_ops#to_external_form */
+/** To external from. */
#define AXIS2_HTTP_HEADER_TO_EXTERNAL_FORM(header, env) \
- ((header)->ops->to_external_form(header, env))
+ axis2_http_header_to_external_form(header, env)
-/** Gets the name.
- @sa axis2_http_header_ops#get_name */
+/** Gets the name. */
#define AXIS2_HTTP_HEADER_GET_NAME(header, env) \
- ((header)->ops->get_name(header, env))
+ axis2_http_header_get_name(header, env)
-/** Get value.
- @sa axis2_http_header_ops#get_value */
+/** Get value. */
#define AXIS2_HTTP_HEADER_GET_VALUE(header, env) \
- ((header)->ops->get_value(header, env))
+ axis2_http_header_get_value(header, env)
-/** Frees the http header.
- @sa axis2_http_header_ops#free */
+/** Frees the http header. */
#define AXIS2_HTTP_HEADER_FREE(header, env) \
- ((header)->ops->free(header, env))
-
-/************************** End of function macros ****************************/
+ axis2_http_header_free(header, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h?view=diff&rev=519603&r1=519602&r2=519603
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h Sun Mar 18 05:20:32 2007
@@ -41,69 +41,45 @@
{
#endif
- /** Type name for struct axis2_http_out_transport_info_ops */
- typedef struct axis2_http_out_transport_info_ops axis2_http_out_transport_info_ops_t;
/** Type name for struct axis2_http_out_transport_info */
typedef struct axis2_http_out_transport_info axis2_http_out_transport_info_t;
-
/**
- * HTTP Out Transport Info ops struct
- * Encapsulator struct for ops of axis2_http_out_transport_info
+ * @param info pointer to info
+ * @param env pointer to environment struct
+ * @param content_type pointer to content type
*/
- struct axis2_http_out_transport_info_ops
- {
- /**
- * @param info pointer to info
- * @param env pointer to environment struct
- * @param content_type pointer to content type
- */
- int (AXIS2_CALL *
- set_content_type)(
- axis2_http_out_transport_info_t *info,
- const axis2_env_t *env,
- const axis2_char_t *content_type);
-
- /**
- * @param info pointer to info
- * @param env pointer to environment struct
- * @param encoding pointer to encoding
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_char_encoding)(
- axis2_http_out_transport_info_t *info,
- const axis2_env_t *env,
- const axis2_char_t *encoding);
-
- /**
- * @param out_transport_info pointer to out transport info
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_http_out_transport_info_t *out_transport_info,
- const axis2_env_t *env);
- };
+ AXIS2_EXTERN int AXIS2_CALL
+ axis2_http_out_transport_info_set_content_type(axis2_http_out_transport_info_t *info,
+ const axis2_env_t *env,
+ const axis2_char_t *content_type);
/**
- * axis2 http out transport info
+ * @param info pointer to info
+ * @param env pointer to environment struct
+ * @param encoding pointer to encoding
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_http_out_transport_info
- {
- /** operations of http out transport info */
- axis2_http_out_transport_info_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_out_transport_info_set_char_encoding(axis2_http_out_transport_info_t *info,
+ const axis2_env_t *env,
+ const axis2_char_t *encoding);
+ /**
+ * @param out_transport_info pointer to out transport info
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_out_transport_info_free(axis2_http_out_transport_info_t *out_transport_info,
+ const axis2_env_t *env);
/**
* @param env pointer to environment struct
* @param response pointer to response
*/
AXIS2_EXTERN axis2_http_out_transport_info_t *AXIS2_CALL
- axis2_http_out_transport_info_create(
- const axis2_env_t *env,
+ axis2_http_out_transport_info_create(const axis2_env_t *env,
axis2_http_simple_response_t *response);
/**
@@ -114,30 +90,20 @@
* @param env pointer to environment struct
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_http_out_transport_info_free_void_arg(
- void *transport_info,
+ axis2_http_out_transport_info_free_void_arg(void *transport_info,
const axis2_env_t *env);
-/************************* Start of function macros ***************************/
-
-/** Set content type.
- @sa axis2_http_out_transport_info_ops#set_content_type */
+/** Set content type. */
#define AXIS2_HTTP_OUT_TRANSPORT_INFO_SET_CONTENT_TYPE(out_transport_info, \
- env, content_type) ((out_transport_info)->ops->\
- set_content_type (out_transport_info, env, content_type))
+ env, content_type) axis2_http_out_transport_info_set_content_type (out_transport_info, env, content_type)
-/** Set cahr encoding.
- @sa axis2_http_out_transport_info_ops#set_char_encoding */
+/** Set cahr encoding. */
#define AXIS2_HTTP_OUT_TRANSPORT_INFO_SET_CHAR_ENCODING(out_transport_info,\
- env, encoding) ((out_transport_info)->ops->set_char_encoding \
- (out_transport_info, env, encoding))
+ env, encoding) axis2_http_out_transport_info_set_char_encoding(out_transport_info, env, encoding)
-/** Free.
- @sa axis2_http_out_transport_info_ops#free */
+/** Free. */
#define AXIS2_HTTP_OUT_TRANSPORT_INFO_FREE(out_transport_info, env)\
- ((out_transport_info)->ops->free(out_transport_info, env))
-
-/************************* End of function macros *****************************/
+ axis2_http_out_transport_info_free(out_transport_info, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_http_request_line.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_request_line.h?view=diff&rev=519603&r1=519602&r2=519603
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_request_line.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_request_line.h Sun Mar 18 05:20:32 2007
@@ -39,83 +39,58 @@
{
#endif
- /** Type name for struct axis2_http_request_line_ops */
- typedef struct axis2_http_request_line_ops axis2_http_request_line_ops_t;
/** Type name for struct axis2_http_request_line */
typedef struct axis2_http_request_line axis2_http_request_line_t;
+ /**
+ * @param request_line pointer to request line
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_request_line_get_method(const axis2_http_request_line_t *request_line,
+ const axis2_env_t *env);
/**
- * HTTP Request Line ops struct
- * Encapsulator struct for ops of axis2_http_request_line
+ * @param request_line pointer to request line
+ * @param env pointer to environment struct
*/
- struct axis2_http_request_line_ops
- {
- /**
- * @param request_line pointer to request line
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- get_method)(
- const axis2_http_request_line_t *request_line,
- const axis2_env_t *env);
-
- /**
- * @param request_line pointer to request line
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- get_http_version)(
- const axis2_http_request_line_t *request_line,
- const axis2_env_t *env);
-
- /**
- * @param request_line pointer to request line
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- get_uri)(
- const axis2_http_request_line_t *request_line,
- const axis2_env_t *env);
-
- /**
- * @param request_line pointer to request line
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- to_string)(
- axis2_http_request_line_t *request_line,
- const axis2_env_t *env);
-
- /**
- * @param request_line pointer to request line
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_http_request_line_t *request_line,
- const axis2_env_t *env);
- };
-
- /**
- * @brief HTTP Reqest Line struct
- * Axis2 HTTP Request Line
- */
- struct axis2_http_request_line
- {
- axis2_http_request_line_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_request_line_get_http_version(const axis2_http_request_line_t *request_line,
+ const axis2_env_t *env);
/**
+ * @param request_line pointer to request line
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_request_line_get_uri(const axis2_http_request_line_t *request_line,
+ const axis2_env_t *env);
+
+ /**
+ * @param request_line pointer to request line
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_request_line_to_string(axis2_http_request_line_t *request_line,
+ const axis2_env_t *env);
+
+ /**
+ * @param request_line pointer to request line
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_request_line_free(axis2_http_request_line_t *request_line,
+ const axis2_env_t *env);
+
+ /**
* @param env pointer to environment struct
* @param method pointer to method
* @param uri pointer to uri
* @param http_version pointer to http version
*/
AXIS2_EXTERN axis2_http_request_line_t *AXIS2_CALL
- axis2_http_request_line_create(
- const axis2_env_t *env,
+ axis2_http_request_line_create(const axis2_env_t *env,
const axis2_char_t *method,
const axis2_char_t *uri,
const axis2_char_t *http_version);
@@ -125,38 +100,28 @@
* @param str pointer to str
*/
AXIS2_EXTERN axis2_http_request_line_t *AXIS2_CALL
- axis2_http_request_line_parse_line(
- const axis2_env_t *env,
+ axis2_http_request_line_parse_line(const axis2_env_t *env,
const axis2_char_t *str);
-/********************* Start of function macros ***************************/
-
-/** Get method.
- @sa axis2_http_request_line_ops#get_method */
+/** Get method. */
#define AXIS2_HTTP_REQUEST_LINE_GET_METHOD(request_line, env) \
- ((request_line)->ops->get_method (request_line, env))
+ axis2_http_request_line_get_method (request_line, env)
-/** Gets the http version.
- @sa axis2_http_request_line_ops#get_http_version */
+/** Gets the http version. */
#define AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(request_line, env) \
- ((request_line)->ops->get_http_version(request_line, env))
+ axis2_http_request_line_get_http_version(request_line, env)
-/** Gets the uri.
- @sa axis2_http_request_line_ops#get_uri */
+/** Gets the uri. */
#define AXIS2_HTTP_REQUEST_LINE_GET_URI(request_line, env) \
- ((request_line)->ops->get_uri (request_line, env))
+ axis2_http_request_line_get_uri (request_line, env)
-/** To string.
- @sa axis2_http_request_line_ops#to_string */
+/** To string. */
#define AXIS2_HTTP_REQUEST_LINE_TO_STRING(request_line, env) \
- ((request_line)->ops->to_string (request_line, env))
+ axis2_http_request_line_to_string (request_line, env)
-/** Frees the http request line.
- @sa axis2_http_request_line_ops#free */
+/** Frees the http request line. */
#define AXIS2_HTTP_REQUEST_LINE_FREE(request_line, env) \
- ((request_line)->ops->free(request_line, env))
-
-/************************* End of function macros *****************************/
+ axis2_http_request_line_free(request_line, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_http_simple_request.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_simple_request.h?view=diff&rev=519603&r1=519602&r2=519603
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_simple_request.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_simple_request.h Sun Mar 18 05:20:32 2007
@@ -43,174 +43,140 @@
{
#endif
- /** Type name for struct axis2_http_simple_request_ops */
- typedef struct axis2_http_simple_request_ops
- axis2_http_simple_request_ops_t;
/** Type name for struct axis2_http_simple_request */
typedef struct axis2_http_simple_request axis2_http_simple_request_t;
/**
- * HTTP Simple Request ops struct
- * Encapsulator struct for ops of axis2_http_simple_request
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_http_request_line_t *AXIS2_CALL
+ axis2_http_simple_request_get_request_line(const axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ * @param request_line pointer to request line
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_request_set_request_line(axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env,
+ axis2_http_request_line_t *request_line);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ * @param name pointer to name
+ */
+ AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+ axis2_http_simple_request_contains_header(axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env,
+ const axis2_char_t *name);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+ axis2_http_simple_request_get_headers(const axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ * @param str pointer to str
+ */
+ AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL
+ axis2_http_simple_request_get_first_header(const axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env,
+ const axis2_char_t *str);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ * @param str pointer to str
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_request_remove_headers(axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env,
+ const axis2_char_t *str);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ * @param header pointer to header
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_request_add_header(axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env,
+ axis2_http_header_t *header);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
+ axis2_http_simple_request_get_content_type(const axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
+ axis2_http_simple_request_get_charset(const axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_ssize_t AXIS2_CALL
+ axis2_http_simple_request_get_content_length(const axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
+ axis2_http_simple_request_get_body(const axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ * @param buf double pointer to buf
+ */
+ AXIS2_EXTERN axis2_ssize_t AXIS2_CALL
+ axis2_http_simple_request_get_body_bytes(const axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env,
+ char **buf);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ * @param str pointer to str
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_http_simple_request_ops
- {
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- */
- axis2_http_request_line_t *(AXIS2_CALL *
- get_request_line)(
- const axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- * @param request_line pointer to request line
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_request_line)(
- axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env,
- axis2_http_request_line_t *request_line);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- * @param name pointer to name
- */
- axis2_bool_t (AXIS2_CALL *
- contains_header)(
- axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env,
- const axis2_char_t *name);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- */
- axis2_array_list_t *(AXIS2_CALL *
- get_headers)(
- const axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- * @param str pointer to str
- */
- axis2_http_header_t *(AXIS2_CALL *
- get_first_header)(
- const axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env,
- const axis2_char_t *str);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- * @param str pointer to str
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- remove_headers)(
- axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env,
- const axis2_char_t *str);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- * @param header pointer to header
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- add_header)(
- axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env,
- axis2_http_header_t *header);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- */
- const axis2_char_t *(AXIS2_CALL *
- get_content_type)(
- const axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- */
- const axis2_char_t *(AXIS2_CALL *
- get_charset)(
- const axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- */
- axis2_ssize_t (AXIS2_CALL *
- get_content_length)(
- const axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- */
- axis2_stream_t *(AXIS2_CALL *
- get_body)(
- const axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- * @param buf double pointer to buf
- */
- axis2_ssize_t (AXIS2_CALL *
- get_body_bytes)(
- const axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env,
- char **buf);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- * @param str pointer to str
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_body_string)(
- axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env,
- void *str,
- unsigned int str_len);
-
- /**
- * @param simple_request pointer to simple request
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_http_simple_request_t *simple_request,
- const axis2_env_t *env);
-
- };
-
- /**
- * axis2 http simple request
- */
- struct axis2_http_simple_request
- {
- /** operations of axis2 http simple request */
- axis2_http_simple_request_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_request_set_body_string(axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env,
+ void *str,
+ unsigned int str_len);
+
+ /**
+ * @param simple_request pointer to simple request
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_request_free(axis2_http_simple_request_t *simple_request,
+ const axis2_env_t *env);
/**
* @param env pointer to environment struct
@@ -220,99 +186,80 @@
* @param content pointer to content
*/
AXIS2_EXTERN axis2_http_simple_request_t *AXIS2_CALL
- axis2_http_simple_request_create (
- const axis2_env_t *env,
+ axis2_http_simple_request_create (const axis2_env_t *env,
axis2_http_request_line_t *request_line,
axis2_http_header_t **http_headers,
axis2_ssize_t http_hdr_count,
axis2_stream_t *content);
-/************************** Start of function macros **************************/
-
-/** Gets the request line.
- @sa axis2_http_simple_request_ops#get_request_line */
+/** Gets the request line. */
#define AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(simple_request, env) \
- ((simple_request)->ops->get_request_line\
- (simple_request, env))
+ axis2_http_simple_request_get_request_line\
+ (simple_request, env)
-/** Set request line.
- @sa axis2_http_simple_request_ops#set_request_line */
+/** Set request line. */
#define AXIS2_HTTP_SIMPLE_REQUEST_SET_REQUEST_LINE\
(simple_request, env, request_line) \
- ((simple_request)->ops->set_request_line\
- (simple_request, env, request_line))
+ axis2_http_simple_request_set_request_line\
+ (simple_request, env, request_line)
-/** Contains header.
- @sa axis2_http_simple_request_ops#contains_header */
+/** Contains header. */
#define AXIS2_HTTP_SIMPLE_REQUEST_CONTAINS_HEADER(simple_request, env, name)\
- ((simple_request)->ops->contains_header\
- (simple_request, env, name))
+ axis2_http_simple_request_contains_header\
+ (simple_request, env, name)
-/** Get headers.
- @sa axis2_http_simple_request_ops#get_headers */
+/** Get headers. */
#define AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(simple_request, env)\
- ((simple_request)->ops->get_headers(simple_request, env))
+ axis2_http_simple_request_get_headers(simple_request, env)
-/** Gets the first header.
- @sa axis2_http_simple_request_ops#get_first_header */
+/** Gets the first header. */
#define AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request, env, str) \
- ((simple_request)->ops->get_first_header\
- (simple_request, env, str))
+ axis2_http_simple_request_get_first_header\
+ (simple_request, env, str)
-/** Remove headers.
- @sa axis2_http_simple_request_ops#remove_headers */
+/** Remove headers. */
#define AXIS2_HTTP_SIMPLE_REQUEST_REMOVE_HEADERS(simple_request, env, str) \
- ((simple_request)->ops->remove_headers\
- (simple_request, env, str))
+ axis2_http_simple_request_remove_headers\
+ (simple_request, env, str)
-/** Add header.
- @sa axis2_http_simple_request_ops#add_header */
+/** Add header. */
#define AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(simple_request, env, header) \
- ((simple_request)->ops->add_header\
- (simple_request, env, header))
+ axis2_http_simple_request_add_header\
+ (simple_request, env, header)
-/** Gets the content type.
- @sa axis2_http_simple_request_ops#get_content_type */
+/** Gets the content type. */
#define AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(simple_request, env)\
- ((simple_request)->ops->get_content_type\
- (simple_request, env))
+ axis2_http_simple_request_get_content_type\
+ (simple_request, env)
-/** Gets the charset.
- @sa axis2_http_simple_request_ops#get_charset */
+/** Gets the charset. */
#define AXIS2_HTTP_SIMPLE_REQUEST_GET_CHARSET(simple_request, env) \
- ((simple_request)->ops->get_charset\
- (simple_request, env))
+ axis2_http_simple_request_get_charset\
+ (simple_request, env)
-/** Gets the content length.
- @sa axis2_http_simple_request_ops#get_content_length */
+/** Gets the content length. */
#define AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_LENGTH(simple_request, env)\
- ((simple_request)->ops->get_content_length\
- (simple_request, env))
+ axis2_http_simple_request_get_content_length\
+ (simple_request, env)
-/** Gets the body.
- @sa axis2_http_simple_request_ops#get_body */
+/** Gets the body. */
#define AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(simple_request, env)\
- ((simple_request)->ops->get_body\
- (simple_request, env))
+ axis2_http_simple_request_get_body\
+ (simple_request, env)
-/** Get body bytes.
- @sa axis2_http_simple_request_ops#get_body_bytes */
+/** Get body bytes. */
#define AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY_BYTES(simple_request, env, buf)\
- ((simple_request)->ops->get_body_bytes\
- (simple_request, env, buf))
+ axis2_http_simple_request_get_body_bytes\
+ (simple_request, env, buf)
-/** Sets the body string.
- @sa axis2_http_simple_request_ops#set_body_string */
+/** Sets the body string. */
#define AXIS2_HTTP_SIMPLE_REQUEST_SET_BODY_STRING(simple_request, env, str, str_len)\
- ((simple_request)->ops->set_body_string\
- (simple_request, env, str, str_len))
+ axis2_http_simple_request_set_body_string\
+ (simple_request, env, str, str_len)
-/** Frees the http simple request.
- @sa axis2_http_simple_request_ops#free */
+/** Frees the http simple request. */
#define AXIS2_HTTP_SIMPLE_REQUEST_FREE(simple_request, env) \
- ((simple_request)->ops->free(simple_request, env))
-
-/************************** End of function macros ****************************/
+ axis2_http_simple_request_free(simple_request, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_http_simple_response.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_simple_response.h?view=diff&rev=519603&r1=519602&r2=519603
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_simple_response.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_simple_response.h Sun Mar 18 05:20:32 2007
@@ -43,19 +43,10 @@
{
#endif
- /** Type name for struct axis2_http_simple_response_ops */
- typedef struct axis2_http_simple_response_ops
- axis2_http_simple_response_ops_t;
/** Type name for struct axis2_http_simple_response */
typedef struct axis2_http_simple_response axis2_http_simple_response_t;
- /**
- * HTTP Simple Response ops struct
- * Encapsulator struct for ops of axis2_http_simple_response
- */
- struct axis2_http_simple_response_ops
- {
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @param http_ver pointer to http_ver
@@ -63,211 +54,180 @@
* @param phrase pointer to phrase
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *
- set_status_line)(
- struct axis2_http_simple_response *simple_response,
- const axis2_env_t *env,
- const axis2_char_t *http_ver,
- const int status_code,
- const axis2_char_t *phrase);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_response_set_status_line(struct axis2_http_simple_response *simple_response,
+ const axis2_env_t *env,
+ const axis2_char_t *http_ver,
+ const int status_code,
+ const axis2_char_t *phrase);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- axis2_char_t* (AXIS2_CALL *
- get_phrase)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
+ AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ axis2_http_simple_response_get_phrase(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- int (AXIS2_CALL *
- get_status_code)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
+ AXIS2_EXTERN int AXIS2_CALL
+ axis2_http_simple_response_get_status_code(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- axis2_char_t* (AXIS2_CALL *
- get_http_version)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
+ AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ axis2_http_simple_response_get_http_version(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- axis2_char_t* (AXIS2_CALL *
- get_status_line)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
+ AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ axis2_http_simple_response_get_status_line(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @param name pointer to name
*/
- axis2_bool_t (AXIS2_CALL *
- contains_header)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env,
- const axis2_char_t *name);
+ AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+ axis2_http_simple_response_contains_header(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env,
+ const axis2_char_t *name);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- axis2_array_list_t* (AXIS2_CALL *
- get_headers)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
+ AXIS2_EXTERN axis2_array_list_t* AXIS2_CALL
+ axis2_http_simple_response_get_headers(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @param str pointer to str
*/
- axis2_http_header_t* (AXIS2_CALL *
- get_first_header)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env,
- const axis2_char_t *str);
+ AXIS2_EXTERN axis2_http_header_t* AXIS2_CALL
+ axis2_http_simple_response_get_first_header(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env,
+ const axis2_char_t *str);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @param str pointer to str
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *
- remove_headers)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env,
- const axis2_char_t *str);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_response_remove_headers(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env,
+ const axis2_char_t *str);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @param header pointer to header
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *
- set_header)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env,
- axis2_http_header_t* header);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_response_set_header(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env,
+ axis2_http_header_t* header);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @param headers double pointer to headers
* @param array_size
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *
- set_headers)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env,
- axis2_http_header_t** headers,
- axis2_ssize_t array_size);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_response_set_headers(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env,
+ axis2_http_header_t** headers,
+ axis2_ssize_t array_size);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- const axis2_char_t* (AXIS2_CALL *
- get_charset)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
+ AXIS2_EXTERN const axis2_char_t* AXIS2_CALL
+ axis2_http_simple_response_get_charset(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- axis2_ssize_t (AXIS2_CALL *
- get_content_length)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
+ AXIS2_EXTERN axis2_ssize_t AXIS2_CALL
+ axis2_http_simple_response_get_content_length(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- const axis2_char_t* (AXIS2_CALL *
- get_content_type)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
+ AXIS2_EXTERN const axis2_char_t* AXIS2_CALL
+ axis2_http_simple_response_get_content_type(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @param str pointer to str
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *
- set_body_string)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env,
- axis2_char_t *str);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_response_set_body_string(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env,
+ axis2_char_t *str);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @param stream pointer to stream
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *
- set_body_stream)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env,
- axis2_stream_t *stream);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_response_set_body_stream(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env,
+ axis2_stream_t *stream);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- axis2_stream_t* (AXIS2_CALL *
- get_body)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
+ AXIS2_EXTERN axis2_stream_t* AXIS2_CALL
+ axis2_http_simple_response_get_body(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @param buf double pointer to buf
*/
- axis2_ssize_t (AXIS2_CALL *
- get_body_bytes)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env,
- axis2_char_t **buf);
+ AXIS2_EXTERN axis2_ssize_t AXIS2_CALL
+ axis2_http_simple_response_get_body_bytes(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env,
+ axis2_char_t **buf);
- /**
+ /**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_http_simple_response_t *simple_response,
- const axis2_env_t *env);
-
- };
-
- /**
- * axis2 http simple response
- */
- struct axis2_http_simple_response
- {
- /** operations of axis2 http simple response */
- axis2_http_simple_response_ops_t *ops;
- };
-
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_simple_response_free(axis2_http_simple_response_t *simple_response,
+ const axis2_env_t *env);
/**
* @param env pointer to environment struct
@@ -291,122 +251,99 @@
axis2_http_simple_response_create_default(
const axis2_env_t *env);
-/************************** Start of function macros **************************/
-
-/** Sets the status line.
- @sa axis2_http_simple_response_ops#set_status_line */
+/** Sets the status line. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(\
simple_response, env, http_version, status_code, phrase)\
- ((simple_response)->ops->set_status_line\
- (simple_response, env, http_version, status_code, phrase))
+ axis2_http_simple_response_set_status_line\
+ (simple_response, env, http_version, status_code, phrase)
-/** Gets the phrase.
- @sa axis2_http_simple_response_ops#get_phrase */
+/** Gets the phrase. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_PHRASE\
- (simple_response, env) ((simple_response)->ops->get_phrase\
- (simple_response, env))
+ (simple_response, env) axis2_http_simple_response_get_phrase\
+ (simple_response, env)
-/** Gets the http version.
- @sa axis2_http_simple_response_ops#get_http_version */
+/** Gets the http version. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_HTTP_VERSION(simple_response, env)\
- ((simple_response)->ops->get_http_version\
- (simple_response, env))
+ axis2_http_simple_response_get_http_version\
+ (simple_response, env)
-/** Gets the status code.
- @sa axis2_http_simple_response_ops#get_status_code */
+/** Gets the status code. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_STATUS_CODE(simple_response, env)\
- ((simple_response)->ops->get_status_code\
- (simple_response, env))
+ axis2_http_simple_response_get_status_code\
+ (simple_response, env)
-/** Gets the status line.
- @sa axis2_http_simple_response_ops#get_status_line */
+/** Gets the status line. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_STATUS_LINE(simple_response, env) \
- ((simple_response)->ops->get_status_line\
- (simple_response, env))
+ axis2_http_simple_response_get_status_line\
+ (simple_response, env)
-/** Contains header.
- @sa axis2_http_simple_response_ops#contain_header */
+/** Contains header. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_CONTAINS_HEADER(simple_response, env, name)\
- ((simple_response)->ops->contains_header\
- (simple_response, env, name))
+ axis2_http_simple_response_contains_header\
+ (simple_response, env, name)
-/** Get headers.
- @sa axis2_http_simple_response_ops#get_headers */
+/** Get headers. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_HEADERS(simple_response, env) \
- ((simple_response)->ops->get_headers\
- (simple_response, env))
+ axis2_http_simple_response_get_headers\
+ (simple_response, env)
-/** Gets the first header.
- @sa axis2_http_simple_response_ops#get_first_header */
+/** Gets the first header. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_FIRST_HEADER(simple_response, env, str) \
- ((simple_response)->ops->get_first_header\
- (simple_response, env, str))
+ axis2_http_simple_response_get_first_header\
+ (simple_response, env, str)
-/** Removes the headers.
- @sa axis2_http_simple_response_ops#remove_headers */
+/** Removes the headers. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_REMOVE_HEADERS(simple_response, env, str)\
- ((simple_response)->ops->remove_headers\
- (simple_response, env, str))
+ axis2_http_simple_response_remove_headers\
+ (simple_response, env, str)
-/** Set header.
- @sa axis2_http_simple_response_ops#set_header */
+/** Set header. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(simple_response, env, header) \
- ((simple_response)->ops->set_header\
- (simple_response, env, header))
+ axis2_http_simple_response_set_header\
+ (simple_response, env, header)
-/** Set headers.
- @sa axis2_http_simple_response_ops#set_headers */
+/** Set headers. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADERS(simple_response, env, headers) \
- ((simple_response)->ops->set_headers\
- (simple_response, env, headers))
+ axis2_http_simple_response_set_headers\
+ (simple_response, env, headers)
-/** Gets the charset.
- @sa axis2_http_simple_response_ops#get_charset */
+/** Gets the charset. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_CHARSET(simple_response, env) \
- ((simple_response)->ops->get_charset(simple_response, env))
+ axis2_http_simple_response_get_charset(simple_response, env)
-/** Gets the content length.
- @sa axis2_http_simple_response_ops#get_content_length */
+/** Gets the content length. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_LENGTH(simple_response, env) \
- ((simple_response)->ops->get_content_length\
- (simple_response, env))
+ axis2_http_simple_response_get_content_length\
+ (simple_response, env)
-/** Gets the content type.
- @sa axis2_http_simple_response_ops#get_content_type */
+/** Gets the content type. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_TYPE(simple_response, env) \
- ((simple_response)->ops->get_content_type\
- (simple_response, env))
+ axis2_http_simple_response_get_content_type\
+ (simple_response, env)
-/** Sets the body string.
- @sa axis2_http_simple_response_ops#set_body_string */
+/** Sets the body string. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STRING(simple_response, env, str)\
- ((simple_response)->ops->set_body_string\
- (simple_response, env, str))
+ axis2_http_simple_response_set_body_string\
+ (simple_response, env, str)
-/** Sets the body stream.
- @sa axis2_http_simple_response_ops#set_body_stream */
+/** Sets the body stream. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STREAM(simple_response, env, stream)\
- ((simple_response)->ops->set_body_stream\
- (simple_response, env, stream))
+ axis2_http_simple_response_set_body_stream\
+ (simple_response, env, stream)
-/** Get body.
- @sa axis2_http_simple_response_ops#get_body */
+/** Get body. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY(simple_response, env)\
- ((simple_response)->ops->get_body\
- (simple_response, env))
+ axis2_http_simple_response_get_body\
+ (simple_response, env)
-/** Get body bytes.
- @sa axis2_http_simple_response_ops#get_body_bytes */
+/** Get body bytes. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY_BYTES(simple_response, env, buf)\
- ((simple_response)->ops->get_body_bytes\
- (simple_response, env, buf))
+ axis2_http_simple_response_get_body_bytes\
+ (simple_response, env, buf)
-/** Frees the http simple response.
- @sa axis2_http_simple_response_ops#free */
+/** Frees the http simple response. */
#define AXIS2_HTTP_SIMPLE_RESPONSE_FREE(simple_response, env)\
- ((simple_response)->ops->free(simple_response, env))
-
-/************************** End of function macros ****************************/
+ axis2_http_simple_response_free(simple_response, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_http_status_line.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_status_line.h?view=diff&rev=519603&r1=519602&r2=519603
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_status_line.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_status_line.h Sun Mar 18 05:20:32 2007
@@ -39,126 +39,89 @@
{
#endif
- /** Type name for struct axis2_http_status_line_ops */
- typedef struct axis2_http_status_line_ops axis2_http_status_line_ops_t;
/** Type name for struct axis2_http_status_line */
typedef struct axis2_http_status_line axis2_http_status_line_t;
+ /**
+ * @param status_line pointer to status line
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN int AXIS2_CALL
+ axis2_http_status_line_get_status_code(const axis2_http_status_line_t *status_line,
+ const axis2_env_t *env);
/**
- * HTTP Status Line ops struct
- * Encapsulator struct for ops of axis2_http_status_line
+ * @param status_line pointer to status line
+ * @param env pointer to environment struct
*/
- struct axis2_http_status_line_ops
- {
- /**
- * @param status_line pointer to status line
- * @param env pointer to environment struct
- */
- int (AXIS2_CALL *
- get_status_code)(
- const axis2_http_status_line_t *status_line,
- const axis2_env_t *env);
-
- /**
- * @param status_line pointer to status line
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- get_http_version)(
- const axis2_http_status_line_t *status_line,
- const axis2_env_t *env);
-
- /**
- * @param status_line pointer to status line
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- get_reason_phrase)(
- const axis2_http_status_line_t *status_line,
- const axis2_env_t *env);
-
- /**
- * @param status_line pointer to status line
- * @param env pointer to environment struct
- */
- axis2_bool_t (AXIS2_CALL *
- starts_with_http)(
- axis2_http_status_line_t *status_line,
- const axis2_env_t *env);
-
- /**
- * @param status_line pointer to status line
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- to_string)(
- axis2_http_status_line_t *status_line,
- const axis2_env_t *env);
-
- /**
- * @param status_line pointer to status line
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_http_status_line_t *status_line,
- const axis2_env_t *env);
- };
-
- /**
- * axis2 http status line
- */
- struct axis2_http_status_line
- {
- /** operatoins of axis2 http status line */
- axis2_http_status_line_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_status_line_get_http_version(const axis2_http_status_line_t *status_line,
+ const axis2_env_t *env);
+ /**
+ * @param status_line pointer to status line
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_status_line_get_reason_phrase(const axis2_http_status_line_t *status_line,
+ const axis2_env_t *env);
+
+ /**
+ * @param status_line pointer to status line
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+ axis2_http_status_line_starts_with_http(axis2_http_status_line_t *status_line,
+ const axis2_env_t *env);
+
+ /**
+ * @param status_line pointer to status line
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_http_status_line_to_string(axis2_http_status_line_t *status_line,
+ const axis2_env_t *env);
+
+ /**
+ * @param status_line pointer to status line
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_status_line_free(axis2_http_status_line_t *status_line,
+ const axis2_env_t *env);
/**
* @param env pointer to environment struct
* @param str pointer to str
*/
AXIS2_EXTERN axis2_http_status_line_t *AXIS2_CALL
- axis2_http_status_line_create(
- const axis2_env_t *env,
+ axis2_http_status_line_create(const axis2_env_t *env,
const axis2_char_t *str);
-/************************* Start of function macros ***************************/
-
-/** Gets the status code.
- @sa axis2_http_status_line_ops#get_status_code */
+/** Gets the status code. */
#define AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env)\
- ((status_line)->ops->get_status_code (status_line, env))
+ axis2_http_status_line_get_status_code (status_line, env)
-/** Gets the http version.
- @sa axis2_http_status_line_ops#get_http_version */
+/** Gets the http version. */
#define AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(status_line, env)\
- ((status_line)->ops->get_http_version (status_line, env))
+ axis2_http_status_line_get_http_version (status_line, env)
-/** Get reason phrase.
- @sa axis2_http_status_line_ops#get_reason_phrase */
+/** Get reason phrase. */
#define AXIS2_HTTP_STATUS_LINE_GET_REASON_PHRASE(status_line, env)\
- ((status_line)->ops->get_reason_phrase (status_line, env))
+ axis2_http_status_line_get_reason_phrase (status_line, env)
-/** Starts with http.
- @sa axis2_http_status_line_ops#starts_with_http */
+/** Starts with http. */
#define AXIS2_HTTP_STATUS_LINE_STARTS_WITH_HTTP(status_line, env)\
- ((status_line)->ops->starts_with_http (status_line, env))
+ axis2_http_status_line_starts_with_http (status_line, env)
-/** To string.
- @sa axis2_http_status_line_ops#to_string */
+/** To string. */
#define AXIS2_HTTP_STATUS_LINE_TO_STRING(status_line, env)\
- ((status_line)->ops->to_string (status_line, env))
+ axis2_http_status_line_to_string (status_line, env)
-/** Frees the http status line.
- @sa axis2_http_status_line_ops#free */
+/** Frees the http status line. */
#define AXIS2_HTTP_STATUS_LINE_FREE(status_line, env)\
- ((status_line)->ops->free(status_line, env))
-
-/************************* End of function macros *****************************/
+ axis2_http_status_line_free(status_line, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_http_worker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_worker.h?view=diff&rev=519603&r1=519602&r2=519603
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_worker.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_worker.h Sun Mar 18 05:20:32 2007
@@ -43,91 +43,61 @@
{
#endif
- /** Type name for struct axis2_http_worker_ops */
- typedef struct axis2_http_worker_ops axis2_http_worker_ops_t;
/** Type name for struct axis2_http_worker */
typedef struct axis2_http_worker axis2_http_worker_t;
/**
- * HTTP Worker ops struct
- * Encapsulator struct for ops of axis2_http_worker
+ * @param http_worker pointer to http worker
+ * @param env pointer to environment struct
+ * @param svr_conn pointer to svr conn
+ * @param simple_request pointer to simple request
*/
- struct axis2_http_worker_ops
- {
- /**
- * @param http_worker pointer to http worker
- * @param env pointer to environment struct
- * @param svr_conn pointer to svr conn
- * @param simple_request pointer to simple request
- */
- axis2_bool_t (AXIS2_CALL *
- process_request)(
- axis2_http_worker_t *http_worker,
- const axis2_env_t *env,
- axis2_simple_http_svr_conn_t *svr_conn,
- axis2_http_simple_request_t *simple_request);
-
- /**
- * @param http_worker pointer to http worker
- * @param env pointer to environment struct
- * @param port
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_svr_port)(
- axis2_http_worker_t *http_worker,
- const axis2_env_t *env,
- int port);
-
- /**
- * @param http_worker pointer to http worker
- * @param env pointer to environment strut
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_http_worker_t *http_worker,
- const axis2_env_t *env);
- };
+ AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+ axis2_http_worker_process_request(axis2_http_worker_t *http_worker,
+ const axis2_env_t *env,
+ axis2_simple_http_svr_conn_t *svr_conn,
+ axis2_http_simple_request_t *simple_request);
/**
- * axis2 http worker
+ * @param http_worker pointer to http worker
+ * @param env pointer to environment struct
+ * @param port
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_http_worker
- {
- /** operations of axis2 http worker */
- axis2_http_worker_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_worker_set_svr_port(axis2_http_worker_t *http_worker,
+ const axis2_env_t *env,
+ int port);
+ /**
+ * @param http_worker pointer to http worker
+ * @param env pointer to environment strut
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_http_worker_free(axis2_http_worker_t *http_worker,
+ const axis2_env_t *env);
/**
* @param env pointer to environment struct
* @param conf_ctx pointer to configuration context
*/
AXIS2_EXTERN axis2_http_worker_t * AXIS2_CALL
- axis2_http_worker_create (
- const axis2_env_t *env,
+ axis2_http_worker_create (const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
-/************************** Start of function macros **************************/
-
-/** Process the request.
- @sa axis2_http_worker_ops#process_request */
+/** Process the request. */
#define AXIS2_HTTP_WORKER_PROCESS_REQUEST(http_worker, env, svr_conn,\
- simple_request) ((http_worker)->ops->process_request(\
- http_worker, env, svr_conn, simple_request))
+ simple_request) axis2_http_worker_process_request(\
+ http_worker, env, svr_conn, simple_request)
-/** Sets the server port.
- @sa axis2_http_worker_ops#set_svr_port */
+/** Sets the server port. */
#define AXIS2_HTTP_WORKER_SET_SVR_PORT(http_worker, env, port) \
- ((http_worker)->ops->set_svr_port(http_worker, env, port))
+ axis2_http_worker_set_svr_port(http_worker, env, port)
-/** Frees the http worker.
- @sa axis2_http_worker_ops#free */
+/** Frees the http worker. */
#define AXIS2_HTTP_WORKER_FREE(http_worker, env) \
- ((http_worker)->ops->free(http_worker, env))
-
-/************************** End of function macros ****************************/
+ axis2_http_worker_free(http_worker, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c?view=diff&rev=519603&r1=519602&r2=519603
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c Sun Mar 18 05:20:32 2007
@@ -21,44 +21,11 @@
#include <stdio.h>
#include <string.h>
-/**
- * @brief HTTP Header struct impl
- * Axis2 HTTP Header impl
- */
-
-typedef struct axis2_http_header_impl
+struct axis2_http_header
{
- axis2_http_header_t http_header;
axis2_char_t *name;
axis2_char_t *value;
-}
-axis2_http_header_impl_t;
-
-#define AXIS2_INTF_TO_IMPL(http_header) \
- ((axis2_http_header_impl_t *)(http_header))
-
-/***************************** Function headers *******************************/
-axis2_char_t *AXIS2_CALL
-axis2_http_header_to_external_form(
- axis2_http_header_t *header,
- const axis2_env_t *env);
-
-axis2_char_t *AXIS2_CALL
-axis2_http_header_get_name(
- const axis2_http_header_t *header,
- const axis2_env_t *env);
-
-axis2_char_t *AXIS2_CALL
-axis2_http_header_get_value(
- const axis2_http_header_t *header,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_http_header_free(
- axis2_http_header_t *header,
- const axis2_env_t *env);
-
-/***************************** End of function headers ************************/
+};
AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL
axis2_http_header_create(
@@ -66,43 +33,27 @@
const axis2_char_t *name,
const axis2_char_t *value)
{
- axis2_http_header_impl_t *http_header_impl = NULL;
+ axis2_http_header_t *http_header = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_ENV_CHECK(env, NULL);
AXIS2_ENV_CHECK(env, NULL);
- http_header_impl = (axis2_http_header_impl_t *)AXIS2_MALLOC
+ http_header = (axis2_http_header_t *)AXIS2_MALLOC
(env->allocator, sizeof(
- axis2_http_header_impl_t));
-
- if (NULL == http_header_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
- http_header_impl->name = (axis2_char_t *)axis2_strdup(name, env);
- http_header_impl->value = (axis2_char_t *)axis2_strdup(value, env);
+ axis2_http_header_t));
- http_header_impl->http_header.ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_http_header_ops_t));
- if (NULL == http_header_impl->http_header.ops)
+ if (NULL == http_header)
{
- axis2_http_header_free((axis2_http_header_t *)
- http_header_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
+ http_header->name = (axis2_char_t *)axis2_strdup(name, env);
+ http_header->value = (axis2_char_t *)axis2_strdup(value, env);
- http_header_impl->http_header.ops->to_external_form =
- axis2_http_header_to_external_form;
- http_header_impl->http_header.ops->get_name = axis2_http_header_get_name;
- http_header_impl->http_header.ops->get_value = axis2_http_header_get_value;
- http_header_impl->http_header.ops->free = axis2_http_header_free;
-
- return &(http_header_impl->http_header);
+ return http_header;
}
-AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL AXIS2_CALL
+AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL
axis2_http_header_create_by_str(
const axis2_env_t *env,
const axis2_char_t *str)
@@ -145,68 +96,58 @@
return ret;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_header_free(
- axis2_http_header_t *header,
+ axis2_http_header_t *http_header,
const axis2_env_t *env)
{
- axis2_http_header_impl_t *http_header_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- http_header_impl = AXIS2_INTF_TO_IMPL(header);
- if (http_header_impl->name)
+ if (http_header->name)
{
- AXIS2_FREE(env->allocator, http_header_impl->name);
- http_header_impl->name = NULL;
+ AXIS2_FREE(env->allocator, http_header->name);
}
- if (http_header_impl->value)
+ if (http_header->value)
{
- AXIS2_FREE(env->allocator, http_header_impl->value);
- http_header_impl->value = NULL;
+ AXIS2_FREE(env->allocator, http_header->value);
}
- if (header->ops)
- AXIS2_FREE(env->allocator, header->ops);
- AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(header));
+ AXIS2_FREE(env->allocator, http_header);
return AXIS2_SUCCESS;
}
-axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_header_to_external_form(
- axis2_http_header_t *header,
+ axis2_http_header_t *http_header,
const axis2_env_t *env)
{
- axis2_http_header_impl_t *http_header_impl = NULL;
axis2_ssize_t len = 0;
axis2_char_t *external_form = NULL;
AXIS2_ENV_CHECK(env, NULL);
- http_header_impl = AXIS2_INTF_TO_IMPL(header);
- len = axis2_strlen(http_header_impl->name) +
- axis2_strlen(http_header_impl->value) + 8;
+ len = axis2_strlen(http_header->name) +
+ axis2_strlen(http_header->value) + 8;
external_form = (axis2_char_t *) AXIS2_MALLOC(env->allocator,
len);
- sprintf(external_form, "%s: %s%s", http_header_impl->name,
- http_header_impl->value, AXIS2_HTTP_CRLF);
+ sprintf(external_form, "%s: %s%s", http_header->name,
+ http_header->value, AXIS2_HTTP_CRLF);
return external_form;
}
-axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_header_get_name(
- const axis2_http_header_t *header,
+ const axis2_http_header_t *http_header,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_INTF_TO_IMPL(header)->name;
+ return http_header->name;
}
-axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_header_get_value(
- const axis2_http_header_t *header,
+ const axis2_http_header_t *http_header,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_INTF_TO_IMPL(header)->value;
+ return http_header->value;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org