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 2007/03/20 12:24:36 UTC
svn commit: r520362 - in /webservices/axis2/trunk/c:
include/axis2_http_out_transport_info.h
modules/core/transport/http/common/http_out_transport_info.c
modules/core/transport/http/server/apache2/apache2_out_transport_info.c
Author: samisa
Date: Tue Mar 20 04:24:35 2007
New Revision: 520362
URL: http://svn.apache.org/viewvc?view=rev&rev=520362
Log:
Fixed apache module build break
Modified:
webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h
webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
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=520362&r1=520361&r2=520362
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h Tue Mar 20 04:24:35 2007
@@ -44,6 +44,12 @@
/** Type name for struct axis2_http_out_transport_info */
typedef struct axis2_http_out_transport_info axis2_http_out_transport_info_t;
+ struct axis2_http_out_transport_info
+ {
+ axis2_http_simple_response_t *response;
+ axis2_char_t *encoding;
+ };
+
/**
* @param info pointer to info
* @param env pointer to environment struct
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c?view=diff&rev=520362&r1=520361&r2=520362
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c Tue Mar 20 04:24:35 2007
@@ -20,12 +20,6 @@
#include <axis2_http_transport.h>
#include <axis2_string.h>
-struct axis2_http_out_transport_info
-{
- axis2_http_simple_response_t *response;
- axis2_char_t *encoding;
-};
-
AXIS2_EXTERN axis2_http_out_transport_info_t *AXIS2_CALL
axis2_http_out_transport_info_create(
const axis2_env_t *env,
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c?view=diff&rev=520362&r1=520361&r2=520362
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c Tue Mar 20 04:24:35 2007
@@ -21,146 +21,100 @@
#include <axis2_string.h>
#include <apr_strings.h>
-
-/**
- * @brief Apache2 Out transport info impl structure
- * Axis2 apache2_out_transport_info_impl
- */
-
-typedef struct axis2_apache2_out_transport_info_impl
+typedef struct axis2_apache2_out_transport_info
{
axis2_http_out_transport_info_t out_transport_info;
request_rec *request;
axis2_char_t *encoding;
-}
-axis2_apache2_out_transport_info_impl_t;
+}axis2_apache2_out_transport_info_t;
#define AXIS2_INTF_TO_IMPL(out_transport_info) \
- ((axis2_apache2_out_transport_info_impl_t *)(out_transport_info))
-
-/***************************** Function headers *******************************/
-axis2_status_t 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_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);
-
-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);
-
-/***************************** End of function headers ************************/
+ ((axis2_apache2_out_transport_info_t *)(out_transport_info))
axis2_http_out_transport_info_t *AXIS2_CALL
axis2_apache2_out_transport_info_create(
const axis2_env_t *env,
request_rec *request)
{
- axis2_apache2_out_transport_info_impl_t *info_impl = NULL;
+ axis2_apache2_out_transport_info_t *info = NULL;
AXIS2_ENV_CHECK(env, NULL);
- info_impl = (axis2_apache2_out_transport_info_impl_t *)AXIS2_MALLOC
+ info = (axis2_apache2_out_transport_info_t *)AXIS2_MALLOC
(env->allocator, sizeof(
- axis2_apache2_out_transport_info_impl_t));
+ axis2_apache2_out_transport_info_t));
- if (! info_impl)
+ if (! info)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- info_impl->request = request;
- info_impl->encoding = NULL;
+ info->request = request;
+ info->encoding = NULL;
- info_impl->out_transport_info.ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_http_out_transport_info_ops_t));
- if (! info_impl->out_transport_info.ops)
- {
- axis2_http_out_transport_info_free((axis2_http_out_transport_info_t *)
- info_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
+ return &(info->out_transport_info);
+}
- info_impl->out_transport_info.ops->set_content_type =
- axis2_http_out_transport_info_set_content_type;
- info_impl->out_transport_info.ops->set_char_encoding =
- axis2_http_out_transport_info_set_char_encoding;
- info_impl->out_transport_info.ops->free =
- axis2_http_out_transport_info_free;
+axis2_status_t AXIS2_CALL
+axis2_apache2_out_transport_info_free_void_arg(
+ void *transport_info,
+ const axis2_env_t *env)
+{
+ axis2_http_out_transport_info_t *transport_info_l = NULL;
- return &(info_impl->out_transport_info);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ transport_info_l = (axis2_http_out_transport_info_t *) transport_info;
+ return axis2_http_out_transport_info_free(transport_info_l, env);
}
-
axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_free(
- axis2_http_out_transport_info_t *info,
+ axis2_http_out_transport_info_t *out_transport_info,
const axis2_env_t *env)
{
- axis2_apache2_out_transport_info_impl_t *info_impl = NULL;
+ axis2_apache2_out_transport_info_t *info = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- info_impl = AXIS2_INTF_TO_IMPL(info);
- info_impl->request = NULL; /* request doesn't belong to info */
- if (info_impl->encoding)
+ info = AXIS2_INTF_TO_IMPL(out_transport_info);
+
+ info->request = NULL; /* request doesn't belong to info */
+ if (info->encoding)
{
- AXIS2_FREE(env->allocator, info_impl->encoding);
- info_impl->encoding = NULL;
+ AXIS2_FREE(env->allocator, info->encoding);
+ info->encoding = NULL;
}
- if (info->ops)
- AXIS2_FREE(env->allocator, info->ops);
- AXIS2_FREE(env->allocator, info_impl);
+ AXIS2_FREE(env->allocator, info);
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-axis2_apache2_out_transport_info_free_void_arg(
- void *transport_info,
- const axis2_env_t *env)
-{
- axis2_http_out_transport_info_t *transport_info_l = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- transport_info_l = (axis2_http_out_transport_info_t *) transport_info;
- return axis2_http_out_transport_info_free(transport_info_l, env);
-}
-
-axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_set_content_type(
- axis2_http_out_transport_info_t *info,
+ axis2_http_out_transport_info_t *out_transport_info,
const axis2_env_t *env,
const axis2_char_t *content_type)
{
+ axis2_apache2_out_transport_info_t *info = NULL;
+
axis2_char_t *tmp1 = NULL;
axis2_char_t *tmp2 = NULL;
- axis2_apache2_out_transport_info_impl_t *info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FAILURE);
+ info = AXIS2_INTF_TO_IMPL(out_transport_info);
- info_impl = AXIS2_INTF_TO_IMPL(info);
-
- if (info_impl->encoding)
+ if (info->encoding)
{
tmp1 = axis2_stracat(content_type, ";charset=", env);
- tmp2 = axis2_stracat(tmp1, info_impl->encoding, env);
- info_impl->request->content_type = apr_pstrdup(info_impl->request->pool,
+ tmp2 = axis2_stracat(tmp1, info->encoding, env);
+ info->request->content_type = apr_pstrdup(info->request->pool,
tmp2);
AXIS2_FREE(env->allocator, tmp1);
AXIS2_FREE(env->allocator, tmp2);
}
else
{
- info_impl->request->content_type = apr_pstrdup(info_impl->request->pool,
+ info->request->content_type = apr_pstrdup(info->request->pool,
content_type);
}
return AXIS2_SUCCESS;
@@ -173,17 +127,16 @@
const axis2_env_t *env,
const axis2_char_t *encoding)
{
- axis2_apache2_out_transport_info_impl_t *info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, encoding, AXIS2_FAILURE);
- info_impl = AXIS2_INTF_TO_IMPL(info);
- if (info_impl->encoding)
+ if (info->encoding)
{
- AXIS2_FREE(env->allocator, info_impl->encoding);
+ AXIS2_FREE(env->allocator, info->encoding);
}
- info_impl->encoding = axis2_strdup(encoding, env);
+ info->encoding = axis2_strdup(encoding, env);
return AXIS2_SUCCESS;
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org