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/09/28 11:53:04 UTC
svn commit: r580276 [16/26] - in /webservices/axis2/trunk/c/src: core/addr/
core/clientapi/ core/context/ core/deployment/ core/description/
core/engine/ core/phaseresolver/ core/receivers/ core/transport/
core/transport/http/common/ core/transport/htt...
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_out_transport_info.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_out_transport_info.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -22,9 +23,9 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_impl_set_content_type(
- axis2_http_out_transport_info_t *http_out_transport_info,
- const axutil_env_t *env,
- const axis2_char_t *content_type)
+ axis2_http_out_transport_info_t * http_out_transport_info,
+ const axutil_env_t * env,
+ const axis2_char_t * content_type)
{
axis2_char_t *tmp1 = NULL;
axis2_char_t *tmp2 = NULL;
@@ -38,35 +39,40 @@
{
tmp1 = axutil_stracat(env, content_type, ";charset=");
tmp2 = axutil_stracat(env, tmp1, http_out_transport_info->encoding);
- axis2_http_simple_response_set_header(http_out_transport_info->response, env,
- axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
- tmp2));
+ axis2_http_simple_response_set_header(http_out_transport_info->
+ response, env,
+ axis2_http_header_create(env,
+ AXIS2_HTTP_HEADER_CONTENT_TYPE,
+ tmp2));
AXIS2_FREE(env->allocator, tmp1);
AXIS2_FREE(env->allocator, tmp2);
}
else
{
- axis2_http_simple_response_set_header(http_out_transport_info->response, env,
- axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
- content_type));
+ axis2_http_simple_response_set_header(http_out_transport_info->
+ response, env,
+ axis2_http_header_create(env,
+ AXIS2_HTTP_HEADER_CONTENT_TYPE,
+ content_type));
}
}
else
{
- if(http_out_transport_info->response)
- axis2_http_simple_response_set_header(http_out_transport_info->response, env,
- axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
- content_type));
+ if (http_out_transport_info->response)
+ axis2_http_simple_response_set_header(http_out_transport_info->
+ response, env,
+ axis2_http_header_create(env,
+ AXIS2_HTTP_HEADER_CONTENT_TYPE,
+ content_type));
}
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_impl_set_char_encoding(
- axis2_http_out_transport_info_t *http_out_transport_info,
- const axutil_env_t *env,
- const axis2_char_t *encoding)
+ axis2_http_out_transport_info_t * http_out_transport_info,
+ const axutil_env_t * env,
+ const axis2_char_t * encoding)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, encoding, AXIS2_FAILURE);
@@ -78,14 +84,13 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN void AXIS2_CALL
axis2_http_out_transport_info_impl_free(
- axis2_http_out_transport_info_t *http_out_transport_info,
- const axutil_env_t *env)
+ axis2_http_out_transport_info_t * http_out_transport_info,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
- if(http_out_transport_info->response)
+ if (http_out_transport_info->response)
{
axis2_http_simple_response_free(http_out_transport_info->response, env);
}
@@ -99,41 +104,40 @@
AXIS2_EXTERN axis2_http_out_transport_info_t *AXIS2_CALL
axis2_http_out_transport_info_create(
- const axutil_env_t *env,
- axis2_http_simple_response_t *response)
+ const axutil_env_t * env,
+ axis2_http_simple_response_t * response)
{
axis2_http_out_transport_info_t *http_out_transport_info = NULL;
AXIS2_ENV_CHECK(env, NULL);
- http_out_transport_info = (axis2_http_out_transport_info_t *)AXIS2_MALLOC
- (env->allocator, sizeof(
- axis2_http_out_transport_info_t));
+ http_out_transport_info = (axis2_http_out_transport_info_t *) AXIS2_MALLOC
+ (env->allocator, sizeof(axis2_http_out_transport_info_t));
- if (! http_out_transport_info)
+ if (!http_out_transport_info)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
http_out_transport_info->response = response;
http_out_transport_info->encoding = NULL;
- http_out_transport_info->set_char_encoding = NULL;
- http_out_transport_info->set_content_type = NULL;
- http_out_transport_info->free_function = NULL;
-
- http_out_transport_info->set_char_encoding =
- axis2_http_out_transport_info_impl_set_char_encoding;
- http_out_transport_info->set_content_type =
+ http_out_transport_info->set_char_encoding = NULL;
+ http_out_transport_info->set_content_type = NULL;
+ http_out_transport_info->free_function = NULL;
+
+ http_out_transport_info->set_char_encoding =
+ axis2_http_out_transport_info_impl_set_char_encoding;
+ http_out_transport_info->set_content_type =
axis2_http_out_transport_info_impl_set_content_type;
- http_out_transport_info->free_function =
+ http_out_transport_info->free_function =
axis2_http_out_transport_info_impl_free;
-
+
return http_out_transport_info;
}
AXIS2_EXTERN void AXIS2_CALL
axis2_http_out_transport_info_free(
- axis2_http_out_transport_info_t *http_out_transport_info,
- const axutil_env_t *env)
+ axis2_http_out_transport_info_t * http_out_transport_info,
+ const axutil_env_t * env)
{
http_out_transport_info->free_function(http_out_transport_info, env);
return;
@@ -142,7 +146,7 @@
AXIS2_EXTERN void AXIS2_CALL
axis2_http_out_transport_info_free_void_arg(
void *transport_info,
- const axutil_env_t *env)
+ const axutil_env_t * env)
{
axis2_http_out_transport_info_t *transport_info_l = NULL;
@@ -154,50 +158,54 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_set_content_type(
- axis2_http_out_transport_info_t *http_out_transport_info,
- const axutil_env_t *env,
- const axis2_char_t *content_type)
+ axis2_http_out_transport_info_t * http_out_transport_info,
+ const axutil_env_t * env,
+ const axis2_char_t * content_type)
{
- return http_out_transport_info->set_content_type(http_out_transport_info, env, content_type);
+ return http_out_transport_info->set_content_type(http_out_transport_info,
+ env, content_type);
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_set_char_encoding(
- axis2_http_out_transport_info_t *http_out_transport_info,
- const axutil_env_t *env,
- const axis2_char_t *encoding)
+ axis2_http_out_transport_info_t * http_out_transport_info,
+ const axutil_env_t * env,
+ const axis2_char_t * encoding)
{
- return http_out_transport_info->set_char_encoding(http_out_transport_info, env, encoding);
+ return http_out_transport_info->set_char_encoding(http_out_transport_info,
+ env, encoding);
}
AXIS2_EXTERN void AXIS2_CALL
axis2_http_out_transport_info_set_char_encoding_func(
- axis2_http_out_transport_info_t *out_transport_info,
- const axutil_env_t *env,
- axis2_status_t (AXIS2_CALL *set_char_encoding)
- (axis2_http_out_transport_info_t *, const axutil_env_t *,const axis2_char_t *))
+ axis2_http_out_transport_info_t * out_transport_info,
+ const axutil_env_t * env,
+ axis2_status_t(AXIS2_CALL * set_char_encoding)
+ (axis2_http_out_transport_info_t *,
+ const axutil_env_t *,
+ const axis2_char_t *))
{
- out_transport_info->set_char_encoding = set_char_encoding;
+ out_transport_info->set_char_encoding = set_char_encoding;
}
AXIS2_EXTERN void AXIS2_CALL
axis2_http_out_transport_info_set_content_type_func(
- axis2_http_out_transport_info_t *out_transport_info,
- const axutil_env_t *env,
- axis2_status_t (AXIS2_CALL *set_content_type)(
- axis2_http_out_transport_info_t *,
- const axutil_env_t*,const axis2_char_t *))
+ axis2_http_out_transport_info_t * out_transport_info,
+ const axutil_env_t * env,
+ axis2_status_t(AXIS2_CALL *
+ set_content_type) (axis2_http_out_transport_info_t *,
+ const axutil_env_t *,
+ const axis2_char_t *))
{
- out_transport_info->set_content_type = set_content_type;
+ out_transport_info->set_content_type = set_content_type;
}
AXIS2_EXTERN void AXIS2_CALL
axis2_http_out_transport_info_set_free_func(
- axis2_http_out_transport_info_t *out_transport_info,
- const axutil_env_t *env,
- void (AXIS2_CALL *free_function)(axis2_http_out_transport_info_t *,const axutil_env_t*)
- )
+ axis2_http_out_transport_info_t * out_transport_info,
+ const axutil_env_t * env,
+ void (AXIS2_CALL * free_function) (axis2_http_out_transport_info_t *,
+ const axutil_env_t *))
{
- out_transport_info->free_function = free_function;
+ out_transport_info->free_function = free_function;
}
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_request_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_request_line.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_request_line.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_request_line.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,10 +31,10 @@
AXIS2_EXTERN axis2_http_request_line_t *AXIS2_CALL
axis2_http_request_line_create(
- const axutil_env_t *env,
- const axis2_char_t *method,
- const axis2_char_t *uri,
- const axis2_char_t *http_version)
+ const axutil_env_t * env,
+ const axis2_char_t * method,
+ const axis2_char_t * uri,
+ const axis2_char_t * http_version)
{
axis2_http_request_line_t *request_line = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -41,26 +42,26 @@
AXIS2_PARAM_CHECK(env->error, uri, NULL);
AXIS2_PARAM_CHECK(env->error, http_version, NULL);
- request_line = (axis2_http_request_line_t *)AXIS2_MALLOC
- (env->allocator, sizeof(axis2_http_request_line_t));
+ request_line = (axis2_http_request_line_t *) AXIS2_MALLOC
+ (env->allocator, sizeof(axis2_http_request_line_t));
- if (! request_line)
+ if (!request_line)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- request_line->method = (axis2_char_t *)axutil_strdup(env, method);
- request_line->uri = (axis2_char_t *)axutil_strdup(env, uri);
- request_line->http_version = (axis2_char_t *)axutil_strdup(env, http_version);
-
+ request_line->method = (axis2_char_t *) axutil_strdup(env, method);
+ request_line->uri = (axis2_char_t *) axutil_strdup(env, uri);
+ request_line->http_version =
+ (axis2_char_t *) axutil_strdup(env, http_version);
return request_line;
}
void AXIS2_CALL
axis2_http_request_line_free(
- axis2_http_request_line_t *request_line,
- const axutil_env_t *env)
+ axis2_http_request_line_t * request_line,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -83,8 +84,8 @@
AXIS2_EXTERN axis2_http_request_line_t *AXIS2_CALL
axis2_http_request_line_parse_line(
- const axutil_env_t *env,
- const axis2_char_t *str)
+ const axutil_env_t * env,
+ const axis2_char_t * str)
{
axis2_char_t *req_line = NULL;
axis2_char_t *method = NULL;
@@ -98,17 +99,16 @@
tmp = axutil_strstr(str, AXIS2_HTTP_CRLF);
-
- if (! tmp)
+ if (!tmp)
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
- AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
+ AXIS2_FAILURE);
return NULL;
}
i = tmp - str;
req_line = AXIS2_MALLOC(env->allocator, i * sizeof(axis2_char_t) + 1);
- if (! req_line)
+ if (!req_line)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -119,23 +119,23 @@
method = tmp;
tmp = strchr(tmp, ' ');
- if (! tmp)
+ if (!tmp)
{
AXIS2_FREE(env->allocator, req_line);
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
- AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
+ AXIS2_FAILURE);
return NULL;
}
*tmp++ = '\0';
uri = tmp;
tmp = strrchr(tmp, ' ');
- if (! tmp)
+ if (!tmp)
{
AXIS2_FREE(env->allocator, req_line);
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
- AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
+ AXIS2_FAILURE);
return NULL;
}
*tmp++ = '\0';
@@ -146,38 +146,34 @@
return ret;
}
-
axis2_char_t *AXIS2_CALL
axis2_http_request_line_get_method(
- const axis2_http_request_line_t *request_line,
- const axutil_env_t *env)
+ const axis2_http_request_line_t * request_line,
+ const axutil_env_t * env)
{
return request_line->method;
}
-
axis2_char_t *AXIS2_CALL
axis2_http_request_line_get_http_version(
- const axis2_http_request_line_t *request_line,
- const axutil_env_t *env)
+ const axis2_http_request_line_t * request_line,
+ const axutil_env_t * env)
{
return request_line->http_version;
}
-
axis2_char_t *AXIS2_CALL
axis2_http_request_line_get_uri(
- const axis2_http_request_line_t *request_line,
- const axutil_env_t *env)
+ const axis2_http_request_line_t * request_line,
+ const axutil_env_t * env)
{
return request_line->uri;
}
-
axis2_char_t *AXIS2_CALL
axis2_http_request_line_to_string(
- axis2_http_request_line_t *request_line,
- const axutil_env_t *env)
+ axis2_http_request_line_t * request_line,
+ const axutil_env_t * env)
{
int alloc_len = 0;
axis2_char_t *ret = NULL;
@@ -185,13 +181,12 @@
AXIS2_ENV_CHECK(env, NULL);
alloc_len = axutil_strlen(request_line->method) +
- axutil_strlen(request_line->uri) +
- axutil_strlen(request_line->http_version) + 6;
+ axutil_strlen(request_line->uri) +
+ axutil_strlen(request_line->http_version) + 6;
/* 5 = 2 * spaces + '/' +CR + LF + '\0' */
- ret = AXIS2_MALLOC(env->allocator,
- alloc_len * sizeof(axis2_char_t));
- if (! ret)
+ ret = AXIS2_MALLOC(env->allocator, alloc_len * sizeof(axis2_char_t));
+ if (!ret)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_response_writer.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_response_writer.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_response_writer.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -28,49 +29,46 @@
AXIS2_EXTERN axis2_http_response_writer_t *AXIS2_CALL
axis2_http_response_writer_create(
- const axutil_env_t *env,
- axutil_stream_t *stream)
+ const axutil_env_t * env,
+ axutil_stream_t * stream)
{
AXIS2_ENV_CHECK(env, NULL);
return axis2_http_response_writer_create_with_encoding(env, stream,
- AXIS2_HTTP_DEFAULT_CONTENT_CHARSET);
+ AXIS2_HTTP_DEFAULT_CONTENT_CHARSET);
}
AXIS2_EXTERN axis2_http_response_writer_t *AXIS2_CALL
axis2_http_response_writer_create_with_encoding(
- const axutil_env_t *env,
- axutil_stream_t *stream,
- const axis2_char_t *encoding)
+ const axutil_env_t * env,
+ axutil_stream_t * stream,
+ const axis2_char_t * encoding)
{
axis2_http_response_writer_t *response_writer = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, encoding, NULL);
- response_writer = (axis2_http_response_writer_t *)AXIS2_MALLOC
- (env->allocator, sizeof(
- axis2_http_response_writer_t));
+ response_writer = (axis2_http_response_writer_t *) AXIS2_MALLOC
+ (env->allocator, sizeof(axis2_http_response_writer_t));
- if (! response_writer)
+ if (!response_writer)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
response_writer->stream = stream;
- response_writer->encoding = (axis2_char_t *)axutil_strdup(env, encoding);
+ response_writer->encoding = (axis2_char_t *) axutil_strdup(env, encoding);
return response_writer;
}
-
AXIS2_EXTERN void AXIS2_CALL
axis2_http_response_writer_free(
- axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env)
+ axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_FREE(env->allocator,
- response_writer->encoding);
+ AXIS2_FREE(env->allocator, response_writer->encoding);
AXIS2_FREE(env->allocator, response_writer);
@@ -79,44 +77,41 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_response_writer_get_encoding(
- const axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env)
+ const axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
return response_writer->encoding;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_response_writer_close(
- axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env)
+ axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_response_writer_flush(
- axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env)
+ axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_FALSE;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_response_writer_write_char(
- axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env,
+ axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env,
char c)
{
int write = -1;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (! response_writer->stream)
+ if (!response_writer->stream)
{
return AXIS2_FAILURE;
}
@@ -128,11 +123,10 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_response_writer_write_buf(
- axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env,
+ axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env,
char *buf,
int offset,
axis2_ssize_t len)
@@ -141,7 +135,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, buf, AXIS2_FAILURE);
- if (! response_writer->stream)
+ if (!response_writer->stream)
{
return AXIS2_FAILURE;
}
@@ -153,11 +147,10 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_response_writer_print_str(
- axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env,
+ axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env,
const char *str)
{
int write = -1;
@@ -167,7 +160,7 @@
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
len = axutil_strlen(str);
- if (! response_writer->stream)
+ if (!response_writer->stream)
{
return AXIS2_FAILURE;
}
@@ -179,11 +172,10 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_response_writer_print_int(
- axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env,
+ axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env,
int i)
{
axis2_char_t int_str[10];
@@ -192,32 +184,30 @@
return axis2_http_response_writer_print_str(response_writer, env, int_str);
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_response_writer_println_str(
- axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env,
+ axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env,
const char *str)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
if (AXIS2_SUCCESS == axis2_http_response_writer_print_str(response_writer,
- env, str))
+ env, str))
{
return axis2_http_response_writer_print_str(response_writer, env,
- AXIS2_HTTP_CRLF);
+ AXIS2_HTTP_CRLF);
}
return AXIS2_FAILURE;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_response_writer_println(
- axis2_http_response_writer_t *response_writer,
- const axutil_env_t *env)
+ axis2_http_response_writer_t * response_writer,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return axis2_http_response_writer_print_str(response_writer, env,
- AXIS2_HTTP_CRLF);
+ AXIS2_HTTP_CRLF);
}
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_simple_request.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_simple_request.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_simple_request.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_simple_request.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,21 +33,20 @@
AXIS2_EXTERN axis2_http_simple_request_t *AXIS2_CALL
axis2_http_simple_request_create(
- const axutil_env_t *env,
- axis2_http_request_line_t *request_line,
- axis2_http_header_t **http_headers,
+ const axutil_env_t * env,
+ axis2_http_request_line_t * request_line,
+ axis2_http_header_t ** http_headers,
axis2_ssize_t http_hdr_count,
- axutil_stream_t *content)
+ axutil_stream_t * content)
{
axis2_http_simple_request_t *simple_request = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_ENV_CHECK(env, NULL);
- simple_request = (axis2_http_simple_request_t *)AXIS2_MALLOC
- (env->allocator, sizeof(
- axis2_http_simple_request_t));
+ simple_request = (axis2_http_simple_request_t *) AXIS2_MALLOC
+ (env->allocator, sizeof(axis2_http_simple_request_t));
- if (! simple_request)
+ if (!simple_request)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -59,26 +59,26 @@
if (!(simple_request->stream))
{
simple_request->stream = axutil_stream_create_basic(env);
- if (! simple_request->stream)
+ if (!simple_request->stream)
{
axis2_http_simple_request_free((axis2_http_simple_request_t *)
- simple_request, env);
+ simple_request, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
simple_request->owns_stream = AXIS2_TRUE;
}
- if (http_hdr_count > 0 && http_headers)
+ if (http_hdr_count > 0 && http_headers)
{
int i = 0;
simple_request->header_group = axutil_array_list_create(env,
- http_hdr_count);
+ http_hdr_count);
for (i = 0; i < http_hdr_count; i++)
{
axutil_array_list_add(simple_request->header_group, env,
- (void *)http_headers[i]);
+ (void *) http_headers[i]);
}
}
@@ -87,8 +87,8 @@
AXIS2_EXTERN void AXIS2_CALL
axis2_http_simple_request_free(
- axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env)
+ axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -97,8 +97,8 @@
axutil_stream_free(simple_request->stream, env);
}
/*
- Don't free the stream since it belongs to the socket
- */
+ Don't free the stream since it belongs to the socket
+ */
if (simple_request->request_line)
{
axis2_http_request_line_free(simple_request->request_line, env);
@@ -108,10 +108,12 @@
int i = 0;
axis2_http_header_t *tmp = NULL;
for (i = 0; i < axutil_array_list_size(simple_request->header_group,
- env); i++)
+ env); i++)
{
- tmp = (axis2_http_header_t *)axutil_array_list_get(
- simple_request->header_group, env, i);
+ tmp =
+ (axis2_http_header_t *) axutil_array_list_get(simple_request->
+ header_group, env,
+ i);
axis2_http_header_free(tmp, env);
}
@@ -125,18 +127,17 @@
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 axutil_env_t *env)
+ const axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env)
{
return simple_request->request_line;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_simple_request_set_request_line(
- axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env,
- axis2_http_request_line_t *request_line)
+ axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env,
+ axis2_http_request_line_t * request_line)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, request_line, AXIS2_FAILURE);
@@ -144,12 +145,11 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_simple_request_contains_header(
- axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env,
- const axis2_char_t *name)
+ axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env,
+ const axis2_char_t * name)
{
int i = 0;
axis2_char_t *header_name = NULL;
@@ -158,7 +158,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
- if (! simple_request->header_group)
+ if (!simple_request->header_group)
{
return AXIS2_FALSE;
}
@@ -173,29 +173,28 @@
for (i = 0; i < count; i++)
{
header_name = axis2_http_header_get_name((axis2_http_header_t *)
- axutil_array_list_get(simple_request->header_group,
- env, i), env);
+ axutil_array_list_get
+ (simple_request->header_group,
+ env, i), env);
if (0 == axutil_strcasecmp(name, header_name))
return AXIS2_TRUE;
}
return AXIS2_FALSE;
}
-
AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_http_simple_request_get_headers(
- const axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env)
+ const axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env)
{
return simple_request->header_group;
}
-
AXIS2_EXTERN axis2_http_header_t *AXIS2_CALL
axis2_http_simple_request_get_first_header(
- const axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env,
- const axis2_char_t *str)
+ const axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env,
+ const axis2_char_t * str)
{
axutil_array_list_t *header_group = NULL;
int i = 0;
@@ -207,7 +206,7 @@
AXIS2_PARAM_CHECK(env->error, str, NULL);
header_group = simple_request->header_group;
- if (! simple_request->header_group)
+ if (!simple_request->header_group)
{
return NULL;
}
@@ -216,15 +215,13 @@
return NULL;
}
-
count = axutil_array_list_size(header_group, env);
-
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
- env, i);
+ tmp_header = (axis2_http_header_t *) axutil_array_list_get(header_group,
+ env, i);
tmp_name = axis2_http_header_get_name(tmp_header, env);
if (0 == axutil_strcasecmp(str, tmp_name))
{
@@ -234,12 +231,11 @@
return NULL;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_simple_request_remove_headers(
- axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env,
- const axis2_char_t *str)
+ axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env,
+ const axis2_char_t * str)
{
axis2_http_header_t *tmp_header = NULL;
axis2_char_t *tmp_name = NULL;
@@ -252,7 +248,7 @@
header_group = simple_request->header_group;
- if (! header_group)
+ if (!header_group)
{
/* Even though we couldn't complete the op, we are sure that the
* requred header is no more in the request. So we can proceed without a
@@ -265,8 +261,8 @@
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
- env, i);
+ tmp_header = (axis2_http_header_t *) axutil_array_list_get(header_group,
+ env, i);
tmp_name = axis2_http_header_get_name(tmp_header, env);
if (0 == axutil_strcasecmp(str, tmp_name))
{
@@ -278,58 +274,55 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_simple_request_add_header(
- axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env,
- axis2_http_header_t *header)
+ axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env,
+ axis2_http_header_t * header)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, header, AXIS2_FAILURE);
- if (! simple_request->header_group)
+ if (!simple_request->header_group)
{
simple_request->header_group = axutil_array_list_create(env, 1);
}
- return axutil_array_list_add(simple_request->header_group,
- env, header);
+ return axutil_array_list_add(simple_request->header_group, env, header);
}
-
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
axis2_http_simple_request_get_content_type(
- const axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env)
+ const axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env)
{
axis2_http_header_t *tmp_header = NULL;
AXIS2_ENV_CHECK(env, NULL);
tmp_header = axis2_http_simple_request_get_first_header
- (simple_request, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
+ (simple_request, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if (tmp_header)
return axis2_http_header_get_value(tmp_header, env);
return AXIS2_HTTP_HEADER_ACCEPT_TEXT_PLAIN;
}
-
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
axis2_http_simple_request_get_charset(
- const axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env)
+ const axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env)
{
- axis2_http_header_t *tmp_header = NULL;
+ axis2_http_header_t *tmp_header = NULL;
AXIS2_ENV_CHECK(env, NULL);
tmp_header = axis2_http_simple_request_get_first_header
- (simple_request, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
+ (simple_request, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if (tmp_header)
{
axis2_char_t *value = axis2_http_header_get_value(tmp_header, env);
- axis2_char_t *charset = (axis2_char_t *)strstr((char *)value,
- (char *)AXIS2_HTTP_CHAR_SET_ENCODING);
+ axis2_char_t *charset = (axis2_char_t *) strstr((char *) value,
+ (char *)
+ AXIS2_HTTP_CHAR_SET_ENCODING);
if (charset)
{
- charset = strchr((char *)charset, '=');
+ charset = strchr((char *) charset, '=');
return charset;
}
}
@@ -337,16 +330,15 @@
return AXIS2_HTTP_DEFAULT_CONTENT_CHARSET;
}
-
AXIS2_EXTERN axis2_ssize_t AXIS2_CALL
axis2_http_simple_request_get_content_length(
- const axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env)
+ const axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env)
{
axis2_http_header_t *tmp_header = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
tmp_header = axis2_http_simple_request_get_first_header
- (simple_request, env, AXIS2_HTTP_HEADER_CONTENT_LENGTH);
+ (simple_request, env, AXIS2_HTTP_HEADER_CONTENT_LENGTH);
if (tmp_header)
{
return AXIS2_ATOI(axis2_http_header_get_value(tmp_header, env));
@@ -354,20 +346,18 @@
return -1;
}
-
AXIS2_EXTERN axutil_stream_t *AXIS2_CALL
axis2_http_simple_request_get_body(
- const axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env)
+ const axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env)
{
return simple_request->stream;
}
-
AXIS2_EXTERN axis2_ssize_t AXIS2_CALL
axis2_http_simple_request_get_body_bytes(
- const axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env,
+ const axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env,
char **buf)
{
axutil_stream_t *body = NULL;
@@ -380,16 +370,16 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
body = simple_request->stream;
- if (! body)
+ if (!body)
{
- *buf = (char*)AXIS2_MALLOC(env->allocator, 1);
+ *buf = (char *) AXIS2_MALLOC(env->allocator, 1);
*buf[0] = '\0';
return 0;
}
length = axis2_http_simple_request_get_content_length(simple_request, env);
if (length > 0)
{
- *buf = (char*)AXIS2_MALLOC(env->allocator, length + 1);
+ *buf = (char *) AXIS2_MALLOC(env->allocator, length + 1);
read_len = axutil_stream_read(body, env, *buf, length + 1);
return read_len;
}
@@ -415,8 +405,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_simple_request_set_body_string(
- axis2_http_simple_request_t *simple_request,
- const axutil_env_t *env,
+ axis2_http_simple_request_t * simple_request,
+ const axutil_env_t * env,
void *str,
unsigned int str_len)
{
@@ -425,10 +415,10 @@
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
body_stream = simple_request->stream;
- if (! body_stream)
+ if (!body_stream)
{
body_stream = axutil_stream_create_basic(env);
- if (! body_stream)
+ if (!body_stream)
{
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_simple_response.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_simple_response.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_simple_response.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_simple_response.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,11 +33,11 @@
AXIS2_EXTERN axis2_http_simple_response_t *AXIS2_CALL
axis2_http_simple_response_create(
- const axutil_env_t *env,
- axis2_http_status_line_t *status_line,
- const axis2_http_header_t **http_headers,
+ const axutil_env_t * env,
+ axis2_http_status_line_t * status_line,
+ const axis2_http_header_t ** http_headers,
const axis2_ssize_t http_hdr_count,
- axutil_stream_t *content)
+ axutil_stream_t * content)
{
axis2_http_simple_response_t *ret = NULL;
axis2_http_simple_response_t *simple_response = NULL;
@@ -44,28 +45,28 @@
AXIS2_ENV_CHECK(env, NULL);
ret = axis2_http_simple_response_create_default(env);
- if (! ret)
+ if (!ret)
{
return NULL;
}
simple_response = ret;
- if (! simple_response)
+ if (!simple_response)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
simple_response->status_line = status_line;
- if (http_hdr_count > 0 && http_headers)
+ if (http_hdr_count > 0 && http_headers)
{
int i = 0;
simple_response->header_group = axutil_array_list_create(env,
- http_hdr_count);
+ http_hdr_count);
for (i = 0; i < http_hdr_count; i++)
{
axutil_array_list_add(simple_response->header_group, env,
- (void *)http_headers[i]);
+ (void *) http_headers[i]);
}
}
simple_response->stream = content;
@@ -73,17 +74,15 @@
return ret;
}
-
AXIS2_EXTERN axis2_http_simple_response_t *AXIS2_CALL
axis2_http_simple_response_create_default(
- const axutil_env_t *env)
+ const axutil_env_t * env)
{
axis2_http_simple_response_t *simple_response = NULL;
AXIS2_ENV_CHECK(env, NULL);
- simple_response = (axis2_http_simple_response_t *)AXIS2_MALLOC
- (env->allocator, sizeof(
- axis2_http_simple_response_t));
+ simple_response = (axis2_http_simple_response_t *) AXIS2_MALLOC
+ (env->allocator, sizeof(axis2_http_simple_response_t));
simple_response->status_line = NULL;
simple_response->header_group = NULL;
@@ -94,8 +93,8 @@
void AXIS2_CALL
axis2_http_simple_response_free(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -108,10 +107,12 @@
int i = 0;
axis2_http_header_t *tmp = NULL;
for (i = 0; i < axutil_array_list_size(simple_response->header_group,
- env); i++)
+ env); i++)
{
- tmp = (axis2_http_header_t *)axutil_array_list_get(
- simple_response->header_group, env, i);
+ tmp =
+ (axis2_http_header_t *) axutil_array_list_get(simple_response->
+ header_group, env,
+ i);
if (tmp)
{
axis2_http_header_free(tmp, env);
@@ -130,11 +131,11 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_status_line(
- struct axis2_http_simple_response *simple_response,
- const axutil_env_t *env,
- const axis2_char_t *http_ver,
+ struct axis2_http_simple_response * simple_response,
+ const axutil_env_t * env,
+ const axis2_char_t * http_ver,
const int status_code,
- const axis2_char_t *phrase)
+ const axis2_char_t * phrase)
{
axis2_char_t *tmp_status_line_str = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -143,8 +144,9 @@
AXIS2_PARAM_CHECK(env->error, phrase, AXIS2_FAILURE);
tmp_status_line_str = AXIS2_MALLOC(env->allocator,
- (axutil_strlen(http_ver) + axutil_strlen(phrase) + 8) *
- sizeof(axis2_char_t *));
+ (axutil_strlen(http_ver) +
+ axutil_strlen(phrase) +
+ 8) * sizeof(axis2_char_t *));
sprintf(tmp_status_line_str, "%s %3d %s%s", http_ver, status_code, phrase,
AXIS2_HTTP_CRLF);
if (simple_response->status_line)
@@ -153,60 +155,59 @@
simple_response->status_line = NULL;
}
simple_response->status_line = axis2_http_status_line_create(env,
- tmp_status_line_str);
+ tmp_status_line_str);
AXIS2_FREE(env->allocator, tmp_status_line_str);
- if (! simple_response->status_line)
+ if (!simple_response->status_line)
{
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
}
-
axis2_char_t *AXIS2_CALL
axis2_http_simple_response_get_phrase(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
if (!(simple_response->status_line))
{
return NULL;
}
- return axis2_http_status_line_get_reason_phrase(simple_response->status_line, env);
+ return axis2_http_status_line_get_reason_phrase(simple_response->
+ status_line, env);
}
-
int AXIS2_CALL
axis2_http_simple_response_get_status_code(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
if (!(simple_response->status_line))
{
return -1;
}
- return axis2_http_status_line_get_status_code(simple_response->status_line, env);
+ return axis2_http_status_line_get_status_code(simple_response->status_line,
+ env);
}
-
axis2_char_t *AXIS2_CALL
axis2_http_simple_response_get_http_version(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
if (!(simple_response->status_line))
{
return NULL;
}
- return axis2_http_status_line_get_http_version(simple_response->status_line, env);
+ return axis2_http_status_line_get_http_version(simple_response->status_line,
+ env);
}
-
axis2_char_t *AXIS2_CALL
axis2_http_simple_response_get_status_line(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
if (!(simple_response->status_line))
@@ -218,17 +219,17 @@
axutil_array_list_t *AXIS2_CALL
axis2_http_simple_response_get_headers(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
return simple_response->header_group;
}
axis2_http_header_t *AXIS2_CALL
axis2_http_simple_response_get_first_header(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env,
- const axis2_char_t *str)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env,
+ const axis2_char_t * str)
{
axis2_http_header_t *tmp_header = NULL;
axis2_char_t *tmp_name = NULL;
@@ -240,7 +241,7 @@
AXIS2_PARAM_CHECK(env->error, str, NULL);
header_group = simple_response->header_group;
- if (! simple_response->header_group)
+ if (!simple_response->header_group)
{
return NULL;
}
@@ -253,8 +254,8 @@
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
- env, i);
+ tmp_header = (axis2_http_header_t *) axutil_array_list_get(header_group,
+ env, i);
tmp_name = axis2_http_header_get_name(tmp_header, env);
if (0 == axutil_strcasecmp(str, tmp_name))
{
@@ -265,12 +266,11 @@
}
-
axis2_status_t AXIS2_CALL
axis2_http_simple_response_remove_headers(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env,
- const axis2_char_t *str)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env,
+ const axis2_char_t * str)
{
axutil_array_list_t *header_group = NULL;
axis2_http_header_t *tmp_header = NULL;
@@ -282,7 +282,7 @@
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
header_group = simple_response->header_group;
- if (! header_group)
+ if (!header_group)
{
/* Even though we couldn't complete the op, we are sure that the
* requred header is no more in the request. So we can proceed without a
@@ -293,11 +293,10 @@
count = axutil_array_list_size(header_group, env);
-
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
- env, i);
+ tmp_header = (axis2_http_header_t *) axutil_array_list_get(header_group,
+ env, i);
tmp_name = axis2_http_header_get_name(tmp_header, env);
if (0 == axutil_strcasecmp(str, tmp_name))
{
@@ -311,9 +310,9 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_header(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env,
- axis2_http_header_t *header)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env,
+ axis2_http_header_t * header)
{
int i = 0;
int count = 0;
@@ -324,7 +323,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, header, AXIS2_FAILURE);
- if (! simple_response->header_group)
+ if (!simple_response->header_group)
{
simple_response->header_group = axutil_array_list_create(env, 10);
axutil_array_list_add(simple_response->header_group, env, header);
@@ -339,40 +338,39 @@
count = axutil_array_list_size(header_group, env);
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
- env, i);
+ tmp_header = (axis2_http_header_t *) axutil_array_list_get(header_group,
+ env, i);
tmp_name = axis2_http_header_get_name(tmp_header, env);
if (0 == axutil_strcasecmp(axis2_http_header_get_name(header, env),
- tmp_name))
+ tmp_name))
{
axis2_http_header_free(tmp_header, env);
axutil_array_list_remove(header_group, env, i);
break;
}
}
- axutil_array_list_add(simple_response->header_group, env,
- (void *)header);
+ axutil_array_list_add(simple_response->header_group, env, (void *) header);
return AXIS2_SUCCESS;
}
-
const axis2_char_t *AXIS2_CALL
axis2_http_simple_response_get_charset(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
axis2_http_header_t *tmp_header = NULL;
AXIS2_ENV_CHECK(env, NULL);
tmp_header = axis2_http_simple_response_get_first_header
- (simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
+ (simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if (tmp_header)
{
axis2_char_t *value = axis2_http_header_get_value(tmp_header, env);
- axis2_char_t *charset = (axis2_char_t *)strstr((char *)value,
- (char *)AXIS2_HTTP_CHAR_SET_ENCODING);
+ axis2_char_t *charset = (axis2_char_t *) strstr((char *) value,
+ (char *)
+ AXIS2_HTTP_CHAR_SET_ENCODING);
if (charset)
{
- charset = strchr((char *)charset, '=');
+ charset = strchr((char *) charset, '=');
return charset;
}
}
@@ -380,16 +378,15 @@
return AXIS2_HTTP_DEFAULT_CONTENT_CHARSET;
}
-
axis2_ssize_t AXIS2_CALL
axis2_http_simple_response_get_content_length(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
axis2_http_header_t *tmp_header = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
tmp_header = axis2_http_simple_response_get_first_header
- (simple_response, env, AXIS2_HTTP_HEADER_CONTENT_LENGTH);
+ (simple_response, env, AXIS2_HTTP_HEADER_CONTENT_LENGTH);
if (tmp_header)
{
return AXIS2_ATOI(axis2_http_header_get_value(tmp_header, env));
@@ -397,38 +394,36 @@
return -1;
}
-
const axis2_char_t *AXIS2_CALL
axis2_http_simple_response_get_content_type(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
axis2_http_header_t *tmp_header = NULL;
AXIS2_ENV_CHECK(env, NULL);
- tmp_header = axis2_http_simple_response_get_first_header
- (simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
+ tmp_header = axis2_http_simple_response_get_first_header
+ (simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if (tmp_header)
return axis2_http_header_get_value(tmp_header, env);
return AXIS2_HTTP_HEADER_ACCEPT_TEXT_PLAIN;
}
-
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_body_string(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env,
- axis2_char_t *str)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env,
+ axis2_char_t * str)
{
axutil_stream_t *body_stream = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
body_stream = simple_response->stream;
- if (! body_stream)
+ if (!body_stream)
{
body_stream = axutil_stream_create_basic(env);
- if (! body_stream)
+ if (!body_stream)
{
return AXIS2_FAILURE;
}
@@ -440,9 +435,9 @@
axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_body_stream(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env,
- axutil_stream_t *stream)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env,
+ axutil_stream_t * stream)
{
/*
* We don't free the stream
@@ -455,25 +450,24 @@
axutil_stream_t *AXIS2_CALL
axis2_http_simple_response_get_body(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env)
{
return simple_response->stream;
}
-
axis2_ssize_t AXIS2_CALL
axis2_http_simple_response_get_body_bytes(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env,
- axis2_char_t **buffer)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env,
+ axis2_char_t ** buffer)
{
axutil_stream_t *tmp_stream = NULL;
int return_size = -1;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (! simple_response->stream)
+ if (!simple_response->stream)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_BODY, AXIS2_FAILURE);
return -1;
@@ -485,7 +479,9 @@
int write = 0;
/* int AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE = 32; */
char buf[AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE];
- read = axutil_stream_read(simple_response->stream, env, buf, AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE);
+ read =
+ axutil_stream_read(simple_response->stream, env, buf,
+ AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE);
if (read < 0)
{
break;
@@ -500,10 +496,10 @@
if (return_size > 0)
{
- *buffer = (char *)AXIS2_MALLOC(env->allocator, sizeof(char) *
- (return_size + 1));
+ *buffer = (char *) AXIS2_MALLOC(env->allocator, sizeof(char) *
+ (return_size + 1));
return_size = axutil_stream_read(tmp_stream, env, *buffer,
- return_size + 1);
+ return_size + 1);
}
axutil_stream_free(tmp_stream, env);
return return_size;
@@ -511,9 +507,9 @@
axis2_bool_t AXIS2_CALL
axis2_http_simple_response_contains_header(
- axis2_http_simple_response_t *simple_response,
- const axutil_env_t *env,
- const axis2_char_t *name)
+ axis2_http_simple_response_t * simple_response,
+ const axutil_env_t * env,
+ const axis2_char_t * name)
{
axis2_char_t *header_name = NULL;
int count = 0;
@@ -521,7 +517,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
- if (! simple_response->header_group)
+ if (!simple_response->header_group)
{
return AXIS2_FALSE;
}
@@ -534,8 +530,9 @@
for (i = 0; i < count; i++)
{
header_name = axis2_http_header_get_name((axis2_http_header_t *)
- axutil_array_list_get(simple_response->header_group,
- env, i), env);
+ axutil_array_list_get
+ (simple_response->header_group,
+ env, i), env);
if (0 == axutil_strcasecmp(name, header_name))
return AXIS2_TRUE;
}
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_status_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_status_line.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_status_line.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_status_line.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,8 +32,8 @@
AXIS2_EXTERN axis2_http_status_line_t *AXIS2_CALL
axis2_http_status_line_create(
- const axutil_env_t *env,
- const axis2_char_t *str)
+ const axutil_env_t * env,
+ const axis2_char_t * str)
{
axis2_char_t *tmp_status_line = NULL;
axis2_char_t *reason_phrase = NULL;
@@ -40,89 +41,86 @@
axis2_char_t *http_version = NULL;
int i = 0;
axis2_char_t *tmp = NULL;
- axis2_http_status_line_t *status_line = NULL;
+ axis2_http_status_line_t *status_line = NULL;
AXIS2_ENV_CHECK(env, NULL);
- status_line = (axis2_http_status_line_t *)AXIS2_MALLOC
- (env->allocator, sizeof(
- axis2_http_status_line_t));
+ status_line = (axis2_http_status_line_t *) AXIS2_MALLOC
+ (env->allocator, sizeof(axis2_http_status_line_t));
- if (! status_line)
+ if (!status_line)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- status_line->line = (axis2_char_t *)axutil_strdup(env, str);
+ status_line->line = (axis2_char_t *) axutil_strdup(env, str);
status_line->http_version = NULL;
status_line->reason_phrase = NULL;
status_line->status_code = NULL;
tmp = strstr(str, AXIS2_HTTP_CRLF);
- if (! tmp)
+ if (!tmp)
{
axis2_http_status_line_free((axis2_http_status_line_t *)
- status_line, env);
+ status_line, env);
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
- AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
+ AXIS2_FAILURE);
return NULL;
}
i = tmp - str;
tmp_status_line = AXIS2_MALLOC(env->allocator,
- i * sizeof(axis2_char_t) + 1);
- if (! tmp_status_line)
+ i * sizeof(axis2_char_t) + 1);
+ if (!tmp_status_line)
{
axis2_http_status_line_free((axis2_http_status_line_t *)
- status_line, env);
+ status_line, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- memcpy(tmp_status_line, str, i *sizeof(axis2_char_t));
+ memcpy(tmp_status_line, str, i * sizeof(axis2_char_t));
tmp_status_line[i] = '\0';
tmp = tmp_status_line;
http_version = tmp;
tmp = strchr(tmp, ' ');
- if (! tmp)
+ if (!tmp)
{
AXIS2_FREE(env->allocator, tmp_status_line);
axis2_http_status_line_free((axis2_http_status_line_t *)
- status_line, env);
+ status_line, env);
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
- AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
+ AXIS2_FAILURE);
return NULL;
}
*tmp++ = '\0';
status_code = tmp;
tmp = strchr(tmp, ' ');
- if (! tmp)
+ if (!tmp)
{
AXIS2_FREE(env->allocator, tmp_status_line);
axis2_http_status_line_free((axis2_http_status_line_t *)
- status_line, env);
+ status_line, env);
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
- AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
+ AXIS2_FAILURE);
return NULL;
}
*tmp++ = '\0';
reason_phrase = tmp;
status_line->http_version = (axis2_char_t *)
- axutil_strdup(env, http_version);
- status_line->status_code = (axis2_char_t *)
- axutil_strdup(env, status_code);
+ axutil_strdup(env, http_version);
+ status_line->status_code = (axis2_char_t *) axutil_strdup(env, status_code);
status_line->reason_phrase = (axis2_char_t *)
- axutil_strdup(env, reason_phrase);
+ axutil_strdup(env, reason_phrase);
- if (! status_line->http_version ||
- ! status_line->reason_phrase)
+ if (!status_line->http_version || !status_line->reason_phrase)
{
AXIS2_FREE(env->allocator, tmp_status_line);
axis2_http_status_line_free((axis2_http_status_line_t *)
- status_line, env);
+ status_line, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -133,8 +131,8 @@
AXIS2_EXTERN void AXIS2_CALL
axis2_http_status_line_free(
- axis2_http_status_line_t *status_line,
- const axutil_env_t *env)
+ axis2_http_status_line_t * status_line,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -161,8 +159,8 @@
AXIS2_EXTERN int AXIS2_CALL
axis2_http_status_line_get_status_code(
- const axis2_http_status_line_t *status_line,
- const axutil_env_t *env)
+ const axis2_http_status_line_t * status_line,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
if (status_line->status_code)
@@ -178,25 +176,24 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_status_line_get_http_version(
- const axis2_http_status_line_t *status_line,
- const axutil_env_t *env)
+ const axis2_http_status_line_t * status_line,
+ const axutil_env_t * env)
{
return status_line->http_version;
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_status_line_get_reason_phrase(
- const axis2_http_status_line_t *status_line,
- const axutil_env_t *env)
+ const axis2_http_status_line_t * status_line,
+ const axutil_env_t * env)
{
return status_line->reason_phrase;
}
-
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_status_line_starts_with_http(
- axis2_http_status_line_t *status_line,
- const axutil_env_t *env)
+ axis2_http_status_line_t * status_line,
+ const axutil_env_t * env)
{
if (0 == axutil_strncasecmp(status_line->line, "HTTP", 4))
{
@@ -207,8 +204,8 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_status_line_to_string(
- axis2_http_status_line_t *status_line,
- const axutil_env_t *env)
+ axis2_http_status_line_t * status_line,
+ const axutil_env_t * env)
{
return status_line->line;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org