You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2007/09/28 05:28:09 UTC
svn commit: r580207 [3/3] - in /webservices/axis2/trunk/c/util/src: ./
minizip/ platforms/unix/
Modified: webservices/axis2/trunk/c/util/src/properties.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/properties.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/properties.c (original)
+++ webservices/axis2/trunk/c/util/src/properties.c Thu Sep 27 20:28:06 2007
@@ -48,7 +48,9 @@
AXIS2_ENV_CHECK(env, NULL);
- properties = (axutil_properties_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_properties_t));
+ properties =
+ (axutil_properties_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_properties_t));
if (!properties)
{
@@ -73,7 +75,8 @@
if (properties->prop_hash)
{
- for (hi = axutil_hash_first(properties->prop_hash, env); hi; hi = axutil_hash_next(env, hi))
+ for (hi = axutil_hash_first(properties->prop_hash, env); hi;
+ hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, (void *) &key, NULL, (void *) &value);
if (key)
@@ -143,7 +146,8 @@
if (properties->prop_hash)
{
- for (hi = axutil_hash_first(properties->prop_hash, env); hi; hi = axutil_hash_next(env, hi))
+ for (hi = axutil_hash_first(properties->prop_hash, env); hi;
+ hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, (void *) &key, NULL, (void *) &value);
if (key)
@@ -199,7 +203,8 @@
return AXIS2_FAILURE;
}
- for (cur = axutil_properties_read_next(buffer); *cur; cur = axutil_properties_read_next(++cur))
+ for (cur = axutil_properties_read_next(buffer); *cur;
+ cur = axutil_properties_read_next(++cur))
{
if (*cur == '\r')
{
@@ -307,7 +312,9 @@
size_t curr_alloc = MAX_SIZE * 2;
size_t total_alloc = curr_alloc;
- out_stream = (axis2_char_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_char_t) * curr_alloc);
+ out_stream =
+ (axis2_char_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_char_t) * curr_alloc);
if (!out_stream)
{
return NULL;
@@ -315,7 +322,8 @@
do
{
- nread = fread(out_stream + ncount, sizeof(axis2_char_t), MAX_SIZE, input);
+ nread =
+ fread(out_stream + ncount, sizeof(axis2_char_t), MAX_SIZE, input);
ncount += nread;
if (ncount + MAX_SIZE > total_alloc)
@@ -327,7 +335,9 @@
}
total_alloc += curr_alloc;
- new_stream = AXIS2_MALLOC(env->allocator, sizeof(axis2_char_t) * total_alloc);
+ new_stream =
+ AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_char_t) * total_alloc);
if (!new_stream)
{
return NULL;
Modified: webservices/axis2/trunk/c/util/src/property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/property.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/property.c (original)
+++ webservices/axis2/trunk/c/util/src/property.c Thu Sep 27 20:28:06 2007
@@ -35,7 +35,9 @@
AXIS2_ENV_CHECK(env, NULL);
- property = (axutil_property_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_property_t));
+ property =
+ (axutil_property_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_property_t));
if (!property)
{
Modified: webservices/axis2/trunk/c/util/src/qname.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/qname.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/qname.c (original)
+++ webservices/axis2/trunk/c/util/src/qname.c Thu Sep 27 20:28:06 2007
@@ -54,11 +54,13 @@
/* localpart can't be null */
if (!localpart)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
+ AXIS2_FAILURE);
return NULL;
}
- qname = (axutil_qname_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_qname_t));
+ qname =
+ (axutil_qname_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_qname_t));
if (!qname)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -95,7 +97,8 @@
if (namespace_uri)
{
- qname->namespace_uri = (axis2_char_t *) axutil_strdup(env, namespace_uri);
+ qname->namespace_uri =
+ (axis2_char_t *) axutil_strdup(env, namespace_uri);
}
if (namespace_uri && !(qname->namespace_uri))
@@ -158,7 +161,8 @@
if (!qname2)
{
- AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_INVALID_NULL_PARAM);
+ AXIS2_ERROR_SET_ERROR_NUMBER(env->error,
+ AXIS2_ERROR_INVALID_NULL_PARAM);
AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
return AXIS2_FALSE;
}
@@ -174,7 +178,8 @@
if (qname->namespace_uri && qname2->namespace_uri)
{
- uris_differ = axutil_strcmp(qname->namespace_uri, qname2->namespace_uri);
+ uris_differ =
+ axutil_strcmp(qname->namespace_uri, qname2->namespace_uri);
}
else
{
@@ -249,7 +254,8 @@
axis2_char_t *temp_string1 = NULL;
temp_string1 = axutil_stracat(env, qname->localpart, "|");
- qname->qname_string = axutil_stracat(env, temp_string1, qname->namespace_uri);
+ qname->qname_string =
+ axutil_stracat(env, temp_string1, qname->namespace_uri);
if (temp_string1)
{
AXIS2_FREE(env->allocator, temp_string1);
Modified: webservices/axis2/trunk/c/util/src/stack.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stack.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/stack.c (original)
+++ webservices/axis2/trunk/c/util/src/stack.c Thu Sep 27 20:28:06 2007
@@ -44,7 +44,8 @@
AXIS2_ENV_CHECK(env, NULL);
- stack = (axutil_stack_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_stack_t));
+ stack =
+ (axutil_stack_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_stack_t));
if (!stack)
{
@@ -57,7 +58,9 @@
stack->capacity = AXIS2_STACK_DEFAULT_CAPACITY;
stack->is_empty_stack = AXIS2_TRUE;
- stack->data = AXIS2_MALLOC(env->allocator, sizeof(void *) * AXIS2_STACK_DEFAULT_CAPACITY);
+ stack->data =
+ AXIS2_MALLOC(env->allocator,
+ sizeof(void *) * AXIS2_STACK_DEFAULT_CAPACITY);
if (!stack->data)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/util/src/stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stream.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/stream.c (original)
+++ webservices/axis2/trunk/c/util/src/stream.c Thu Sep 27 20:28:06 2007
@@ -82,7 +82,9 @@
axutil_stream_t *stream = NULL;
AXIS2_ENV_CHECK(env, NULL);
- stream = (axutil_stream_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_stream_t));
+ stream =
+ (axutil_stream_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_stream_t));
if (!stream)
{
@@ -249,7 +251,8 @@
stream->skip = axutil_stream_skip_basic;
stream->buffer =
(axis2_char_t *) AXIS2_MALLOC(env->allocator,
- AXIS2_STREAM_DEFAULT_BUF_SIZE * sizeof(axis2_char_t));
+ AXIS2_STREAM_DEFAULT_BUF_SIZE *
+ sizeof(axis2_char_t));
stream->buffer_head = stream->buffer;
stream->len = 0;
stream->max_len = AXIS2_STREAM_DEFAULT_BUF_SIZE;
@@ -319,8 +322,9 @@
if (new_len > stream->max_len)
{
axis2_char_t *tmp = (axis2_char_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_char_t) * (new_len +
- AXIS2_STREAM_DEFAULT_BUF_SIZE));
+ sizeof(axis2_char_t) *
+ (new_len +
+ AXIS2_STREAM_DEFAULT_BUF_SIZE));
if (!tmp)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -336,7 +340,8 @@
stream->buffer = tmp;
stream->buffer_head = tmp;
}
- memcpy(stream->buffer + (stream->len * sizeof(axis2_char_t)), buffer, count);
+ memcpy(stream->buffer + (stream->len * sizeof(axis2_char_t)), buffer,
+ count);
stream->len += count;
return count;
}
@@ -550,7 +555,9 @@
#ifdef AXIS2_TCPMON
if (len > 1)
{
- temp = (axis2_char_t *) AXIS2_MALLOC(env->allocator, (len + 1) * sizeof(axis2_char_t));
+ temp =
+ (axis2_char_t *) AXIS2_MALLOC(env->allocator,
+ (len + 1) * sizeof(axis2_char_t));
if (temp)
{
memcpy(temp, buffer, len * sizeof(axis2_char_t));
@@ -588,7 +595,9 @@
#ifdef AXIS2_TCPMON
if (len > 0)
{
- temp = (axis2_char_t *) AXIS2_MALLOC(env->allocator, (len + 1) * sizeof(axis2_char_t));
+ temp =
+ (axis2_char_t *) AXIS2_MALLOC(env->allocator,
+ (len + 1) * sizeof(axis2_char_t));
if (temp)
{
memcpy(temp, buffer, len * sizeof(axis2_char_t));
Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Thu Sep 27 20:28:06 2007
@@ -42,11 +42,14 @@
/* str can't be null */
if (!str)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
+ AXIS2_FAILURE);
return NULL;
}
- string = (axutil_string_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_string_t));
+ string =
+ (axutil_string_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_string_t));
if (!string)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -61,13 +64,16 @@
if (string->length < 0)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
+ AXIS2_FAILURE);
axutil_string_free(string, env);
return NULL;
}
string->buffer =
- (axis2_char_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_char_t) * (string->length + 1));
+ (axis2_char_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_char_t) * (string->length +
+ 1));
if (!(string->buffer))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -90,11 +96,14 @@
/* str can't be null */
if (!str || !(*str))
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
+ AXIS2_FAILURE);
return NULL;
}
- string = (axutil_string_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_string_t));
+ string =
+ (axutil_string_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_string_t));
if (!string)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -108,7 +117,8 @@
if (string->length < 0)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
+ AXIS2_FAILURE);
axutil_string_free(string, env);
return NULL;
}
@@ -127,11 +137,14 @@
/* str can't be null */
if (!str)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
+ AXIS2_FAILURE);
return NULL;
}
- string = (axutil_string_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_string_t));
+ string =
+ (axutil_string_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_string_t));
if (!string)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -145,7 +158,8 @@
if (string->length < 0)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
+ AXIS2_FAILURE);
axutil_string_free(string, env);
return NULL;
}
@@ -255,7 +269,8 @@
{
int len = axutil_strlen(ptr);
axis2_char_t *str = (axis2_char_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_char_t) * (len + 1));
+ sizeof(axis2_char_t) *
+ (len + 1));
if (!str)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -281,7 +296,9 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, ptr, NULL);
- str = (axis2_char_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_char_t) * (n + 1));
+ str =
+ (axis2_char_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_char_t) * (n + 1));
if (!str)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -325,7 +342,9 @@
end = axutil_memchr(ptr, '\0', n);
if (end)
n = end - (axis2_char_t *) ptr;
- str = (axis2_char_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_char_t) * (n + 1));
+ str =
+ (axis2_char_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_char_t) * (n + 1));
if (!str)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -433,9 +452,12 @@
len1 = axutil_strlen(s1);
len2 = axutil_strlen(s2);
alloc_len = len1 + len2 + 1;
- ret = (axis2_char_t *) AXIS2_MALLOC(env->allocator, alloc_len * sizeof(axis2_char_t));
+ ret =
+ (axis2_char_t *) AXIS2_MALLOC(env->allocator,
+ alloc_len * sizeof(axis2_char_t));
memcpy(ret, s1, len1 * sizeof(axis2_char_t));
- memcpy((ret + len1 * sizeof(axis2_char_t)), s2, len2 * sizeof(axis2_char_t));
+ memcpy((ret + len1 * sizeof(axis2_char_t)), s2,
+ len2 * sizeof(axis2_char_t));
ret[alloc_len * sizeof(axis2_char_t) - sizeof(axis2_char_t)] = '\0';
return ret;
}
Modified: webservices/axis2/trunk/c/util/src/thread_pool.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/thread_pool.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/thread_pool.c (original)
+++ webservices/axis2/trunk/c/util/src/thread_pool.c Thu Sep 27 20:28:06 2007
@@ -31,7 +31,9 @@
{
axutil_thread_pool_t *pool = NULL;
- pool = (axutil_thread_pool_t *) AXIS2_MALLOC(allocator, sizeof(axutil_thread_pool_t));
+ pool =
+ (axutil_thread_pool_t *) AXIS2_MALLOC(allocator,
+ sizeof(axutil_thread_pool_t));
if (!pool)
{
@@ -116,8 +118,10 @@
const axutil_env_t * system_env)
{
axutil_error_t *error = axutil_error_create(system_env->allocator);
- return axutil_env_create_with_error_log_thread_pool(system_env->allocator, error,
- system_env->log, system_env->thread_pool);
+ return axutil_env_create_with_error_log_thread_pool(system_env->allocator,
+ error, system_env->log,
+ system_env->
+ thread_pool);
}
AXIS2_EXTERN void AXIS2_CALL
Modified: webservices/axis2/trunk/c/util/src/uri.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uri.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/uri.c (original)
+++ webservices/axis2/trunk/c/util/src/uri.c Thu Sep 27 20:28:06 2007
@@ -440,10 +440,13 @@
{
/* we expect the common case to have no port */
uri->hostname =
- axutil_strmemdup(hostinfo + v6_offset1, uri_str - hostinfo - v6_offset2, env);
+ axutil_strmemdup(hostinfo + v6_offset1,
+ uri_str - hostinfo - v6_offset2, env);
goto deal_with_path;
}
- uri->hostname = axutil_strmemdup(hostinfo + v6_offset1, s - hostinfo - v6_offset2, env);
+ uri->hostname =
+ axutil_strmemdup(hostinfo + v6_offset1, s - hostinfo - v6_offset2,
+ env);
++s;
uri->port_str = axutil_strmemdup(s, uri_str - s, env);
if (uri_str != s)
@@ -606,7 +609,9 @@
path += 2;
}
baselen = base_end - basepath + 1;
- uri->path = AXIS2_MALLOC(env->allocator, sizeof(axis2_char_t) * baselen + strlen(path) + 1);
+ uri->path =
+ AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_char_t) * baselen + strlen(path) + 1);
memcpy(uri->path, basepath, baselen);
strcpy(uri->path + baselen, path);
}
@@ -735,18 +740,20 @@
ret =
axutil_strcat(env,
(uri->user &&
- !(flags & AXIS2_URI_UNP_OMITUSER)) ? uri->user : "", (uri->password
- && !(flags &
- AXIS2_URI_UNP_OMITPASSWORD))
+ !(flags & AXIS2_URI_UNP_OMITUSER)) ? uri->
+ user : "", (uri->password &&
+ !(flags & AXIS2_URI_UNP_OMITPASSWORD))
? ":" : "", (uri->password &&
- !(flags & AXIS2_URI_UNP_OMITPASSWORD)) ? ((flags &
- AXIS2_URI_UNP_REVEALPASSWORD)
- ? uri->
- password :
- "XXXXXXXX") :
- "", ((uri->user && !(flags & AXIS2_URI_UNP_OMITUSER)) ||
- (uri->password &&
- !(flags & AXIS2_URI_UNP_OMITPASSWORD))) ? "@" : "", NULL);
+ !(flags &
+ AXIS2_URI_UNP_OMITPASSWORD))
+ ? ((flags & AXIS2_URI_UNP_REVEALPASSWORD) ? uri->
+ password : "XXXXXXXX") : "", ((uri->user &&
+ !(flags &
+ AXIS2_URI_UNP_OMITUSER))
+ || (uri->password
+ && !(flags &
+ AXIS2_URI_UNP_OMITPASSWORD)))
+ ? "@" : "", NULL);
}
/* Construct scheme://site string */
@@ -763,14 +770,16 @@
}
is_default_port = (uri->port_str == NULL || uri->port == 0 ||
- uri->port == axutil_uri_port_of_scheme(uri->scheme));
+ uri->port ==
+ axutil_uri_port_of_scheme(uri->scheme));
if (uri->scheme)
{
ret =
- axutil_strcat(env, uri->scheme, "://", ret, lbrk, uri->hostname, rbrk,
- is_default_port ? "" : ":", is_default_port ? "" : uri->port_str,
- NULL);
+ axutil_strcat(env, uri->scheme, "://", ret, lbrk,
+ uri->hostname, rbrk,
+ is_default_port ? "" : ":",
+ is_default_port ? "" : uri->port_str, NULL);
}
else
{
@@ -781,8 +790,8 @@
*/
ret =
axutil_strcat(env, "//", ret, lbrk, uri->hostname, rbrk,
- is_default_port ? "" : ":", is_default_port ? "" : uri->port_str,
- NULL);
+ is_default_port ? "" : ":",
+ is_default_port ? "" : uri->port_str, NULL);
}
}
}
@@ -793,14 +802,15 @@
/* Append path, query and fragment strings: */
ret =
axutil_strcat(env, ret, (uri->path) ? uri->path : "",
- (uri->query && !(flags & AXIS2_URI_UNP_OMITQUERY)) ? "?" : "", (uri->query
- && !(flags
- &
- AXIS2_URI_UNP_OMITQUERY))
- ? uri->query : "", (uri->fragment &&
- !(flags & AXIS2_URI_UNP_OMITQUERY)) ? "#" : NULL,
- (uri->fragment &&
- !(flags & AXIS2_URI_UNP_OMITQUERY)) ? uri->fragment : NULL, NULL);
+ (uri->query &&
+ !(flags & AXIS2_URI_UNP_OMITQUERY)) ? "?" : "",
+ (uri->query &&
+ !(flags & AXIS2_URI_UNP_OMITQUERY)) ? uri->
+ query : "", (uri->fragment &&
+ !(flags & AXIS2_URI_UNP_OMITQUERY)) ? "#"
+ : NULL, (uri->fragment &&
+ !(flags & AXIS2_URI_UNP_OMITQUERY)) ? uri->
+ fragment : NULL, NULL);
}
return ret;
}
Modified: webservices/axis2/trunk/c/util/src/url.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Thu Sep 27 20:28:06 2007
@@ -254,10 +254,11 @@
sprintf(port_str, "%d", url->port);
len =
- axutil_strlen(url->protocol) + axutil_strlen(url->server) + axutil_strlen(url->path) +
- strlen(port_str) + 7;
+ axutil_strlen(url->protocol) + axutil_strlen(url->server) +
+ axutil_strlen(url->path) + strlen(port_str) + 7;
external_form = (axis2_char_t *) AXIS2_MALLOC(env->allocator, len);
- sprintf(external_form, "%s://%s:%s%s", url->protocol, url->server, port_str, url->path);
+ sprintf(external_form, "%s://%s:%s%s", url->protocol, url->server, port_str,
+ url->path);
return external_form;
}
@@ -360,7 +361,8 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return axutil_url_create(env, url->protocol, url->server, url->port, url->path);
+ return axutil_url_create(env, url->protocol, url->server, url->port,
+ url->path);
}
AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
Modified: webservices/axis2/trunk/c/util/src/utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/utils.c?rev=580207&r1=580206&r2=580207&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/utils.c (original)
+++ webservices/axis2/trunk/c/util/src/utils.c Thu Sep 27 20:28:06 2007
@@ -75,7 +75,8 @@
if (tmp)
{
i = tmp - service_str;
- ret[1] = AXIS2_MALLOC(env->allocator, i * sizeof(char) + 1);
+ ret[1] =
+ AXIS2_MALLOC(env->allocator, i * sizeof(char) + 1);
strncpy(ret[1], service_str, i);
ret[1][i] = '\0';
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org