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 pi...@apache.org on 2008/03/18 10:37:29 UTC
svn commit: r638286 - in /webservices/axis2/trunk/c/util/src: array_list.c
base64_binary.c date_time.c dll_desc.c duration.c error.c file.c
file_handler.c generic_obj.c http_chunked_stream.c linked_list.c
Author: pini
Date: Tue Mar 18 02:37:28 2008
New Revision: 638286
URL: http://svn.apache.org/viewvc?rev=638286&view=rev
Log:
Formatted the code and added relevant log messages
Modified:
webservices/axis2/trunk/c/util/src/array_list.c
webservices/axis2/trunk/c/util/src/base64_binary.c
webservices/axis2/trunk/c/util/src/date_time.c
webservices/axis2/trunk/c/util/src/dll_desc.c
webservices/axis2/trunk/c/util/src/duration.c
webservices/axis2/trunk/c/util/src/error.c
webservices/axis2/trunk/c/util/src/file.c
webservices/axis2/trunk/c/util/src/file_handler.c
webservices/axis2/trunk/c/util/src/generic_obj.c
webservices/axis2/trunk/c/util/src/http_chunked_stream.c
webservices/axis2/trunk/c/util/src/linked_list.c
Modified: webservices/axis2/trunk/c/util/src/array_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/array_list.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/array_list.c (original)
+++ webservices/axis2/trunk/c/util/src/array_list.c Tue Mar 18 02:37:28 2008
@@ -43,7 +43,7 @@
if (!array_list)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
@@ -59,7 +59,7 @@
{
axutil_array_list_free(array_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
array_list->capacity = capacity;
@@ -83,7 +83,7 @@
if (!data)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return AXIS2_FAILURE;
}
memcpy(data, array_list->data, sizeof(void *) * array_list->capacity);
Modified: webservices/axis2/trunk/c/util/src/base64_binary.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/base64_binary.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/base64_binary.c (original)
+++ webservices/axis2/trunk/c/util/src/base64_binary.c Tue Mar 18 02:37:28 2008
@@ -39,7 +39,7 @@
if (!base64_binary)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
base64_binary->plain_binary = NULL;
@@ -62,7 +62,7 @@
if (!base64_binary)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
@@ -73,7 +73,7 @@
{
axutil_base64_binary_free(base64_binary, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
memcpy(base64_binary->plain_binary, plain_binary, plain_binary_len);
@@ -97,7 +97,7 @@
if (!base64_binary)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
@@ -109,7 +109,7 @@
{
axutil_base64_binary_free(base64_binary, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
axutil_base64_decode_binary(base64_binary->plain_binary, encoded_binary);
@@ -159,7 +159,7 @@
{
axutil_base64_binary_free(base64_binary, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return AXIS2_FAILURE;
}
memcpy(base64_binary->plain_binary, plain_binary,
@@ -199,7 +199,7 @@
{
axutil_base64_binary_free(base64_binary, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return AXIS2_FAILURE;
}
axutil_base64_decode_binary(base64_binary->plain_binary, encoded_binary);
@@ -226,7 +226,7 @@
{
axutil_base64_binary_free(base64_binary, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
axutil_base64_encode_binary(encoded_binary, base64_binary->plain_binary,
Modified: webservices/axis2/trunk/c/util/src/date_time.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/date_time.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/date_time.c (original)
+++ webservices/axis2/trunk/c/util/src/date_time.c Tue Mar 18 02:37:28 2008
@@ -54,7 +54,7 @@
if (!date_time)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
Modified: webservices/axis2/trunk/c/util/src/dll_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dll_desc.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Tue Mar 18 02:37:28 2008
@@ -47,7 +47,7 @@
if (!dll_desc)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
Modified: webservices/axis2/trunk/c/util/src/duration.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/duration.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/duration.c (original)
+++ webservices/axis2/trunk/c/util/src/duration.c Tue Mar 18 02:37:28 2008
@@ -59,7 +59,7 @@
if (!duration)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
@@ -127,7 +127,7 @@
if (!duration)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
Modified: webservices/axis2/trunk/c/util/src/error.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/error.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/error.c (original)
+++ webservices/axis2/trunk/c/util/src/error.c Tue Mar 18 02:37:28 2008
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: webservices/axis2/trunk/c/util/src/file.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/file.c (original)
+++ webservices/axis2/trunk/c/util/src/file.c Tue Mar 18 02:37:28 2008
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -40,7 +39,7 @@
if (!file)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
file->name = NULL;
@@ -55,8 +54,6 @@
axutil_file_t *file,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (file->name)
{
AXIS2_FREE(env->allocator, file->name);
@@ -80,7 +77,6 @@
const axutil_env_t *env,
axis2_char_t *name)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
if (file->name)
@@ -92,7 +88,7 @@
if (!file->name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -118,7 +114,6 @@
const axutil_env_t *env,
axis2_char_t *path)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (!path)
{
return AXIS2_SUCCESS;
@@ -133,7 +128,7 @@
if (!(file->path))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -179,7 +174,6 @@
{
axutil_file_t *new_file = NULL;
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, NULL);
new_file = axutil_file_create(env);
status = axutil_file_set_name(new_file, env, file->name);
if (AXIS2_SUCCESS != status)
@@ -194,3 +188,4 @@
axutil_file_set_timestamp(new_file, env, file->timestamp);
return new_file;
}
+
Modified: webservices/axis2/trunk/c/util/src/file_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file_handler.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/file_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/file_handler.c Tue Mar 18 02:37:28 2008
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -26,8 +25,8 @@
AXIS2_EXTERN void *AXIS2_CALL
axutil_file_handler_open(
- const axis2_char_t * file_name,
- const axis2_char_t * options)
+ const axis2_char_t *file_name,
+ const axis2_char_t *options)
{
FILE *file_ptr;
@@ -52,7 +51,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axutil_file_handler_access(
- const axis2_char_t * path,
+ const axis2_char_t *path,
int mode)
{
int i = 0;
Modified: webservices/axis2/trunk/c/util/src/generic_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/generic_obj.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/generic_obj.c (original)
+++ webservices/axis2/trunk/c/util/src/generic_obj.c Tue Mar 18 02:37:28 2008
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -27,18 +26,18 @@
AXIS2_EXTERN axutil_generic_obj_t *AXIS2_CALL
axutil_generic_obj_create(
- const axutil_env_t * env)
+ const axutil_env_t *env)
{
axutil_generic_obj_t *generic_obj = NULL;
AXIS2_ENV_CHECK(env, NULL);
- generic_obj =
- (axutil_generic_obj_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axutil_generic_obj_t));
+ generic_obj = (axutil_generic_obj_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_generic_obj_t));
if (!generic_obj)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
generic_obj->value = NULL;
@@ -49,11 +48,9 @@
AXIS2_EXTERN void AXIS2_CALL
axutil_generic_obj_free(
- axutil_generic_obj_t * generic_obj,
- const axutil_env_t * env)
+ axutil_generic_obj_t *generic_obj,
+ const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (generic_obj->value)
{
if (generic_obj->free_func)
@@ -76,8 +73,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axutil_generic_obj_set_free_func(
- axutil_generic_obj_t * generic_obj,
- const axutil_env_t * env,
+ axutil_generic_obj_t *generic_obj,
+ const axutil_env_t *env,
AXIS2_FREE_VOID_ARG free_func)
{
generic_obj->free_func = free_func;
@@ -86,8 +83,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axutil_generic_obj_set_value(
- axutil_generic_obj_t * generic_obj,
- const axutil_env_t * env,
+ axutil_generic_obj_t *generic_obj,
+ const axutil_env_t *env,
void *value)
{
generic_obj->value = value;
@@ -96,16 +93,16 @@
AXIS2_EXTERN void *AXIS2_CALL
axutil_generic_obj_get_value(
- axutil_generic_obj_t * generic_obj,
- const axutil_env_t * env)
+ axutil_generic_obj_t *generic_obj,
+ const axutil_env_t *env)
{
return generic_obj->value;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axutil_generic_obj_set_type(
- axutil_generic_obj_t * generic_obj,
- const axutil_env_t * env,
+ axutil_generic_obj_t *generic_obj,
+ const axutil_env_t *env,
int type)
{
generic_obj->type = type;
@@ -114,8 +111,9 @@
AXIS2_EXTERN int AXIS2_CALL
axutil_generic_obj_get_type(
- axutil_generic_obj_t * generic_obj,
- const axutil_env_t * env)
+ axutil_generic_obj_t *generic_obj,
+ const axutil_env_t *env)
{
return generic_obj->type;
}
+
Modified: webservices/axis2/trunk/c/util/src/http_chunked_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/http_chunked_stream.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/http_chunked_stream.c (original)
+++ webservices/axis2/trunk/c/util/src/http_chunked_stream.c Tue Mar 18 02:37:28 2008
@@ -50,7 +50,7 @@
if (!chunked_stream)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
chunked_stream->stream = stream;
Modified: webservices/axis2/trunk/c/util/src/linked_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/linked_list.c?rev=638286&r1=638285&r2=638286&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/linked_list.c (original)
+++ webservices/axis2/trunk/c/util/src/linked_list.c Tue Mar 18 02:37:28 2008
@@ -64,7 +64,7 @@
if (!linked_list)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
@@ -85,7 +85,7 @@
if (!entry)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org