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 du...@apache.org on 2007/03/28 13:21:17 UTC
svn commit: r523280 [3/4] - in /webservices/axis2/trunk/c:
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
guththila/src/ modules/core/addr/ modules/core/clientapi/
modules/core/context/ modules/core/deployment/ modules/core/description/...
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?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_string.h Wed Mar 28 04:21:09 2007
@@ -133,8 +133,8 @@
*/
AXIS2_EXTERN void* AXIS2_CALL
- axis2_strdup(const void *ptr,
- const axis2_env_t *env);
+ axis2_strdup(const axis2_env_t *env,
+ const void *ptr);
/**
* duplicate the first n characters of a string into memory allocated
@@ -144,9 +144,9 @@
* @return The new string
*/
AXIS2_EXTERN void* AXIS2_CALL
- axis2_strndup(const void *ptr,
- int n,
- const axis2_env_t *env);
+ axis2_strndup(const axis2_env_t *env,
+ const void *ptr,
+ int n);
/**
* Create a null-terminated string by making a copy of a sequence
@@ -196,9 +196,9 @@
* memory for the return value
*/
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_stracat(const axis2_char_t *s1,
- const axis2_char_t *s2,
- const axis2_env_t *env);
+ axis2_stracat(const axis2_env_t *env,
+ const axis2_char_t *s1,
+ const axis2_char_t *s2);
/**
* Concatenate multiple strings, allocating memory
Modified: webservices/axis2/trunk/c/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Wed Mar 28 04:21:09 2007
@@ -84,8 +84,8 @@
return NULL;
}
axis2_file_set_name(arch_file, env, fname);
- temp_path = axis2_stracat(pathname, AXIS2_PATH_SEP_STR, env);
- path = axis2_stracat(temp_path, fname, env);
+ temp_path = axis2_stracat(env, pathname, AXIS2_PATH_SEP_STR);
+ path = axis2_stracat(env, temp_path, fname);
AXIS2_FREE(env->allocator, temp_path);
if (!path)
{
@@ -219,8 +219,8 @@
return NULL;
}
axis2_file_set_name(arch_file, env, fname);
- temp_path = axis2_stracat(pathname, AXIS2_PATH_SEP_STR, env);
- path = axis2_stracat(temp_path, fname, env);
+ temp_path = axis2_stracat(env, pathname, AXIS2_PATH_SEP_STR);
+ path = axis2_stracat(env, temp_path, fname);
if (!path)
{
int size = 0;
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?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Wed Mar 28 04:21:09 2007
@@ -115,7 +115,7 @@
AXIS2_FREE(env->allocator, dll_desc->path_qualified_dll_name);
}
- dll_desc->path_qualified_dll_name = axis2_strdup(name, env);
+ dll_desc->path_qualified_dll_name = axis2_strdup(env, name);
if (!dll_desc->path_qualified_dll_name)
{
return AXIS2_FAILURE;
@@ -271,8 +271,8 @@
AXIS2_ENV_CHECK(env, NULL);
- temp_name = axis2_stracat(AXIS2_LIB_PREFIX, class_name, env);
- dll_desc->dll_name = axis2_stracat(temp_name, AXIS2_LIB_SUFFIX, env);
+ temp_name = axis2_stracat(env, AXIS2_LIB_PREFIX, class_name);
+ dll_desc->dll_name = axis2_stracat(env, temp_name, AXIS2_LIB_SUFFIX);
AXIS2_FREE(env->allocator, temp_name);
return dll_desc->dll_name;
}
Modified: webservices/axis2/trunk/c/util/src/file.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/file.c (original)
+++ webservices/axis2/trunk/c/util/src/file.c Wed Mar 28 04:21:09 2007
@@ -83,7 +83,7 @@
AXIS2_FREE(env->allocator, file->name);
file->name = NULL;
}
- file->name = axis2_strdup(name, env);
+ file->name = axis2_strdup(env, name);
if (!file->name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -121,7 +121,7 @@
AXIS2_FREE(env->allocator, file->path);
file->path = NULL;
}
- file->path = axis2_strdup(path, env);
+ file->path = axis2_strdup(env, path);
if (!(file->path))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/util/src/param.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/param.c (original)
+++ webservices/axis2/trunk/c/util/src/param.c Wed Mar 28 04:21:09 2007
@@ -54,7 +54,7 @@
return NULL;
}
- param->name = axis2_strdup(name, env);
+ param->name = axis2_strdup(env, name);
param->value = value; /* shallow copy.*/
param->locked = AXIS2_FALSE;
param->type = AXIS2_TEXT_PARAM;
@@ -86,7 +86,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- param->name = axis2_strdup(name, env);
+ param->name = axis2_strdup(env, name);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/util/src/properties.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/properties.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/properties.c (original)
+++ webservices/axis2/trunk/c/util/src/properties.c Wed Mar 28 04:21:09 2007
@@ -149,7 +149,7 @@
{
if (!value)
{
- value = axis2_strdup("", env);
+ value = axis2_strdup(env, "");
}
fprintf(output, "%s=%s\n", key, value);
}
@@ -297,7 +297,7 @@
for (; *start == ' '; start ++); /* remove front spaces */
for (end --; *end == ' '; end --); /* remove rear spaces */
*(++end) = '\0';
- start = (axis2_char_t*)axis2_strdup(start, env);
+ start = (axis2_char_t*)axis2_strdup(env, start);
return start;
}
Modified: webservices/axis2/trunk/c/util/src/qname.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/qname.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/qname.c (original)
+++ webservices/axis2/trunk/c/util/src/qname.c Wed Mar 28 04:21:09 2007
@@ -68,7 +68,7 @@
qname->ref = 1;
- qname->localpart = (axis2_char_t *)axis2_strdup(localpart, env);
+ qname->localpart = (axis2_char_t *)axis2_strdup(env, localpart);
if (!(qname->localpart))
{
AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
@@ -79,7 +79,7 @@
if (prefix)
{
- qname->prefix = (axis2_char_t*)axis2_strdup(prefix, env);
+ qname->prefix = (axis2_char_t*)axis2_strdup(env, prefix);
}
if (prefix && !(qname->prefix))
@@ -92,7 +92,7 @@
if (namespace_uri)
{
- qname->namespace_uri = (axis2_char_t*)axis2_strdup(namespace_uri, env);
+ qname->namespace_uri = (axis2_char_t*)axis2_strdup(env, namespace_uri);
}
if (namespace_uri && !(qname->namespace_uri))
@@ -236,14 +236,14 @@
if (!(qname->namespace_uri) || axis2_strcmp(qname->namespace_uri, "") == 0)
{
- qname->qname_string = axis2_strdup(qname->localpart, env);
+ qname->qname_string = axis2_strdup(env, qname->localpart);
}
else if (!(qname->prefix) || axis2_strcmp(qname->prefix, "") == 0)
{
axis2_char_t *temp_string1 = NULL;
- temp_string1 = axis2_stracat(qname->localpart, "|", env);
- qname->qname_string = axis2_stracat(temp_string1, qname->namespace_uri, env);
+ temp_string1 = axis2_stracat(env, qname->localpart, "|");
+ qname->qname_string = axis2_stracat(env, temp_string1, qname->namespace_uri);
if (temp_string1)
{
AXIS2_FREE(env->allocator, temp_string1);
@@ -255,10 +255,10 @@
axis2_char_t *temp_string2 = NULL;
axis2_char_t *temp_string3 = NULL;
- temp_string1 = axis2_stracat(qname->localpart, "|", env);
- temp_string2 = axis2_stracat(temp_string1, qname->namespace_uri, env);
- temp_string3 = axis2_stracat(temp_string2, "|", env);
- qname->qname_string = axis2_stracat(temp_string3, qname->prefix, env);
+ temp_string1 = axis2_stracat(env, qname->localpart, "|");
+ temp_string2 = axis2_stracat(env, temp_string1, qname->namespace_uri);
+ temp_string3 = axis2_stracat(env, temp_string2, "|");
+ qname->qname_string = axis2_stracat(env, temp_string3, qname->prefix);
if (temp_string1)
{
@@ -290,7 +290,7 @@
if (!qstring || axis2_strcmp(qstring, "") == 0)
return NULL;
- temp_string = axis2_strdup(qstring, env);
+ temp_string = axis2_strdup(env, qstring);
index = strchr(temp_string, '|');
if (index)
Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Wed Mar 28 04:21:09 2007
@@ -246,8 +246,8 @@
#define MAX_SAVED_LENGTHS 6
AXIS2_EXTERN void* AXIS2_CALL
-axis2_strdup(const void *ptr,
- const axis2_env_t *env)
+axis2_strdup(const axis2_env_t *env,
+ const void *ptr)
{
AXIS2_ENV_CHECK(env, NULL);
if (ptr)
@@ -309,9 +309,9 @@
}
AXIS2_EXTERN void* AXIS2_CALL
-axis2_strndup(const void *ptr,
- int n,
- const axis2_env_t *env)
+axis2_strndup(const axis2_env_t *env,
+ const void *ptr,
+ int n)
{
const axis2_char_t *end;
axis2_char_t *str;
@@ -401,13 +401,13 @@
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_stracat(const axis2_char_t *s1,
- const axis2_char_t *s2,
- const axis2_env_t *env)
+axis2_stracat(const axis2_env_t *env,
+ const axis2_char_t *s1,
+ const axis2_char_t *s2)
{
axis2_char_t *ret = NULL;
int alloc_len = -1;
- int len1 = 0;
+ int len1 = 0;
int len2 = 0;
if (!s1 && !s2)
@@ -416,11 +416,11 @@
}
if (!s1)
{
- return (axis2_char_t*)axis2_strdup(s2, env);
+ return (axis2_char_t*)axis2_strdup(env, s2);
}
if (!s2)
{
- return (axis2_char_t*)axis2_strdup(s1, env);
+ return (axis2_char_t*)axis2_strdup(env,s1);
}
len1 = axis2_strlen(s1);
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?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Wed Mar 28 04:21:09 2007
@@ -40,7 +40,7 @@
return NULL;
}
- str = axis2_strdup(in, env);
+ str = axis2_strdup(env, in);
do
{
@@ -93,13 +93,13 @@
{
return NULL;
}
- str = axis2_strdup(in, env);
+ str = axis2_strdup(env, in);
index = strchr(str, delim);
if (!index)
{
axis2_array_list_add(list, env, str);
- axis2_array_list_add(list, env, axis2_strdup("", env));
+ axis2_array_list_add(list, env, axis2_strdup(env, ""));
return list;
}
@@ -133,12 +133,12 @@
return NULL;
}
- str = axis2_strdup(in, env);
+ str = axis2_strdup(env, in);
index = axis2_rindex(str, delim);
if (!index)
{
- axis2_array_list_add(list, env, axis2_strdup("", env));
+ axis2_array_list_add(list, env, axis2_strdup(env, ""));
axis2_array_list_add(list, env, str);
return list;
}
Modified: webservices/axis2/trunk/c/util/src/uri.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uri.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/uri.c (original)
+++ webservices/axis2/trunk/c/util/src/uri.c Wed Mar 28 04:21:09 2007
@@ -349,17 +349,17 @@
s1 = strchr(s, '#');
if (s1)
{
- uri->fragment = axis2_strdup(s1 + 1, env);
+ uri->fragment = axis2_strdup(env, s1 + 1);
uri->query = axis2_strmemdup(s, s1 - s, env);
}
else
{
- uri->query = axis2_strdup(s, env);
+ uri->query = axis2_strdup(env, s);
}
return uri;
}
/* otherwise it's a fragment */
- uri->fragment = axis2_strdup(s + 1, env);
+ uri->fragment = axis2_strdup(env, s + 1);
return uri;
}
@@ -494,7 +494,7 @@
*/
memset(uri, '\0', sizeof(*uri));
uri->is_initialized = 1;
- uri->hostinfo = axis2_strdup(hostinfo, env);
+ uri->hostinfo = axis2_strdup(env, hostinfo);
/* We expect hostinfo to point to the first character of
* the hostname. There must be a port, separated by a colon
@@ -519,9 +519,9 @@
{
return NULL;
}
- uri->hostname = axis2_strndup(hostinfo, s - hostinfo - v6_offset1, env);
+ uri->hostname = axis2_strndup(env, hostinfo, s - hostinfo - v6_offset1);
++s;
- uri->port_str = axis2_strdup(s, env);
+ uri->port_str = axis2_strdup(env, s);
if (*s != '\0')
{
uri->port = (unsigned short) strtol(uri->port_str, &endstr, 10);
@@ -555,14 +555,14 @@
if (!uri->hostname)
{
/* is this compatible with is_initialised? Harmless in any case */
- uri->path = base->path ? base->path : axis2_strdup("/", env) ;
+ uri->path = base->path ? base->path : axis2_strdup(env, "/") ;
}
else
{
/* deal with the idiosyncracy of APR allowing path==NULL
* without risk of breaking back-compatibility
*/
- uri->path = axis2_strdup("/", env) ;
+ uri->path = axis2_strdup(env, "/") ;
}
}
else if (uri->path[0] != '/')
@@ -603,27 +603,27 @@
/* The trivial bits are everything-but-path */
if (!uri->scheme)
{
- uri->scheme = axis2_strdup(base->scheme, env) ;
+ uri->scheme = axis2_strdup(env, base->scheme) ;
}
if (!uri->hostinfo)
{
- uri->hostinfo = axis2_strdup(base->hostinfo, env) ;
+ uri->hostinfo = axis2_strdup(env, base->hostinfo) ;
}
if (!uri->user)
{
- uri->user = axis2_strdup(base->user, env) ;
+ uri->user = axis2_strdup(env, base->user) ;
}
if (!uri->password)
{
- uri->password = axis2_strdup(base->password, env) ;
+ uri->password = axis2_strdup(env, base->password) ;
}
if (!uri->hostname)
{
- uri->hostname = axis2_strdup(base->hostname, env) ;
+ uri->hostname = axis2_strdup(env, base->hostname) ;
}
if (!uri->port_str)
{
- uri->port_str = axis2_strdup(base->port_str, env) ;
+ uri->port_str = axis2_strdup(env, base->port_str) ;
}
if (!uri->hostent)
{
@@ -680,15 +680,15 @@
AXIS2_ENV_CHECK(env, NULL);
new_uri = (axis2_uri_t *) axis2_uri_create(env);
- new_uri->scheme = axis2_strdup(uri->scheme, env);
- new_uri->hostinfo = axis2_strdup(uri->hostinfo, env);
- new_uri->user = axis2_strdup(uri->user, env);
- new_uri->password = axis2_strdup(uri->password, env);
- new_uri->hostname = axis2_strdup(uri->hostname, env);
- new_uri->port_str = axis2_strdup(uri->port_str, env);
- new_uri->path = axis2_strdup(uri->path, env);
- new_uri->query = axis2_strdup(uri->query, env);
- new_uri->fragment = axis2_strdup(uri->fragment, env);
+ new_uri->scheme = axis2_strdup(env, uri->scheme);
+ new_uri->hostinfo = axis2_strdup(env, uri->hostinfo);
+ new_uri->user = axis2_strdup(env, uri->user);
+ new_uri->password = axis2_strdup(env, uri->password);
+ new_uri->hostname = axis2_strdup(env, uri->hostname);
+ new_uri->port_str = axis2_strdup(env, uri->port_str);
+ new_uri->path = axis2_strdup(env, uri->path);
+ new_uri->query = axis2_strdup(env, uri->query);
+ new_uri->fragment = axis2_strdup(env, uri->fragment);
new_uri->hostent = uri->hostent;
new_uri->port = uri->port;
new_uri->is_initialized = uri->is_initialized;
Modified: webservices/axis2/trunk/c/util/src/url.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Wed Mar 28 04:21:09 2007
@@ -49,14 +49,14 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- url->protocol = axis2_strdup(protocol, env);
+ url->protocol = axis2_strdup(env, protocol);
url->server = NULL;
url->path = NULL;
url->port = port;
if (server)
{
- url->server = (axis2_char_t *)axis2_strdup(server, env);
+ url->server = (axis2_char_t *)axis2_strdup(env, server);
}
/** if the path is not starting with / we have to make it so
*/
@@ -64,11 +64,11 @@
{
if (path[0] == '/')
{
- url->path = (axis2_char_t *)axis2_strdup(path, env);
+ url->path = (axis2_char_t *)axis2_strdup(env, path);
}
else
{
- url->path = axis2_stracat("/", path, env);
+ url->path = axis2_stracat(env, "/", path);
}
}
@@ -99,7 +99,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, str_url, NULL);
- tmp_url_str = axis2_strdup(str_url, env);
+ tmp_url_str = axis2_strdup(env, str_url);
if (!tmp_url_str)
{
return NULL;
@@ -274,7 +274,7 @@
AXIS2_FREE(env->allocator, url->protocol);
url->protocol = NULL;
}
- url->protocol = axis2_strdup(protocol, env);
+ url->protocol = axis2_strdup(env, protocol);
return AXIS2_SUCCESS;
}
@@ -297,7 +297,7 @@
{
AXIS2_FREE(env->allocator, url->server);
}
- url->server = axis2_strdup(server, env);
+ url->server = axis2_strdup(env, server);
return AXIS2_SUCCESS;
}
@@ -338,7 +338,7 @@
{
AXIS2_FREE(env->allocator, url->path);
}
- url->path = axis2_strdup(path, env);
+ url->path = axis2_strdup(env, path);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/util/src/utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/utils.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/src/utils.c (original)
+++ webservices/axis2/trunk/c/util/src/utils.c Wed Mar 28 04:21:09 2007
@@ -80,13 +80,13 @@
}
else
{
- ret[1] = axis2_strdup(service_str, env);
+ ret[1] = axis2_strdup(env, service_str);
}
}
}
else
{
- ret[0] = axis2_strdup(service_str, env);
+ ret[0] = axis2_strdup(env, service_str);
}
}
}
Modified: webservices/axis2/trunk/c/util/test/util/test_string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_string.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_string.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_string.c Wed Mar 28 04:21:09 2007
@@ -22,7 +22,7 @@
void test_strltrim(const axis2_env_t *env)
{
- axis2_char_t *s = axis2_strdup(" abcd efgh ", env);
+ axis2_char_t *s = axis2_strdup(env, " abcd efgh ");
axis2_char_t *trimmed = NULL;
trimmed = axis2_strltrim(env, s, " \t\r\n");
if (0 == axis2_strcmp(trimmed, "abcd efgh "))
@@ -37,7 +37,7 @@
void test_strrtrim(const axis2_env_t *env)
{
- axis2_char_t *s = axis2_strdup("abcd efgh ", env);
+ axis2_char_t *s = axis2_strdup(env, "abcd efgh ");
axis2_char_t *trimmed = NULL;
trimmed = axis2_strrtrim(env, s, " \t\r\n");
if (0 == axis2_strcmp(trimmed, " abcd efgh"))
@@ -52,7 +52,7 @@
void test_strtrim(const axis2_env_t *env)
{
- axis2_char_t *s = axis2_strdup(" abcd efgh ", env);
+ axis2_char_t *s = axis2_strdup(env, " abcd efgh ");
axis2_char_t *trimmed = NULL;
trimmed = axis2_strtrim(env, s, " \t\r\n");
if (0 == axis2_strcmp(trimmed, "abcd efgh"))
Modified: webservices/axis2/trunk/c/util/test/util/test_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_util.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Wed Mar 28 04:21:09 2007
@@ -63,10 +63,10 @@
a4 = (a *) AXIS2_MALLOC(env->allocator, sizeof(a));
- a1->value = axis2_strdup("value1", env);
- a2->value = axis2_strdup("value2", env);
- a3->value = axis2_strdup("value3", env);
- a4->value = axis2_strdup("value4", env);
+ a1->value = axis2_strdup(env, "value1");
+ a2->value = axis2_strdup(env, "value2");
+ a3->value = axis2_strdup(env, "value3");
+ a4->value = axis2_strdup(env, "value4");
ht = axis2_hash_make(env);
@@ -116,7 +116,7 @@
axis2_error_t *error = axis2_error_create(allocator);
const axis2_env_t *env = axis2_env_create_with_error(allocator, error);
- axis2_char_t *pathname = axis2_strdup("/tmp/test/", env);
+ axis2_char_t *pathname = axis2_strdup(env, "/tmp/test/");
axis2_array_list_t *arr_folders = axis2_dir_handler_list_service_or_module_dirs(env, pathname);
if (arr_folders == NULL)
@@ -161,31 +161,31 @@
printf("list size %d\n", axis2_array_list_size(al, env));
entry = (a *) AXIS2_MALLOC(env->allocator, sizeof(a));
- entry->value = axis2_strdup("value1", env);
+ entry->value = axis2_strdup(env, "value1");
axis2_array_list_add(al, env, (void*)entry);
entry = (a *) AXIS2_MALLOC(env->allocator, sizeof(a));
- entry->value = axis2_strdup("value2", env);
+ entry->value = axis2_strdup(env, "value2");
axis2_array_list_add(al, env, (void*)entry);
entry = (a *) AXIS2_MALLOC(env->allocator, sizeof(a));
- entry->value = axis2_strdup("value3", env);
+ entry->value = axis2_strdup(env, "value3");
axis2_array_list_add(al, env, (void*)entry);
entry = (a *) AXIS2_MALLOC(env->allocator, sizeof(a));
- entry->value = axis2_strdup("value4", env);
+ entry->value = axis2_strdup(env, "value4");
axis2_array_list_add(al, env, (void*)entry);
entry = (a *) AXIS2_MALLOC(env->allocator, sizeof(a));
- entry->value = axis2_strdup("value5", env);
+ entry->value = axis2_strdup(env, "value5");
axis2_array_list_add(al, env, (void*)entry);
entry = (a *) AXIS2_MALLOC(env->allocator, sizeof(a));
- entry->value = axis2_strdup("value6", env);
+ entry->value = axis2_strdup(env, "value6");
axis2_array_list_add(al, env, (void*)entry);
entry = (a *) AXIS2_MALLOC(env->allocator, sizeof(a));
- entry->value = axis2_strdup("value7", env);
+ entry->value = axis2_strdup(env, "value7");
axis2_array_list_set(al, env, 3, (void*)entry);
axis2_array_list_remove(al, env, 2);
Modified: webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/test_wsdl2.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/test_wsdl2.c (original)
+++ webservices/axis2/trunk/c/woden/samples/test_wsdl2.c Wed Mar 28 04:21:09 2007
@@ -70,7 +70,7 @@
om_doc = get_root_element_from_filename(env, filename);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- doc_base_uri = axis2_stracat(axis2c_home, "/woden", env);
+ doc_base_uri = axis2_stracat(env, axis2c_home, "/woden");
resolver = woden_resolver_create(env);
desc = WODEN_RESOLVER_READ(resolver, env, om_doc, doc_base_uri);
Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c Wed Mar 28 04:21:09 2007
@@ -70,7 +70,7 @@
om_doc = get_root_element_from_filename(env, filename);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- doc_base_uri = axis2_stracat(axis2c_home, "/woden", env);
+ doc_base_uri = axis2_stracat(env, axis2c_home, "/woden");
resolver = woden_resolver_create(env);
desc = WODEN_RESOLVER_READ(resolver, env, om_doc, doc_base_uri);
Modified: webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c Wed Mar 28 04:21:09 2007
@@ -344,7 +344,7 @@
AXIS2_FREE(env->allocator, schema_impl->f_schema_id);
schema_impl->f_schema_id = NULL;
}
- schema_impl->f_schema_id = axis2_strdup(id, env);
+ schema_impl->f_schema_id = axis2_strdup(env, id);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/types/woden_nc_name.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/types/woden_nc_name.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/types/woden_nc_name.c (original)
+++ webservices/axis2/trunk/c/woden/src/types/woden_nc_name.c Wed Mar 28 04:21:09 2007
@@ -156,7 +156,7 @@
AXIS2_FREE(env->allocator, nc_name_impl->f_value);
nc_name_impl->f_value = NULL;
}
- nc_name_impl->f_value = axis2_strdup(value, env);
+ nc_name_impl->f_value = axis2_strdup(env, value);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_om_util.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.c Wed Mar 28 04:21:09 2007
@@ -78,16 +78,16 @@
/* Namespace already registerd */
return AXIS2_SUCCESS;
}
- tmp_prefix = axis2_strdup(prefix, env);
+ tmp_prefix = axis2_strdup(env, prefix);
while (ns_uri_str && 0 != axis2_strcmp(ns_uri_str, namespc_uri_str))
{
axis2_char_t *temp = NULL;
- temp = axis2_stracat(tmp_prefix, "_", env);
+ temp = axis2_stracat(env, tmp_prefix, "_");
ns_uri = axis2_hash_get(namespcs, temp, AXIS2_HASH_KEY_STRING);
ns_uri_str = axis2_uri_to_string(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
AXIS2_FREE(env->allocator, tmp_prefix);
- tmp_prefix = axis2_strdup(temp, env);
+ tmp_prefix = axis2_strdup(env, temp);
AXIS2_FREE(env->allocator, temp);
}
uri = axis2_uri_parse_string(env, namespc_uri_str);
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_direction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_direction.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_direction.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_direction.c Wed Mar 28 04:21:09 2007
@@ -77,7 +77,7 @@
AXIS2_ENV_CHECK(env, NULL);
direction_impl = (woden_direction_impl_t *) create(env);
- direction_impl->f_value = axis2_strdup(value, env);
+ direction_impl->f_value = axis2_strdup(env, value);
return &(direction_impl->direction);
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c Wed Mar 28 04:21:09 2007
@@ -432,7 +432,7 @@
AXIS2_FREE(env->allocator, decl_impl->f_content_model);
decl_impl->f_content_model = NULL;
}
- decl_impl->f_content_model = axis2_strdup(content_model, env);
+ decl_impl->f_content_model = axis2_strdup(env, content_model);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_msg_label.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_msg_label.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_msg_label.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_msg_label.c Wed Mar 28 04:21:09 2007
@@ -93,7 +93,7 @@
AXIS2_ENV_CHECK(env, NULL);
msg_label_impl = (woden_msg_label_impl_t *) create(env);
- msg_label_impl->f_value = axis2_strdup(value, env);
+ msg_label_impl->f_value = axis2_strdup(env, value);
msg_label_impl->f_valid = valid;
return &(msg_label_impl->msg_label);
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c Wed Mar 28 04:21:09 2007
@@ -102,7 +102,7 @@
AXIS2_ENV_CHECK(env, NULL);
soap_fault_code_impl = (woden_soap_fault_code_impl_t *) create(env);
- soap_fault_code_impl->f_token = axis2_strdup(token, env);
+ soap_fault_code_impl->f_token = axis2_strdup(env, token);
soap_fault_code_impl->f_code_qn = axis2_qname_clone(code_qn, env);
return &(soap_fault_code_impl->soap_fault_code);
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c Wed Mar 28 04:21:09 2007
@@ -102,7 +102,7 @@
AXIS2_ENV_CHECK(env, NULL);
soap_fault_subcodes_impl = (woden_soap_fault_subcodes_impl_t *) create(env);
- soap_fault_subcodes_impl->f_token = axis2_strdup(token, env);
+ soap_fault_subcodes_impl->f_token = axis2_strdup(env, token);
soap_fault_subcodes_impl->f_subcode_qns = subcode_qns;
return &(soap_fault_subcodes_impl->soap_fault_subcodes);
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c Wed Mar 28 04:21:09 2007
@@ -733,7 +733,7 @@
{
AXIS2_FREE(env->allocator, types_impl->f_type_system);
}
- types_impl->f_type_system = axis2_strdup(type_system, env);
+ types_impl->f_type_system = axis2_strdup(env, type_system);
if (!types_impl->f_type_system)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c Wed Mar 28 04:21:09 2007
@@ -1004,7 +1004,7 @@
{
AXIS2_FREE(env->allocator, interface_msg_ref_impl->f_msg_content_model);
}
- interface_msg_ref_impl->f_msg_content_model = axis2_strdup(nm_token, env);
+ interface_msg_ref_impl->f_msg_content_model = axis2_strdup(env, nm_token);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c Wed Mar 28 04:21:09 2007
@@ -238,7 +238,7 @@
if (attr_value)
{
- str = axis2_strdup(attr_value, env);
+ str = axis2_strdup(env, attr_value);
if (!str)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c Wed Mar 28 04:21:09 2007
@@ -212,7 +212,7 @@
axis2_qname_free(xml_attr_impl->f_attr_type, env);
xml_attr_impl->f_attr_type = NULL;
}
- xml_attr_impl->f_external_form = axis2_strdup(attr_value, env);
+ xml_attr_impl->f_external_form = axis2_strdup(env, attr_value);
xml_attr_impl->f_content = xml_attr_impl->xml_attr.ops->
convert(&(xml_attr_impl->xml_attr), env, owner_el, owner_node,
attr_value);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema.c Wed Mar 28 04:21:09 2007
@@ -313,11 +313,11 @@
schema_impl->schema_root_node = NULL;
if (namespc)
- schema_impl->target_namespace = axis2_strdup(namespc, env);
+ schema_impl->target_namespace = axis2_strdup(env, namespc);
if (!schema_impl->target_namespace)
{
schema_impl->target_namespace =
- axis2_strdup(XML_SCHEMA_DEFAULT_TARGET_NS, env);
+ axis2_strdup(env, XML_SCHEMA_DEFAULT_TARGET_NS);
}
schema_impl->schema.ops = AXIS2_MALLOC(env->allocator,
sizeof(xml_schema_ops_t));
@@ -1073,7 +1073,7 @@
schema_impl->target_namespace = NULL;
}
- schema_impl->target_namespace = axis2_strdup(target_namespace, env);
+ schema_impl->target_namespace = axis2_strdup(env, target_namespace);
return AXIS2_SUCCESS;
}
@@ -1224,7 +1224,7 @@
AXIS2_FREE(env->allocator, sch_impl->schema_ns_prefix);
sch_impl->schema_ns_prefix = NULL;
}
- sch_impl->schema_ns_prefix = axis2_strdup(ns_prefix, env);
+ sch_impl->schema_ns_prefix = axis2_strdup(env, ns_prefix);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c Wed Mar 28 04:21:09 2007
@@ -166,11 +166,11 @@
return NULL;
}
axis2_hash_set(annotated_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, &(annotated_impl->annotated));
axis2_hash_set(annotated_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env), AXIS2_HASH_KEY_STRING,
+ axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING,
annotated_impl->schema_obj);
status = xml_schema_obj_resolve_methods(
@@ -359,7 +359,7 @@
AXIS2_FREE(env->allocator, annotated_impl->id);
annotated_impl->id = NULL;
}
- annotated_impl->id = axis2_strdup(id, env);
+ annotated_impl->id = axis2_strdup(env, id);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c Wed Mar 28 04:21:09 2007
@@ -135,11 +135,11 @@
return NULL;
}
axis2_hash_set(annotation_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATION", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATION"),
AXIS2_HASH_KEY_STRING, &(annotation_impl->annotation));
axis2_hash_set(annotation_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, annotation_impl->schema_obj);
status = xml_schema_obj_resolve_methods(&(annotation_impl->annotation.base),
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c Wed Mar 28 04:21:09 2007
@@ -158,22 +158,22 @@
return NULL;
}
axis2_hash_set(any_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANY", env),
+ axis2_strdup(env, "XML_SCHEMA_ANY"),
AXIS2_HASH_KEY_STRING, &(any_impl->any));
axis2_hash_set(any_impl->ht_super,
- axis2_strdup("XML_SCHEMA_PARTICLE", env),
+ axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
AXIS2_HASH_KEY_STRING, any_impl->particle);
annotated = XML_SCHEMA_PARTICLE_GET_BASE_IMPL(any_impl->particle, env);
if (annotated)
{
axis2_hash_set(any_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
axis2_hash_set(any_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
@@ -349,7 +349,7 @@
AXIS2_FREE(env->allocator, any_impl->ns);
any_impl->ns = NULL;
}
- any_impl->ns = axis2_strdup(any_impl->ns, env);
+ any_impl->ns = axis2_strdup(env, any_impl->ns);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c Wed Mar 28 04:21:09 2007
@@ -158,15 +158,15 @@
return NULL;
}
axis2_hash_set(any_attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANY_ATTRIBUTE", env),
+ axis2_strdup(env, "XML_SCHEMA_ANY_ATTRIBUTE"),
AXIS2_HASH_KEY_STRING, &(any_attr_impl->any_attr));
axis2_hash_set(any_attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, any_attr_impl->annotated);
axis2_hash_set(any_attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(any_attr_impl->annotated, env));
@@ -262,7 +262,7 @@
any_attr_impl->ns = NULL;
}
- any_attr_impl->ns = axis2_strdup(namespc, env);
+ any_attr_impl->ns = axis2_strdup(env, namespc);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c Wed Mar 28 04:21:09 2007
@@ -156,11 +156,11 @@
return NULL;
}
axis2_hash_set(app_info_impl->ht_super,
- axis2_strdup("XML_SCHEMA_APP_INFO", env),
+ axis2_strdup(env, "XML_SCHEMA_APP_INFO"),
AXIS2_HASH_KEY_STRING, &(app_info_impl->app_info));
axis2_hash_set(app_info_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, app_info_impl->schema_obj);
status = xml_schema_obj_resolve_methods(&(app_info_impl->app_info.base),
@@ -288,7 +288,7 @@
app_info_impl->source = NULL;
}
- app_info_impl->source = axis2_strdup(source, env);
+ app_info_impl->source = axis2_strdup(env, source);
if (!app_info_impl->source)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c Wed Mar 28 04:21:09 2007
@@ -282,15 +282,15 @@
}
axis2_hash_set(attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ATTRIBUTE", env),
+ axis2_strdup(env, "XML_SCHEMA_ATTRIBUTE"),
AXIS2_HASH_KEY_STRING, &(attr_impl->attr));
axis2_hash_set(attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, attr_impl->annotated);
axis2_hash_set(attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(attr_impl->annotated, env));
@@ -424,7 +424,7 @@
AXIS2_FREE(env->allocator, attr_impl->default_value);
attr_impl->default_value = NULL;
}
- attr_impl->default_value = axis2_strdup(default_value, env);
+ attr_impl->default_value = axis2_strdup(env, default_value);
return AXIS2_SUCCESS;
}
@@ -448,7 +448,7 @@
AXIS2_FREE(env->allocator, attr_impl->fixed_value);
attr_impl->fixed_value = NULL;
}
- attr_impl->fixed_value = axis2_strdup(fixed_value, env);
+ attr_impl->fixed_value = axis2_strdup(env, fixed_value);
return AXIS2_SUCCESS;
}
@@ -522,7 +522,7 @@
AXIS2_FREE(env->allocator, attr_impl->name);
attr_impl->name = NULL;
}
- attr_impl->name = axis2_strdup(name, env);
+ attr_impl->name = axis2_strdup(env, name);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c Wed Mar 28 04:21:09 2007
@@ -164,15 +164,15 @@
}
axis2_hash_set(attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ATTRIBUTE", env),
+ axis2_strdup(env, "XML_SCHEMA_ATTRIBUTE"),
AXIS2_HASH_KEY_STRING, &(attr_impl->attr_grp));
axis2_hash_set(attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, attr_impl->annotated);
axis2_hash_set(attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(attr_impl->annotated, env));
@@ -330,7 +330,7 @@
AXIS2_FREE(env->allocator, attr_grp_impl->name);
attr_grp_impl->name = NULL;
}
- attr_grp_impl->name = axis2_strdup(name, env);
+ attr_grp_impl->name = axis2_strdup(env, name);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c Wed Mar 28 04:21:09 2007
@@ -136,15 +136,15 @@
}
axis2_hash_set(attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ATTRIBUTE", env),
+ axis2_strdup(env, "XML_SCHEMA_ATTRIBUTE"),
AXIS2_HASH_KEY_STRING, &(attr_impl->grp_ref));
axis2_hash_set(attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, attr_impl->annotated);
axis2_hash_set(attr_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(attr_impl->annotated, env));
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Wed Mar 28 04:21:09 2007
@@ -1352,7 +1352,7 @@
axis2_char_t *index = NULL;
axis2_qname_t *qn = NULL;
member = axis2_array_list_get(v, env, i);
- mem_dup = axis2_strdup(member, env);
+ mem_dup = axis2_strdup(env, member);
index = strchr(mem_dup, ':');
if (index)
@@ -3974,7 +3974,7 @@
if (attr_value)
{
axis2_char_t *atr_val = NULL;
- atr_val = axis2_strdup(attr_value, env);
+ atr_val = axis2_strdup(env, attr_value);
return (axis2_char_t*)axis2_strtrim(env, atr_val, NULL);
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Wed Mar 28 04:21:09 2007
@@ -351,7 +351,7 @@
AXIS2_FREE(env->allocator, collec_impl->base_uri);
collec_impl->base_uri = NULL;
}
- collec_impl->base_uri = axis2_strdup(base_uri, env);
+ collec_impl->base_uri = axis2_strdup(env, base_uri);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c Wed Mar 28 04:21:09 2007
@@ -299,12 +299,12 @@
{
if (xml == NULL)
{
- xml = axis2_strdup("\t", env);
+ xml = axis2_strdup(env, "\t");
}
else
{
temp_xml = xml;
- xml = axis2_stracat(xml, "\t", env);
+ xml = axis2_stracat(env, xml, "\t");
if (temp_xml)
AXIS2_FREE(env->allocator, temp_xml);
temp_xml = NULL;
@@ -315,11 +315,11 @@
if (prefix && axis2_strcmp(prefix, "") != 0 && strchr(prefix, ':') == NULL)
{
- temp_prefix = axis2_stracat(prefix, ":", env);
+ temp_prefix = axis2_stracat(env, prefix, ":");
}
- temp_xml = axis2_stracat("<", prefix, env);
- xml = axis2_stracat(temp_xml, "complexContent>\n", env);
+ temp_xml = axis2_stracat(env, "<", prefix);
+ xml = axis2_stracat(env, temp_xml, "complexContent>\n");
if (temp_xml)
{
AXIS2_FREE(env->allocator, temp_xml);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c Wed Mar 28 04:21:09 2007
@@ -198,11 +198,11 @@
xml_schema_complex_content_extension_free(&(cmp_cnt_ext_impl->cmp_cnt_ext), env);
return NULL;
}
- axis2_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup("XML_SCHEMA_COMPLEX_CONTENT_EXTENSION", env),
+ axis2_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_COMPLEX_CONTENT_EXTENSION"),
AXIS2_HASH_KEY_STRING, &(cmp_cnt_ext_impl->cmp_cnt_ext));
- axis2_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, cmp_cnt_ext_impl->annotated);
- axis2_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(cmp_cnt_ext_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(cmp_cnt_ext_impl->annotated, env));
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c Wed Mar 28 04:21:09 2007
@@ -211,11 +211,11 @@
}
axis2_hash_set(cmp_content_res_impl->ht_super,
- axis2_strdup("XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION", env),
+ axis2_strdup(env, "XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION"),
AXIS2_HASH_KEY_STRING, &(cmp_content_res_impl->cmp_content_res));
- axis2_hash_set(cmp_content_res_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(cmp_content_res_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, cmp_content_res_impl->annotated);
- axis2_hash_set(cmp_content_res_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(cmp_content_res_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(cmp_content_res_impl->annotated, env));
xml_schema_annotated_resolve_methods(&(cmp_content_res_impl->cmp_content_res.base),
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c Wed Mar 28 04:21:09 2007
@@ -120,13 +120,13 @@
}
axis2_array_list_add(content_processing_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_LAX, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_LAX));
axis2_array_list_add(content_processing_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_NONE, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_NONE));
axis2_array_list_add(content_processing_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_SKIP, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_SKIP));
axis2_array_list_add(content_processing_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_STRICT, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_STRICT));
content_processing_impl->schema_enum = xml_schema_enum_create(env, value);
@@ -139,10 +139,10 @@
return NULL;
}
- axis2_hash_set(content_processing_impl->ht_super, axis2_strdup("XML_SCHEMA_CONTENT_PROCESSING", env),
+ axis2_hash_set(content_processing_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_CONTENT_PROCESSING"),
AXIS2_HASH_KEY_STRING, &(content_processing_impl->content_processing));
- axis2_hash_set(content_processing_impl->ht_super, axis2_strdup("XML_SCHEMA_ENUM", env),
+ axis2_hash_set(content_processing_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ENUM"),
AXIS2_HASH_KEY_STRING, content_processing_impl->schema_enum);
status = xml_schema_enum_resolve_methods(
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c Wed Mar 28 04:21:09 2007
@@ -115,15 +115,15 @@
}
axis2_array_list_add(content_type_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_ELEMENT_ONLY, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_ELEMENT_ONLY));
axis2_array_list_add(content_type_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_EMPTY, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_EMPTY));
axis2_array_list_add(content_type_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_MIXED, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_MIXED));
axis2_array_list_add(content_type_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_TEXT_ONLY, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_TEXT_ONLY));
content_type_impl->schema_enum = xml_schema_enum_create(env, value);
if (!content_type_impl->schema_enum)
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c Wed Mar 28 04:21:09 2007
@@ -118,25 +118,25 @@
return NULL;
}
axis2_array_list_add(derivation_method_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_ALL, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_ALL));
axis2_array_list_add(derivation_method_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_EMPTY, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_EMPTY));
axis2_array_list_add(derivation_method_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_EXTENSION, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_EXTENSION));
axis2_array_list_add(derivation_method_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_LIST, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_LIST));
axis2_array_list_add(derivation_method_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_NONE, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_NONE));
axis2_array_list_add(derivation_method_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_RESTRICTION, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_RESTRICTION));
axis2_array_list_add(derivation_method_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_SUBSTITUTION, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_SUBSTITUTION));
axis2_array_list_add(derivation_method_impl->members, env,
axis2_strdup(XML_SCHEMA_CONST_UNION, env));
@@ -153,10 +153,10 @@
}
derivation_method_impl->ht_super = axis2_hash_make(env);
- axis2_hash_set(derivation_method_impl->ht_super, axis2_strdup("XML_SCHEMA_DERIVATION_METHOD", env),
+ axis2_hash_set(derivation_method_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_DERIVATION_METHOD"),
AXIS2_HASH_KEY_STRING, &(derivation_method_impl->derivation_method));
- axis2_hash_set(derivation_method_impl->ht_super, axis2_strdup("XML_SCHEMA_ENUM", env),
+ axis2_hash_set(derivation_method_impl->ht_super, axis2_strdup(env,"XML_SCHEMA_ENUM"),
AXIS2_HASH_KEY_STRING, derivation_method_impl->schema_enum);
status = xml_schema_enum_resolve_methods(
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c Wed Mar 28 04:21:09 2007
@@ -174,11 +174,11 @@
return NULL;
}
axis2_hash_set(documentation_impl->ht_super,
- axis2_strdup("XML_SCHEMA_DOCUMENTATION", env),
+ axis2_strdup(env, "XML_SCHEMA_DOCUMENTATION"),
AXIS2_HASH_KEY_STRING, &(documentation_impl->documentation));
axis2_hash_set(documentation_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, documentation_impl->schema_obj);
status = xml_schema_obj_resolve_methods(&(documentation_impl->documentation.base),
@@ -304,7 +304,7 @@
documentation_impl->source = NULL;
}
- documentation_impl->source = axis2_strdup(source, env);
+ documentation_impl->source = axis2_strdup(env, source);
if (!documentation_impl->source)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -367,7 +367,7 @@
AXIS2_FREE(env->allocator, documentation_impl->language);
documentation_impl->language = NULL;
}
- documentation_impl->language = axis2_strdup(language, env);
+ documentation_impl->language = axis2_strdup(env, language);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c Wed Mar 28 04:21:09 2007
@@ -447,18 +447,18 @@
return NULL;
}
- axis2_hash_set(element_impl->ht_super, axis2_strdup("XML_SCHEMA_ELEMENT", env),
+ axis2_hash_set(element_impl->ht_super, axis2_strdup(env,"XML_SCHEMA_ELEMENT"),
AXIS2_HASH_KEY_STRING, &(element_impl->element));
- axis2_hash_set(element_impl->ht_super, axis2_strdup("XML_SCHEMA_PARTICLE", env),
+ axis2_hash_set(element_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
AXIS2_HASH_KEY_STRING, element_impl->particle);
annotated = XML_SCHEMA_PARTICLE_GET_BASE_IMPL(element_impl->particle, env);
if (annotated)
{
- axis2_hash_set(element_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(element_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, &(element_impl->element));
- axis2_hash_set(element_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(element_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
xml_schema_particle_resolve_methods(
@@ -662,7 +662,7 @@
AXIS2_FREE(env->allocator, element_impl->fixed_value);
element_impl->fixed_value = NULL;
}
- element_impl->fixed_value = axis2_strdup(fixed_value, env);
+ element_impl->fixed_value = axis2_strdup(env, fixed_value);
return AXIS2_SUCCESS;
}
@@ -772,7 +772,7 @@
AXIS2_FREE(env->allocator, element_impl->name);
element_impl->name = NULL;
}
- element_impl->name = axis2_strdup(name, env);
+ element_impl->name = axis2_strdup(env, name);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c Wed Mar 28 04:21:09 2007
@@ -292,7 +292,7 @@
AXIS2_FREE(env->allocator, (schema_enum_impl->value));
schema_enum_impl->value = NULL;
}
- schema_enum_impl->value = axis2_strdup(value, env);
+ schema_enum_impl->value = axis2_strdup(env, value);
if (!schema_enum_impl->value)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c Wed Mar 28 04:21:09 2007
@@ -146,11 +146,11 @@
return NULL;
}
- axis2_hash_set(external_impl->ht_super, axis2_strdup("XML_SCHEMA_EXTERNAL", env),
+ axis2_hash_set(external_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_EXTERNAL"),
AXIS2_HASH_KEY_STRING, &(external_impl->external));
- axis2_hash_set(external_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(external_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, external_impl->annotated);
- axis2_hash_set(external_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(external_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(external_impl->annotated, env));
@@ -357,7 +357,7 @@
AXIS2_FREE(env->allocator, ext_impl->schema_location);
ext_impl->schema_location = NULL;
}
- ext_impl->schema_location = axis2_strdup(location, env);
+ ext_impl->schema_location = axis2_strdup(env, location);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c Wed Mar 28 04:21:09 2007
@@ -115,7 +115,7 @@
facet_impl->facet.base.ops = NULL;
facet_impl->fixed = fixed ;
-facet_impl->value = axis2_strdup(value, env);
+facet_impl->value = axis2_strdup(env, value);
facet_impl->facet.ops = AXIS2_MALLOC(env->allocator,
sizeof(xml_schema_facet_ops_t));
@@ -158,11 +158,11 @@
xml_schema_facet_free(&(facet_impl->facet), env);
return NULL;
}
- axis2_hash_set(facet_impl->ht_super, axis2_strdup("XML_SCHEMA_FACET", env),
+ axis2_hash_set(facet_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_FACET"),
AXIS2_HASH_KEY_STRING, &(facet_impl->facet));
- axis2_hash_set(facet_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(facet_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, facet_impl->annotated);
- axis2_hash_set(facet_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(facet_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(
facet_impl->annotated, env));
@@ -258,7 +258,7 @@
AXIS2_FREE(env->allocator, facet_impl->value);
facet_impl->value = NULL;
}
- facet_impl->value = axis2_strdup(value, env);
+ facet_impl->value = axis2_strdup(env, value);
return AXIS2_SUCCESS;
}
@@ -284,8 +284,8 @@
if (AXIOM_NODE_GET_NODE_TYPE(node, env) != AXIOM_ELEMENT)
return NULL;
- fixed_value = axis2_strdup("fixed", env);
- value_v = axis2_strdup("value", env);
+ fixed_value = axis2_strdup(env, "fixed");
+ value_v = axis2_strdup(env, "value");
om_ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
localname = axiom_element_get_localname(om_ele, env);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c Wed Mar 28 04:21:09 2007
@@ -127,13 +127,13 @@
}
axis2_array_list_add(form_impl->members, env,
- axis2_strdup(XML_SCHEMA_FORM_QUALIFIED, env));
+ axis2_strdup(env, XML_SCHEMA_FORM_QUALIFIED));
axis2_array_list_add(form_impl->members, env,
- axis2_strdup(XML_SCHEMA_FORM_UNQUALIFIED, env));
+ axis2_strdup(env, XML_SCHEMA_FORM_UNQUALIFIED));
axis2_array_list_add(form_impl->members, env,
- axis2_strdup(XML_SCHEMA_FORM_NONE, env));
+ axis2_strdup(env, XML_SCHEMA_FORM_NONE));
form_impl->schema_enum = xml_schema_enum_create(env, value);
if (!form_impl->schema_enum)
@@ -154,10 +154,10 @@
return NULL;
}
- axis2_hash_set(form_impl->ht_super, axis2_strdup("XML_SCHEMA_FORM", env),
+ axis2_hash_set(form_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_FORM"),
AXIS2_HASH_KEY_STRING, &(form_impl->form));
- axis2_hash_set(form_impl->ht_super, axis2_strdup("XML_SCHEMA_ENUM", env),
+ axis2_hash_set(form_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ENUM"),
AXIS2_HASH_KEY_STRING, form_impl->schema_enum);
status = xml_schema_enum_resolve_methods(
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c Wed Mar 28 04:21:09 2007
@@ -136,11 +136,11 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(group_impl->ht_super, axis2_strdup("XML_SCHEMA_GROUP", env), AXIS2_HASH_KEY_STRING,
+ axis2_hash_set(group_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_GROUP"), AXIS2_HASH_KEY_STRING,
&(group_impl->group));
- axis2_hash_set(group_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env), AXIS2_HASH_KEY_STRING,
+ axis2_hash_set(group_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING,
group_impl->annotated);
- axis2_hash_set(group_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env), AXIS2_HASH_KEY_STRING,
+ axis2_hash_set(group_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(group_impl->annotated, env));
@@ -256,7 +256,7 @@
AXIS2_FREE(env->allocator, group_impl->name);
group_impl->name = NULL;
}
- group_impl->name = axis2_strdup(name, env);
+ group_impl->name = axis2_strdup(env, name);
if (!group_impl->name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c Wed Mar 28 04:21:09 2007
@@ -137,18 +137,18 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(group_base_impl->ht_super, axis2_strdup("XML_SCHEMA_GROUP_BASE", env),
+ axis2_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_GROUP_BASE"),
AXIS2_HASH_KEY_STRING, &(group_base_impl->group_base));
- axis2_hash_set(group_base_impl->ht_super, axis2_strdup("XML_SCHEMA_PARTICLE", env),
+ axis2_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
AXIS2_HASH_KEY_STRING, group_base_impl->particle);
annotated = XML_SCHEMA_PARTICLE_GET_BASE_IMPL(group_base_impl->particle, env);
if (annotated)
{
- axis2_hash_set(group_base_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
- axis2_hash_set(group_base_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(group_base_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c Wed Mar 28 04:21:09 2007
@@ -157,18 +157,18 @@
}
axis2_hash_set(group_ref_impl->ht_super,
- axis2_strdup("XML_SCHEMA_GROUP_REF", env),
+ axis2_strdup(env, "XML_SCHEMA_GROUP_REF"),
AXIS2_HASH_KEY_STRING, &(group_ref_impl->group_ref));
- axis2_hash_set(group_ref_impl->ht_super, axis2_strdup("XML_SCHEMA_PARTICLE", env),
+ axis2_hash_set(group_ref_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"),
AXIS2_HASH_KEY_STRING, group_ref_impl->particle);
annotated = XML_SCHEMA_PARTICLE_GET_BASE_IMPL(group_ref_impl->particle, env);
if (annotated)
{
- axis2_hash_set(group_ref_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(group_ref_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
- axis2_hash_set(group_ref_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(group_ref_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING, XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c Wed Mar 28 04:21:09 2007
@@ -164,11 +164,11 @@
return NULL;
}
- axis2_hash_set(id_cns_impl->ht_super, axis2_strdup("XML_SCHEMA_IDENTITY_CONSTRAINT", env),
+ axis2_hash_set(id_cns_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_IDENTITY_CONSTRAINT"),
AXIS2_HASH_KEY_STRING, &(id_cns_impl->id_constr));
- axis2_hash_set(id_cns_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(id_cns_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, id_cns_impl->annotated);
- axis2_hash_set(id_cns_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(id_cns_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(id_cns_impl->annotated, env));
status = xml_schema_annotated_resolve_methods(
@@ -357,7 +357,7 @@
AXIS2_FREE(env->allocator, id_cns_impl->name);
id_cns_impl->name = NULL;
}
- id_cns_impl->name = axis2_strdup(name, env);
+ id_cns_impl->name = axis2_strdup(env, name);
if (!id_cns_impl->name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c Wed Mar 28 04:21:09 2007
@@ -127,18 +127,18 @@
return NULL;
}
- axis2_hash_set(import_impl->ht_super, axis2_strdup("XML_SCHEMA_IMPORT", env),
+ axis2_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_IMPORT"),
AXIS2_HASH_KEY_STRING, &(import_impl->import));
- axis2_hash_set(import_impl->ht_super, axis2_strdup("XML_SCHEMA_EXTERNAL", env),
+ axis2_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_EXTERNAL"),
AXIS2_HASH_KEY_STRING, import_impl->external);
annotated = XML_SCHEMA_EXTERNAL_GET_BASE_IMPL(import_impl->external, env);
if (annotated)
{
- axis2_hash_set(import_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
- axis2_hash_set(import_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(import_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_input_source.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_input_source.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_input_source.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_input_source.c Wed Mar 28 04:21:09 2007
@@ -131,7 +131,7 @@
input_source_impl = AXIS2_INTF_TO_IMPL(input_source);
- input_source_impl->system_id = axis2_strdup(id, env);
+ input_source_impl->system_id = axis2_strdup(env, id);
return &(input_source_impl->input_source);
}
@@ -184,7 +184,7 @@
AXIS2_FREE(env->allocator, input_source->system_id);
input_source->system_id = NULL;
}
- input_source->system_id = axis2_strdup(system_id, env);
+ input_source->system_id = axis2_strdup(env, system_id);
return AXIS2_SUCCESS;
}
@@ -211,7 +211,7 @@
AXIS2_FREE(env->allocator, input_source->public_id);
input_source->public_id = NULL;
}
- input_source->public_id = axis2_strdup(public_id, env);
+ input_source->public_id = axis2_strdup(env, public_id);
return AXIS2_SUCCESS;
}
@@ -228,7 +228,7 @@
AXIS2_FREE(env->allocator, input_source->encoing);
input_source->encoing = NULL;
}
- input_source->encoing = axis2_strdup(encoding, env);
+ input_source->encoing = axis2_strdup(env, encoding);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c Wed Mar 28 04:21:09 2007
@@ -394,7 +394,7 @@
AXIS2_FREE(env->allocator, obj_impl->source_uri);
obj_impl->source_uri = NULL;
}
- obj_impl->source_uri = axis2_strdup(source_uri, env);
+ obj_impl->source_uri = axis2_strdup(env, source_uri);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c Wed Mar 28 04:21:09 2007
@@ -161,12 +161,12 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(particle_impl->ht_super, axis2_strdup("XML_SCHEMA_PARTICLE", env), AXIS2_HASH_KEY_STRING,
+ axis2_hash_set(particle_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_PARTICLE"), AXIS2_HASH_KEY_STRING,
&(particle_impl->particle));
- axis2_hash_set(particle_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env), AXIS2_HASH_KEY_STRING,
+ axis2_hash_set(particle_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"), AXIS2_HASH_KEY_STRING,
particle_impl->annotated);
- axis2_hash_set(particle_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env), AXIS2_HASH_KEY_STRING,
+ axis2_hash_set(particle_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"), AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(particle_impl->annotated, env));
status = xml_schema_annotated_resolve_methods(
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c Wed Mar 28 04:21:09 2007
@@ -158,9 +158,9 @@
}
- axis2_hash_set(redefine_impl->ht_super, axis2_strdup("XML_SCHEMA_REDEFINE", env),
+ axis2_hash_set(redefine_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_REDEFINE"),
AXIS2_HASH_KEY_STRING, &(redefine_impl->redefine));
- axis2_hash_set(redefine_impl->ht_super, axis2_strdup("XML_SCHEMA_EXTERNAL", env),
+ axis2_hash_set(redefine_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_EXTERNAL"),
AXIS2_HASH_KEY_STRING, redefine_impl->external);
annotated = XML_SCHEMA_EXTERNAL_GET_BASE_IMPL(redefine_impl->external, env);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c Wed Mar 28 04:21:09 2007
@@ -132,13 +132,13 @@
xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), env);
return NULL;
}
- axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup("XML_SCHEMA_SIMPLE_CONTENT", env),
+ axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_SIMPLE_CONTENT"),
AXIS2_HASH_KEY_STRING, &(sim_cnt_impl->sim_content));
- axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, sim_cnt_impl->annotated);
- axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_hash_set(sim_cnt_impl->ht_super, axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_cnt_impl->annotated, env));
@@ -245,7 +245,7 @@
sim_cnt_impl = AXIS2_INTF_TO_IMPL(sim_content);
if (prefix && axis2_strcmp(prefix, "") != 0 && strchr(prefix, ':') == NULL)
{
- xml = axis2_stracat(prefix, ":", env);
+ xml = axis2_stracat(env, prefix, ":");
}
return xml;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c Wed Mar 28 04:21:09 2007
@@ -173,15 +173,15 @@
return NULL;
}
axis2_hash_set(sim_content_ext_impl->ht_super,
- axis2_strdup("XML_SCHEMA_SIMPLE_CONTENT_EXTENSION", env),
+ axis2_strdup(env, "XML_SCHEMA_SIMPLE_CONTENT_EXTENSION"),
AXIS2_HASH_KEY_STRING, &(sim_content_ext_impl->sim_content_ext));
axis2_hash_set(sim_content_ext_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, (sim_content_ext_impl->annotated));
axis2_hash_set(sim_content_ext_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_content_ext_impl->annotated, env));
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c Wed Mar 28 04:21:09 2007
@@ -149,21 +149,21 @@
}
axis2_hash_set(simple_type->ht_super,
- axis2_strdup("XML_SCHEMA_SIMPLE_TYPE", env),
+ axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE"),
AXIS2_HASH_KEY_STRING, &(simple_type->simple_type));
axis2_hash_set(simple_type->ht_super,
- axis2_strdup("XML_SCHEMA_TYPE", env),
+ axis2_strdup(env, "XML_SCHEMA_TYPE"),
AXIS2_HASH_KEY_STRING, simple_type->schema_type);
annotated = XML_SCHEMA_TYPE_GET_BASE_IMPL(simple_type->schema_type, env);
if (annotated)
{
axis2_hash_set(simple_type->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
axis2_hash_set(simple_type->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org