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 2006/06/04 17:00:40 UTC
svn commit: r411574 - in /webservices/axis2/trunk/c/util: include/ src/
Author: samisa
Date: Sun Jun 4 08:00:39 2006
New Revision: 411574
URL: http://svn.apache.org/viewvc?rev=411574&view=rev
Log:
Fixed -Wwrite-strings related warnings
Modified:
webservices/axis2/trunk/c/util/include/axis2_env.h
webservices/axis2/trunk/c/util/include/axis2_error.h
webservices/axis2/trunk/c/util/include/axis2_generic_obj.h
webservices/axis2/trunk/c/util/include/axis2_log_default.h
webservices/axis2/trunk/c/util/include/axis2_string.h
webservices/axis2/trunk/c/util/include/axis2_url.h
webservices/axis2/trunk/c/util/src/dll_desc.c
webservices/axis2/trunk/c/util/src/env.c
webservices/axis2/trunk/c/util/src/error.c
webservices/axis2/trunk/c/util/src/generic_obj.c
webservices/axis2/trunk/c/util/src/log.c
webservices/axis2/trunk/c/util/src/string.c
webservices/axis2/trunk/c/util/src/string_util.c
webservices/axis2/trunk/c/util/src/url.c
Modified: webservices/axis2/trunk/c/util/include/axis2_env.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_env.h?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_env.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_env.h Sun Jun 4 08:00:39 2006
@@ -76,8 +76,8 @@
* @param log_level log level to be used
* @return pointer to the newly created environment struct
*/
- AXIS2_EXTERN axis2_env_t * AXIS2_CALL axis2_env_create_all (axis2_char_t *log_file,
- axis2_log_levels_t log_level);
+ AXIS2_EXTERN axis2_env_t * AXIS2_CALL axis2_env_create_all (const axis2_char_t *log_file,
+ const axis2_log_levels_t log_level);
/**
* Creates an environment struct. Users of axis2 should not use this function
Modified: webservices/axis2/trunk/c/util/include/axis2_error.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_error.h?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_error.h Sun Jun 4 08:00:39 2006
@@ -555,7 +555,9 @@
* get error message for the last error
* @return error message for the last error. NULL on error.
*/
- axis2_char_t * (AXIS2_CALL *get_message) (struct axis2_error *error);
+ const axis2_char_t *(AXIS2_CALL *
+ get_message)(
+ const struct axis2_error *error);
axis2_status_t (AXIS2_CALL *set_error_number) (struct axis2_error *error
, axis2_error_codes_t error_number);
Modified: webservices/axis2/trunk/c/util/include/axis2_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_generic_obj.h?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_generic_obj.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_generic_obj.h Sun Jun 4 08:00:39 2006
@@ -66,13 +66,13 @@
axis2_status_t (AXIS2_CALL *
set_type) (
axis2_generic_obj_t *generic_obj,
- axis2_env_t **env,
+ const axis2_env_t **env,
int type);
int (AXIS2_CALL *
get_type) (
axis2_generic_obj_t *generic_obj,
- axis2_env_t **env);
+ const axis2_env_t **env);
};
Modified: webservices/axis2/trunk/c/util/include/axis2_log_default.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_log_default.h?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_log_default.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_log_default.h Sun Jun 4 08:00:39 2006
@@ -44,7 +44,7 @@
* @return pointer to the newly created log struct
*/
AXIS2_EXTERN axis2_log_t * AXIS2_CALL axis2_log_create (axis2_allocator_t * allocator,
- axis2_log_ops_t * ops, axis2_char_t * stream_name);
+ axis2_log_ops_t * ops, const axis2_char_t * stream_name);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL axis2_log_impl_get_time_str(void);
/** @} */
Modified: webservices/axis2/trunk/c/util/include/axis2_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_string.h?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_string.h Sun Jun 4 08:00:39 2006
@@ -46,11 +46,11 @@
AXIS2_EXTERN int AXIS2_CALL
axis2_strcasecmp(const axis2_char_t *s1,
- axis2_char_t *s2);
+ const axis2_char_t *s2);
AXIS2_EXTERN int AXIS2_CALL
axis2_strncasecmp(const axis2_char_t *s1,
- axis2_char_t *s2, int n);
+ const axis2_char_t *s2, int n);
/* much similar to the strcat behaviour. But the difference is
* this allocates new memory to put the conatenated string rather than
@@ -58,8 +58,8 @@
* memory for the return value
*/
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_stracat(const axis2_char_t *s1, const
- axis2_char_t *s2,
+ axis2_stracat(const axis2_char_t *s1,
+ const axis2_char_t *s2,
const axis2_env_t *env);
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
Modified: webservices/axis2/trunk/c/util/include/axis2_url.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_url.h?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_url.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_url.h Sun Jun 4 08:00:39 2006
@@ -115,10 +115,10 @@
AXIS2_EXTERN axis2_url_t * AXIS2_CALL
axis2_url_create (const axis2_env_t *env,
- axis2_char_t *protocol,
- axis2_char_t *server,
- int port,
- axis2_char_t *path);
+ const axis2_char_t *protocol,
+ const axis2_char_t *server,
+ const int port,
+ const axis2_char_t *path);
AXIS2_EXTERN axis2_url_t * AXIS2_CALL
axis2_url_parse_string(const axis2_env_t *env,
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=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Sun Jun 4 08:00:39 2006
@@ -433,6 +433,8 @@
dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
dll_desc_impl->error_code = error_code;
+
+ return AXIS2_SUCCESS;
}
axis2_error_codes_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Sun Jun 4 08:00:39 2006
@@ -21,8 +21,8 @@
#include <axis2_log_default.h>
#include <axis2_string.h>
-AXIS2_EXTERN axis2_env_t * AXIS2_CALL axis2_env_create_all (axis2_char_t *log_file,
- axis2_log_levels_t log_level)
+AXIS2_EXTERN axis2_env_t * AXIS2_CALL axis2_env_create_all (const axis2_char_t *log_file,
+ const axis2_log_levels_t log_level)
{
axis2_env_t *env = NULL;
axis2_error_t *error = 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=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/error.c (original)
+++ webservices/axis2/trunk/c/util/src/error.c Sun Jun 4 08:00:39 2006
@@ -17,7 +17,8 @@
#include <stdlib.h>
#include "axis2_error_default.h"
-axis2_char_t * AXIS2_CALL axis2_error_impl_get_message (axis2_error_t *error);
+const axis2_char_t * AXIS2_CALL
+axis2_error_impl_get_message (const axis2_error_t *error);
axis2_status_t AXIS2_CALL
axis2_error_impl_set_error_number (axis2_error_t *error, axis2_error_codes_t error_number);
@@ -29,7 +30,7 @@
axis2_error_impl_get_status_code (axis2_error_t *error);
/* array to hold error messages */
-axis2_char_t* axis2_error_messages[AXIS2_ERROR_LAST];
+const axis2_char_t* axis2_error_messages[AXIS2_ERROR_LAST];
axis2_status_t AXIS2_CALL
axis2_error_init()
@@ -504,8 +505,8 @@
return error;
}
-axis2_char_t * AXIS2_CALL
-axis2_error_impl_get_message (axis2_error_t *error)
+const axis2_char_t * AXIS2_CALL
+axis2_error_impl_get_message (const axis2_error_t *error)
{
if (error && error->error_number >= AXIS2_ERROR_NONE && error->error_number < AXIS2_ERROR_LAST)
return axis2_error_messages[error->error_number];
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=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/generic_obj.c (original)
+++ webservices/axis2/trunk/c/util/src/generic_obj.c Sun Jun 4 08:00:39 2006
@@ -50,13 +50,13 @@
axis2_status_t AXIS2_CALL
axis2_generic_obj_set_type(
axis2_generic_obj_t *generic_obj,
- axis2_env_t **env,
+ const axis2_env_t **env,
int type);
int AXIS2_CALL
axis2_generic_obj_get_type(
axis2_generic_obj_t *generic_obj,
- axis2_env_t **env);
+ const axis2_env_t **env);
/************************** End of function prototypes ************************/
@@ -176,7 +176,7 @@
axis2_status_t AXIS2_CALL
axis2_generic_obj_set_type(
axis2_generic_obj_t *generic_obj,
- axis2_env_t **env,
+ const axis2_env_t **env,
int type)
{
axis2_generic_obj_impl_t *generic_obj_impl = NULL;
@@ -191,11 +191,11 @@
int AXIS2_CALL
axis2_generic_obj_get_type(
axis2_generic_obj_t *generic_obj,
- axis2_env_t **env)
+ const axis2_env_t **env)
{
axis2_generic_obj_impl_t *generic_obj_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
generic_obj_impl = AXIS2_INTF_TO_IMPL(generic_obj);
return generic_obj_impl->type;
Modified: webservices/axis2/trunk/c/util/src/log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/log.c?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/log.c (original)
+++ webservices/axis2/trunk/c/util/src/log.c Sun Jun 4 08:00:39 2006
@@ -74,7 +74,7 @@
AXIS2_EXTERN axis2_log_t * AXIS2_CALL
axis2_log_create (axis2_allocator_t * allocator, axis2_log_ops_t * ops,
- axis2_char_t * stream_name)
+ const axis2_char_t * stream_name)
{
axis2_log_impl_t *log_impl;
axis2_char_t *path_home;
@@ -182,7 +182,7 @@
return -1;
if (level <= log->level)
{
- char *level_str = "";
+ const char *level_str = "";
switch (level)
{
case AXIS2_LOG_LEVEL_CRITICAL:
@@ -216,9 +216,9 @@
axis2_log_levels_t level, const axis2_char_t *file,
const int line, const axis2_char_t *value)
{
- char *level_str = "";
- if (!fd)
- return -1;
+ const char *level_str = "";
+ if (!fd)
+ return -1;
/**
* print all critical and error logs irrespective of log->level setting
*/
Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Sun Jun 4 08:00:39 2006
@@ -90,7 +90,7 @@
AXIS2_EXTERN int AXIS2_CALL
-axis2_strcasecmp(const axis2_char_t *s1, axis2_char_t *s2)
+axis2_strcasecmp(const axis2_char_t *s1, const axis2_char_t *s2)
{
while (toupper(*s1) == toupper(*s2++))
if (*s1++ == '\0')
@@ -100,12 +100,15 @@
AXIS2_EXTERN int AXIS2_CALL
-axis2_strncasecmp(const axis2_char_t *s1, axis2_char_t *s2, int n)
+axis2_strncasecmp(const axis2_char_t *s1, const axis2_char_t *s2, const int n)
{
- while (--n >= 0 && toupper(*s1) == toupper(*s2++))
- if (toupper(*s1++) == '\0')
+ axis2_char_t *str1 = (axis2_char_t *)s1, *str2 = (axis2_char_t *)s2;
+ int i = (int)n;
+
+ while (--i >= 0 && toupper(*str1) == toupper(*str2++))
+ if (toupper(*str1++) == '\0')
return(0);
- return(n < 0 ? 0 : toupper(*s1) - toupper(*--s2));
+ return(i < 0 ? 0 : toupper(*str1) - toupper(*--str2));
}
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
@@ -150,4 +153,4 @@
index = strchr(newstr, s1);
}
return newstr;
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/c/util/src/string_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string_util.c?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Sun Jun 4 08:00:39 2006
@@ -27,7 +27,6 @@
axis2_char_t *rest = NULL;
axis2_char_t *str = NULL;
- int i = 0;
axis2_char_t *index = NULL;
if(!in || AXIS2_STRCMP(in, "") == 0)
Modified: webservices/axis2/trunk/c/util/src/url.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?rev=411574&r1=411573&r2=411574&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Sun Jun 4 08:00:39 2006
@@ -85,8 +85,11 @@
/***************************** End of function headers ************************/
AXIS2_EXTERN axis2_url_t * AXIS2_CALL
-axis2_url_create (const axis2_env_t *env, axis2_char_t *protocol,
- axis2_char_t *server, int port, axis2_char_t *path)
+axis2_url_create (const axis2_env_t *env,
+ const axis2_char_t *protocol,
+ const axis2_char_t *server,
+ const int port,
+ const axis2_char_t *path)
{
axis2_url_impl_t *url_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -159,7 +162,7 @@
*/
axis2_char_t *tmp_url_str = NULL;
axis2_url_t *ret = NULL;
- axis2_char_t *protocol = NULL;
+ const axis2_char_t *protocol = NULL;
axis2_char_t *path = NULL;
axis2_char_t *port_str = NULL;
axis2_char_t *server = NULL;
@@ -202,7 +205,7 @@
/* if the url is file:// thing we need the protocol and
* path only
*/
- if(0 == AXIS2_STRCASECMP(protocol, "file"))
+ if(0 == AXIS2_STRCASECMP(protocol, (const axis2_char_t *)"file"))
{
ret = axis2_url_create(env, protocol, NULL, 0, server);
AXIS2_FREE(env->allocator, tmp_url_str);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org