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:13:00 UTC
svn commit: r580200 [4/4] - /webservices/axis2/trunk/c/util/src/
Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?rev=580200&r1=580199&r2=580200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Thu Sep 27 20:12:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -20,7 +21,7 @@
#include <ctype.h>
#include <axutil_utils.h>
#include <axutil_utils_defines.h>
-#include <stdarg.h> /* NULL */
+#include <stdarg.h> /* NULL */
struct axutil_string
{
@@ -30,9 +31,10 @@
axis2_bool_t owns_buffer;
};
-AXIS2_EXTERN axutil_string_t * AXIS2_CALL
-axutil_string_create(const axutil_env_t *env,
- const axis2_char_t *str)
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
+axutil_string_create(
+ const axutil_env_t * env,
+ const axis2_char_t * str)
{
axutil_string_t *string = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -40,35 +42,32 @@
/* 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);
return NULL;
}
/* set properties */
- string->buffer = NULL;
+ string->buffer = NULL;
string->ref_count = 1;
string->owns_buffer = AXIS2_TRUE;
-
+
string->length = axutil_strlen(str);
-
+
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));
+
+ string->buffer =
+ (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);
@@ -80,9 +79,10 @@
return string;
}
-AXIS2_EXTERN axutil_string_t * AXIS2_CALL
-axutil_string_create_assume_ownership(const axutil_env_t *env,
- axis2_char_t **str)
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
+axutil_string_create_assume_ownership(
+ const axutil_env_t * env,
+ axis2_char_t ** str)
{
axutil_string_t *string = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -90,38 +90,36 @@
/* 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);
return NULL;
}
/* set properties */
- string->buffer = *str;
+ string->buffer = *str;
string->length = axutil_strlen(*str);
string->ref_count = 1;
- string->owns_buffer = AXIS2_TRUE;
-
+ string->owns_buffer = AXIS2_TRUE;
+
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;
}
-
+
return string;
}
-AXIS2_EXTERN axutil_string_t* AXIS2_CALL
-axutil_string_create_const(const axutil_env_t *env,
- axis2_char_t **str)
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
+axutil_string_create_const(
+ const axutil_env_t * env,
+ axis2_char_t ** str)
{
axutil_string_t *string = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -129,83 +127,83 @@
/* 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);
return NULL;
}
/* set properties */
- string->buffer = *str;
+ string->buffer = *str;
string->length = axutil_strlen(*str);
string->ref_count = 1;
- string->owns_buffer = AXIS2_FALSE;
-
+ string->owns_buffer = AXIS2_FALSE;
+
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;
}
-
+
return string;
}
AXIS2_EXTERN void AXIS2_CALL
-axutil_string_free(struct axutil_string *string,
- const axutil_env_t *env)
+axutil_string_free(
+ struct axutil_string *string,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
+
if (!string)
{
return;
}
-
+
string->ref_count--;
if (string->ref_count > 0)
{
return;
}
-
+
if (string->owns_buffer && string->buffer)
{
AXIS2_FREE(env->allocator, string->buffer);
}
-
+
AXIS2_FREE(env->allocator, string);
return;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axutil_string_equals(const struct axutil_string *string,
- const axutil_env_t *env,
- const struct axutil_string *string1)
+axutil_string_equals(
+ const struct axutil_string * string,
+ const axutil_env_t * env,
+ const struct axutil_string * string1)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
+
if (!string || !string1)
{
return AXIS2_FALSE;
}
-
+
return (string->buffer == string1->buffer);
}
AXIS2_EXTERN struct axutil_string *AXIS2_CALL
-axutil_string_clone(struct axutil_string *string,
- const axutil_env_t *env)
+axutil_string_clone(
+ struct axutil_string *string,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
-
+
if (!string)
{
return NULL;
@@ -216,9 +214,10 @@
return string;
}
-AXIS2_EXTERN const axis2_char_t* AXIS2_CALL
-axutil_string_get_buffer(const struct axutil_string *string,
- const axutil_env_t *env)
+AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
+axutil_string_get_buffer(
+ const struct axutil_string *string,
+ const axutil_env_t * env)
{
if (!string)
{
@@ -229,8 +228,9 @@
}
AXIS2_EXTERN unsigned int AXIS2_CALL
-axutil_string_get_length(const struct axutil_string *string,
- const axutil_env_t *env)
+axutil_string_get_length(
+ const struct axutil_string *string,
+ const axutil_env_t * env)
{
if (!string)
{
@@ -242,20 +242,20 @@
/* END of string struct implementation */
-
/** this is used to cache lengths in axutil_strcat */
#define MAX_SAVED_LENGTHS 6
-AXIS2_EXTERN void* AXIS2_CALL
-axutil_strdup(const axutil_env_t *env,
+AXIS2_EXTERN void *AXIS2_CALL
+axutil_strdup(
+ const axutil_env_t * env,
const void *ptr)
{
AXIS2_ENV_CHECK(env, NULL);
if (ptr)
{
int len = axutil_strlen(ptr);
- axis2_char_t * str = (axis2_char_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_char_t) * (len + 1));
+ axis2_char_t *str = (axis2_char_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_char_t) * (len + 1));
if (!str)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -270,18 +270,18 @@
}
}
-AXIS2_EXTERN void * AXIS2_CALL
-axutil_strmemdup(const void *ptr,
+AXIS2_EXTERN void *AXIS2_CALL
+axutil_strmemdup(
+ const void *ptr,
size_t n,
- const axutil_env_t *env)
+ const axutil_env_t * env)
{
axis2_char_t *str;
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);
@@ -293,8 +293,9 @@
return (void *) str;
}
-AXIS2_EXTERN void * AXIS2_CALL
-axutil_memchr(const void *ptr,
+AXIS2_EXTERN void *AXIS2_CALL
+axutil_memchr(
+ const void *ptr,
int c,
size_t n)
{
@@ -309,8 +310,9 @@
return NULL;
}
-AXIS2_EXTERN void* AXIS2_CALL
-axutil_strndup(const axutil_env_t *env,
+AXIS2_EXTERN void *AXIS2_CALL
+axutil_strndup(
+ const axutil_env_t * env,
const void *ptr,
int n)
{
@@ -323,8 +325,7 @@
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);
@@ -336,10 +337,14 @@
return (void *) str;
}
-AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axutil_strcat(const axutil_env_t *env, ...)
-{
- axis2_char_t *cp, *argp, *str;
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_strcat(
+ const axutil_env_t * env,
+ ...)
+{
+ axis2_char_t *cp,
+ *argp,
+ *str;
size_t saved_lengths[MAX_SAVED_LENGTHS];
int nargs = 0;
int str_len = 0;
@@ -401,10 +406,11 @@
return str;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_stracat(const axutil_env_t *env,
- const axis2_char_t *s1,
- const axis2_char_t *s2)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_stracat(
+ const axutil_env_t * env,
+ const axis2_char_t * s1,
+ const axis2_char_t * s2)
{
axis2_char_t *ret = NULL;
int alloc_len = -1;
@@ -417,27 +423,26 @@
}
if (!s1)
{
- return (axis2_char_t*)axutil_strdup(env, s2);
+ return (axis2_char_t *) axutil_strdup(env, s2);
}
if (!s2)
{
- return (axis2_char_t*)axutil_strdup(env,s1);
+ return (axis2_char_t *) axutil_strdup(env, s1);
}
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;
}
AXIS2_EXTERN int AXIS2_CALL
-axutil_strcmp(const axis2_char_t * s1,
+axutil_strcmp(
+ const axis2_char_t * s1,
const axis2_char_t * s2)
{
if (s1 && s2)
@@ -450,10 +455,10 @@
}
}
-
AXIS2_EXTERN int AXIS2_CALL
-axutil_strncmp(const axis2_char_t * s1,
- const axis2_char_t * s2,
+axutil_strncmp(
+ const axis2_char_t * s1,
+ const axis2_char_t * s2,
int n)
{
if (s1 && s2)
@@ -466,9 +471,9 @@
}
}
-
AXIS2_EXTERN axis2_ssize_t AXIS2_CALL
-axutil_strlen(const axis2_char_t * s)
+axutil_strlen(
+ const axis2_char_t * s)
{
if (s)
{
@@ -480,26 +485,33 @@
}
}
-
AXIS2_EXTERN int AXIS2_CALL
-axutil_strcasecmp(const axis2_char_t *s1,
- const axis2_char_t *s2)
+axutil_strcasecmp(
+ const axis2_char_t * s1,
+ const axis2_char_t * s2)
{
while (*s1 != '\0' && *s2 != '\0')
{
- if(*s1 >= 'A' && *s1 <= 'Z' && *s2 >= 'a' && *s2 <= 'z')
+ if (*s1 >= 'A' && *s1 <= 'Z' && *s2 >= 'a' && *s2 <= 'z')
{
- if (*s2 - *s1 - (char)32 != 0){ return 1;}
+ if (*s2 - *s1 - (char) 32 != 0)
+ {
+ return 1;
+ }
}
- else if(*s1 >= 'a' && *s1 <= 'z' && *s2 >= 'A' && *s2 <= 'Z')
+ else if (*s1 >= 'a' && *s1 <= 'z' && *s2 >= 'A' && *s2 <= 'Z')
{
- if (*s1 - *s2 - 32 != 0) {return 1;}
+ if (*s1 - *s2 - 32 != 0)
+ {
+ return 1;
+ }
}
else if (*s1 - *s2 != 0)
{
return 1;
}
- s1++; s2++;
+ s1++;
+ s2++;
}
if (*s1 != *s2)
{
@@ -509,63 +521,67 @@
return 0;
}
-
AXIS2_EXTERN int AXIS2_CALL
-axutil_strncasecmp(const axis2_char_t *s1,
- const axis2_char_t *s2,
+axutil_strncasecmp(
+ const axis2_char_t * s1,
+ const axis2_char_t * s2,
const int n)
{
- axis2_char_t *str1 = (axis2_char_t *)s1, *str2 = (axis2_char_t *)s2;
- int i = (int)n;
+ axis2_char_t *str1 = (axis2_char_t *) s1,
+ *str2 = (axis2_char_t *) s2;
+ int i = (int) n;
while (--i >= 0 && toupper(*str1) == toupper(*str2++))
{
if (toupper(*str1++) == '\0')
{
- return(0);
+ return (0);
}
}
- return(i < 0 ? 0 : toupper(*str1) - toupper(*--str2));
+ return (i < 0 ? 0 : toupper(*str1) - toupper(*--str2));
}
-AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axutil_strstr(const axis2_char_t *heystack,
- const axis2_char_t *needle)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_strstr(
+ const axis2_char_t * heystack,
+ const axis2_char_t * needle)
{
return strstr(heystack, needle);
}
-AXIS2_EXTERN axis2_char_t * AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axutil_strchr(
- const axis2_char_t *s,
- axis2_char_t ch)
+ const axis2_char_t * s,
+ axis2_char_t ch)
{
- return (axis2_char_t *)strchr(s, ch);
+ return (axis2_char_t *) strchr(s, ch);
}
-
-AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axutil_rindex(const axis2_char_t *_s,
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_rindex(
+ const axis2_char_t * _s,
axis2_char_t _ch)
{
- int i, ilen = axutil_strlen(_s);
+ int i,
+ ilen = axutil_strlen(_s);
if (ilen < 1)
{
return NULL;
}
- for (i = ilen - 1;i >= 0;i--)
+ for (i = ilen - 1; i >= 0; i--)
{
if (_s[i] == _ch)
{
- return (axis2_char_t *)(_s + i);
+ return (axis2_char_t *) (_s + i);
}
}
return NULL;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_replace(const axutil_env_t *env,
- axis2_char_t *str,
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_replace(
+ const axutil_env_t * env,
+ axis2_char_t * str,
int s1,
int s2)
{
@@ -586,10 +602,11 @@
return newstr;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_strltrim(const axutil_env_t *env,
- const axis2_char_t *_s,
- const axis2_char_t *_trim)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_strltrim(
+ const axutil_env_t * env,
+ const axis2_char_t * _s,
+ const axis2_char_t * _trim)
{
axis2_char_t *_p = NULL;
axis2_char_t *ret = NULL;
@@ -616,10 +633,11 @@
return ret;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_strrtrim(const axutil_env_t *env,
- const axis2_char_t *_s,
- const axis2_char_t *_trim)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_strrtrim(
+ const axutil_env_t * env,
+ const axis2_char_t * _s,
+ const axis2_char_t * _trim)
{
axis2_char_t *__tail;
axis2_char_t *ret = NULL;
@@ -645,10 +663,11 @@
return ret;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_strtrim(const axutil_env_t *env,
- const axis2_char_t *_s,
- const axis2_char_t *_trim)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_strtrim(
+ const axutil_env_t * env,
+ const axis2_char_t * _s,
+ const axis2_char_t * _trim)
{
axis2_char_t *_p = NULL;
axis2_char_t *_q = NULL;
@@ -662,13 +681,14 @@
return _q;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_string_replace(axis2_char_t* str,
- axis2_char_t old,
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_string_replace(
+ axis2_char_t * str,
+ axis2_char_t old,
axis2_char_t new)
{
- axis2_char_t* str_returns = str;
- for (; *str != '\0' ; str ++)
+ axis2_char_t *str_returns = str;
+ for (; *str != '\0'; str++)
{
if (*str == old)
{
@@ -678,8 +698,9 @@
return str_returns;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_string_substring_starting_at(axis2_char_t* str,
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_string_substring_starting_at(
+ axis2_char_t * str,
int s)
{
int len;
@@ -692,21 +713,21 @@
{
return NULL;
}
- memmove(str , str + s, pos_to_shift);
+ memmove(str, str + s, pos_to_shift);
return str;
}
-
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_string_substring_ending_at(axis2_char_t* str,
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_string_substring_ending_at(
+ axis2_char_t * str,
int e)
{
- axis2_char_t* ptr = NULL;
+ axis2_char_t *ptr = NULL;
int length = 0;
length = strlen(str);
ptr = str;
- if (length <= e)
+ if (length <= e)
{
return NULL;
}
@@ -715,34 +736,37 @@
return str;
}
-
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_string_tolower(axis2_char_t* str)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_string_tolower(
+ axis2_char_t * str)
{
- axis2_char_t* temp_str = NULL;
- for (temp_str = str; *temp_str != '\0' ; temp_str ++)
+ axis2_char_t *temp_str = NULL;
+ for (temp_str = str; *temp_str != '\0'; temp_str++)
{
*temp_str = tolower(*temp_str);
}
return str;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_string_toupper(axis2_char_t* str)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_string_toupper(
+ axis2_char_t * str)
{
- axis2_char_t* temp_str = NULL;
- for (temp_str = str; *temp_str != '\0' ; temp_str ++)
+ axis2_char_t *temp_str = NULL;
+ for (temp_str = str; *temp_str != '\0'; temp_str++)
{
*temp_str = toupper(*temp_str);
}
return str;
}
-AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axutil_strcasestr(const axis2_char_t *heystack,
- const axis2_char_t *needle)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_strcasestr(
+ const axis2_char_t * heystack,
+ const axis2_char_t * needle)
{
- axis2_char_t start, current;
+ axis2_char_t start,
+ current;
size_t len;
if (!heystack || !needle)
@@ -761,9 +785,11 @@
{
return NULL;
}
- } while (toupper(current) != toupper(start));
- } while (axutil_strncasecmp(heystack, needle, len));
+ }
+ while (toupper(current) != toupper(start));
+ }
+ while (axutil_strncasecmp(heystack, needle, len));
heystack--;
}
- return (axis2_char_t *)heystack;
+ return (axis2_char_t *) heystack;
}
Modified: webservices/axis2/trunk/c/util/src/string_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string_util.c?rev=580200&r1=580199&r2=580200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Thu Sep 27 20:12:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -19,14 +20,15 @@
#include <string.h>
#include <axutil_utils.h>
-AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-axutil_tokenize(const axutil_env_t *env,
- axis2_char_t *in,
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
+axutil_tokenize(
+ const axutil_env_t * env,
+ axis2_char_t * in,
int delim)
{
axutil_array_list_t *list = NULL;
axis2_char_t *rest = NULL;
- axis2_char_t *str = NULL;
+ axis2_char_t *str = NULL;
axis2_char_t *index = NULL;
@@ -60,9 +62,9 @@
}
if (!rest || axutil_strcmp(rest, "") == 0)
- {
+ {
break;
- }
+ }
str = rest;
rest = NULL;
index = NULL;
@@ -72,15 +74,16 @@
return list;
}
-AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-axutil_first_token(const axutil_env_t *env,
- axis2_char_t *in,
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
+axutil_first_token(
+ const axutil_env_t * env,
+ axis2_char_t * in,
int delim)
{
- axutil_array_list_t *list = NULL;
- axis2_char_t *str = NULL;
- axis2_char_t *rest = NULL;
- axis2_char_t *index = NULL;
+ axutil_array_list_t *list = NULL;
+ axis2_char_t *str = NULL;
+ axis2_char_t *rest = NULL;
+ axis2_char_t *index = NULL;
AXIS2_ENV_CHECK(env, NULL);
if (!in && (axutil_strcmp(in, "") == 0))
@@ -111,15 +114,16 @@
return list;
}
-AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-axutil_last_token(const axutil_env_t *env,
- axis2_char_t *in,
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
+axutil_last_token(
+ const axutil_env_t * env,
+ axis2_char_t * in,
int delim)
{
- axutil_array_list_t *list = NULL;
- axis2_char_t *str = NULL;
- axis2_char_t *rest = NULL;
- axis2_char_t *index = NULL;
+ axutil_array_list_t *list = NULL;
+ axis2_char_t *str = NULL;
+ axis2_char_t *rest = NULL;
+ axis2_char_t *index = NULL;
AXIS2_ENV_CHECK(env, NULL);
if (!in && (axutil_strcmp(in, "") == 0))
@@ -151,4 +155,3 @@
return list;
}
-
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=580200&r1=580199&r2=580200&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:12:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -24,13 +25,13 @@
axutil_allocator_t *allocator;
};
-AXIS2_EXTERN axutil_thread_pool_t * AXIS2_CALL
-axutil_thread_pool_init(axutil_allocator_t *allocator)
+AXIS2_EXTERN axutil_thread_pool_t *AXIS2_CALL
+axutil_thread_pool_init(
+ axutil_allocator_t * allocator)
{
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)
{
@@ -41,9 +42,9 @@
return pool;
}
-
AXIS2_EXTERN void AXIS2_CALL
-axutil_thread_pool_free(axutil_thread_pool_t *pool)
+axutil_thread_pool_free(
+ axutil_thread_pool_t * pool)
{
if (!pool)
{
@@ -57,9 +58,11 @@
return;
}
-AXIS2_EXTERN axutil_thread_t* AXIS2_CALL
-axutil_thread_pool_get_thread(axutil_thread_pool_t *pool,
- axutil_thread_start_t func, void *data)
+AXIS2_EXTERN axutil_thread_t *AXIS2_CALL
+axutil_thread_pool_get_thread(
+ axutil_thread_pool_t * pool,
+ axutil_thread_start_t func,
+ void *data)
{
if (!pool)
{
@@ -72,10 +75,10 @@
return axutil_thread_create(pool->allocator, NULL, func, data);
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axutil_thread_pool_join_thread(axutil_thread_pool_t *pool,
- axutil_thread_t *thd)
+axutil_thread_pool_join_thread(
+ axutil_thread_pool_t * pool,
+ axutil_thread_t * thd)
{
if (!pool || !thd)
{
@@ -84,10 +87,10 @@
return axutil_thread_join(thd);
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axutil_thread_pool_exit_thread(axutil_thread_pool_t *pool,
- axutil_thread_t *thd)
+axutil_thread_pool_exit_thread(
+ axutil_thread_pool_t * pool,
+ axutil_thread_t * thd)
{
if (!pool || !thd)
{
@@ -96,10 +99,10 @@
return axutil_thread_exit(thd, pool->allocator);
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axutil_thread_pool_thread_detach(axutil_thread_pool_t *pool,
- axutil_thread_t *thd)
+axutil_thread_pool_thread_detach(
+ axutil_thread_pool_t * pool,
+ axutil_thread_t * thd)
{
if (!pool || !thd)
{
@@ -109,15 +112,17 @@
}
AXIS2_EXTERN axutil_env_t *AXIS2_CALL
-axutil_init_thread_env(const axutil_env_t *system_env)
+axutil_init_thread_env(
+ 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);
+ system_env->log, system_env->thread_pool);
}
AXIS2_EXTERN void AXIS2_CALL
-axutil_free_thread_env(struct axutil_env *thread_env)
+axutil_free_thread_env(
+ struct axutil_env *thread_env)
{
if (!thread_env)
{
@@ -132,4 +137,3 @@
}
AXIS2_FREE(thread_env->allocator, thread_env);
}
-
Modified: webservices/axis2/trunk/c/util/src/types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/types.c?rev=580200&r1=580199&r2=580200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/types.c (original)
+++ webservices/axis2/trunk/c/util/src/types.c Thu Sep 27 20:12:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,9 +19,11 @@
#include <axutil_types.h>
AXIS2_EXTERN int AXIS2_CALL
-axutil_atoi(const char *s)
+axutil_atoi(
+ const char *s)
{
- int i, n;
+ int i,
+ n;
n = 0;
for (i = 0; s[i] >= '0' && s[i] <= '9'; ++i)
@@ -29,5 +32,3 @@
}
return n;
}
-
-
Modified: webservices/axis2/trunk/c/util/src/uri.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uri.c?rev=580200&r1=580199&r2=580200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/uri.c (original)
+++ webservices/axis2/trunk/c/util/src/uri.c Thu Sep 27 20:12:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -26,41 +27,44 @@
/** Structure to store various schemes and their default ports */
struct schemes_t
{
+
/** The name of the scheme */
const axis2_char_t *name;
+
/** The default port for the scheme */
axis2_port_t default_port;
};
/* Some WWW schemes and their default ports; this is basically /etc/services */
+
/* This will become global when the protocol abstraction comes */
+
/* As the schemes are searched by a linear search, */
+
/* they are sorted by their expected frequency */
-static schemes_t schemes[] =
- {
- {"http", AXIS2_URI_HTTP_DEFAULT_PORT
- },
- {"ftp", AXIS2_URI_FTP_DEFAULT_PORT},
- {"https", AXIS2_URI_HTTPS_DEFAULT_PORT},
- {"gopher", AXIS2_URI_GOPHER_DEFAULT_PORT},
- {"ldap", AXIS2_URI_LDAP_DEFAULT_PORT},
- {"nntp", AXIS2_URI_NNTP_DEFAULT_PORT},
- {"snews", AXIS2_URI_SNEWS_DEFAULT_PORT},
- {"imap", AXIS2_URI_IMAP_DEFAULT_PORT},
- {"pop", AXIS2_URI_POP_DEFAULT_PORT},
- {"sip", AXIS2_URI_SIP_DEFAULT_PORT},
- {"rtsp", AXIS2_URI_RTSP_DEFAULT_PORT},
- {"wais", AXIS2_URI_WAIS_DEFAULT_PORT},
- {"z39.50r", AXIS2_URI_WAIS_DEFAULT_PORT},
- {"z39.50s", AXIS2_URI_WAIS_DEFAULT_PORT},
- {"prospero", AXIS2_URI_PROSPERO_DEFAULT_PORT},
- {"nfs", AXIS2_URI_NFS_DEFAULT_PORT},
- {"tip", AXIS2_URI_TIP_DEFAULT_PORT},
- {"acap", AXIS2_URI_ACAP_DEFAULT_PORT},
- {"telnet", AXIS2_URI_TELNET_DEFAULT_PORT},
- {"ssh", AXIS2_URI_SSH_DEFAULT_PORT},
- { NULL, 0xFFFF } /* unknown port */
- };
+static schemes_t schemes[] = {
+ {"http", AXIS2_URI_HTTP_DEFAULT_PORT},
+ {"ftp", AXIS2_URI_FTP_DEFAULT_PORT},
+ {"https", AXIS2_URI_HTTPS_DEFAULT_PORT},
+ {"gopher", AXIS2_URI_GOPHER_DEFAULT_PORT},
+ {"ldap", AXIS2_URI_LDAP_DEFAULT_PORT},
+ {"nntp", AXIS2_URI_NNTP_DEFAULT_PORT},
+ {"snews", AXIS2_URI_SNEWS_DEFAULT_PORT},
+ {"imap", AXIS2_URI_IMAP_DEFAULT_PORT},
+ {"pop", AXIS2_URI_POP_DEFAULT_PORT},
+ {"sip", AXIS2_URI_SIP_DEFAULT_PORT},
+ {"rtsp", AXIS2_URI_RTSP_DEFAULT_PORT},
+ {"wais", AXIS2_URI_WAIS_DEFAULT_PORT},
+ {"z39.50r", AXIS2_URI_WAIS_DEFAULT_PORT},
+ {"z39.50s", AXIS2_URI_WAIS_DEFAULT_PORT},
+ {"prospero", AXIS2_URI_PROSPERO_DEFAULT_PORT},
+ {"nfs", AXIS2_URI_NFS_DEFAULT_PORT},
+ {"tip", AXIS2_URI_TIP_DEFAULT_PORT},
+ {"acap", AXIS2_URI_ACAP_DEFAULT_PORT},
+ {"telnet", AXIS2_URI_TELNET_DEFAULT_PORT},
+ {"ssh", AXIS2_URI_SSH_DEFAULT_PORT},
+ {NULL, 0xFFFF} /* unknown port */
+};
/* Here is the hand-optimized parse_uri_components(). There are some wild
* tricks we could pull in assembly language that we don't pull here... like we
@@ -73,57 +77,56 @@
* compares for NUL for free -- it's just another delimiter.
*/
-#define T_COLON 0x01 /* ':' */
-#define T_SLASH 0x02 /* '/' */
-#define T_QUESTION 0x04 /* '?' */
-#define T_HASH 0x08 /* '#' */
-#define T_NUL 0x80 /* '\0' */
+#define T_COLON 0x01 /* ':' */
+#define T_SLASH 0x02 /* '/' */
+#define T_QUESTION 0x04 /* '?' */
+#define T_HASH 0x08 /* '#' */
+#define T_NUL 0x80 /* '\0' */
#if AXIS2_CHARSET_EBCDIC
+
/* Delimiter table for the EBCDIC character set */
-static const unsigned char uri_delims[256] =
- {
- T_NUL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, T_SLASH, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, T_QUESTION,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, T_COLON, T_HASH, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
- };
+static const unsigned char uri_delims[256] = {
+ T_NUL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, T_SLASH, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, T_QUESTION,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, T_COLON, T_HASH, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
#else
+
/* Delimiter table for the ASCII character set */
-static const unsigned char uri_delims[256] =
- {
- T_NUL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, T_HASH, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, T_SLASH,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, T_COLON, 0, 0, 0, 0, T_QUESTION,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
- };
+static const unsigned char uri_delims[256] = {
+ T_NUL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, T_HASH, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, T_SLASH,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, T_COLON, 0, 0, 0, 0, T_QUESTION,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
#endif
-
/* it works like this:
if (uri_delims[ch] & NOTEND_foobar) {
then we're not at a delimiter for foobar
@@ -137,28 +140,36 @@
#define NOTEND_HOSTINFO (T_SLASH | T_QUESTION | T_HASH | T_NUL)
#define NOTEND_PATH (T_QUESTION | T_HASH | T_NUL)
-
/**
* A structure to encompass all of the fields in a uri
*/
struct axutil_uri
{
+
/** scheme ("http"/"ftp"/...) */
axis2_char_t *scheme;
+
/** combined [user[:password]\@]host[:port] */
axis2_char_t *hostinfo;
+
/** user name, as in http://user:passwd\@host:port/ */
axis2_char_t *user;
+
/** password, as in http://user:passwd\@host:port/ */
axis2_char_t *password;
+
/** hostname from URI (or from Host: header) */
axis2_char_t *hostname;
+
/** port string (integer representation is in "port") */
axis2_char_t *port_str;
+
/** the request path (or "/" if only scheme://host was given) */
axis2_char_t *path;
+
/** Everything after a '?' in the path, if present */
axis2_char_t *query;
+
/** Trailing "#fragment" string, if present */
axis2_char_t *fragment;
@@ -169,25 +180,23 @@
axis2_port_t port;
/** has the structure been initialized */
-unsigned is_initialized:
- 1;
+ unsigned is_initialized:1;
/** has the DNS been looked up yet */
-unsigned dns_looked_up:
- 1;
+ unsigned dns_looked_up:1;
+
/** has the dns been resolved yet */
-unsigned dns_resolved:
- 1;
+ unsigned dns_resolved:1;
};
-AXIS2_EXTERN axutil_uri_t * AXIS2_CALL
-axutil_uri_create(const axutil_env_t *env)
+AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+axutil_uri_create(
+ const axutil_env_t * env)
{
axutil_uri_t *uri = NULL;
AXIS2_ENV_CHECK(env, NULL);
- uri = (axutil_uri_t *)AXIS2_MALLOC(env->allocator,
- sizeof(axutil_uri_t));
+ uri = (axutil_uri_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_uri_t));
if (!uri)
{
@@ -209,8 +218,9 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axutil_uri_free(axutil_uri_t *uri,
- const axutil_env_t *env)
+axutil_uri_free(
+ axutil_uri_t * uri,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -283,8 +293,9 @@
*/
AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
-axutil_uri_parse_string(const axutil_env_t *env,
- const axis2_char_t *uri_str)
+axutil_uri_parse_string(
+ const axutil_env_t * env,
+ const axis2_char_t * uri_str)
{
axutil_uri_t *uri = NULL;
const axis2_char_t *s;
@@ -292,7 +303,8 @@
const axis2_char_t *hostinfo;
axis2_char_t *endstr;
int port;
- int v6_offset1 = 0, v6_offset2 = 0;
+ int v6_offset1 = 0,
+ v6_offset2 = 0;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, uri_str, NULL);
@@ -302,7 +314,7 @@
/* Initialize the structure. parse_uri() and parse_uri_components()
* can be called more than once per request.
*/
- /*memset (uri, '\0', sizeof(*uri));*/
+ /*memset (uri, '\0', sizeof(*uri)); */
uri->is_initialized = 1;
/* We assume the processor has a branch predictor like most --
@@ -322,16 +334,16 @@
*/
if (uri_str[1] == '/' && uri_str[2] != '/')
{
- s = uri_str + 2 ;
- goto deal_with_authority ;
+ s = uri_str + 2;
+ goto deal_with_authority;
}
-deal_with_path:
+ deal_with_path:
/* we expect uri to point to first character of path ... remember
* that the path could be empty -- http://foobar?query for example
*/
s = uri_str;
- while ((uri_delims[*(unsigned char *)s] & NOTEND_PATH) == 0)
+ while ((uri_delims[*(unsigned char *) s] & NOTEND_PATH) == 0)
{
++s;
}
@@ -366,26 +378,26 @@
/* find the scheme: */
s = uri_str;
- while ((uri_delims[*(unsigned char *)s] & NOTEND_SCHEME) == 0)
+ while ((uri_delims[*(unsigned char *) s] & NOTEND_SCHEME) == 0)
{
++s;
}
/* scheme must be non-empty and followed by :// */
if (s == uri_str || s[0] != ':' || s[1] != '/' || s[2] != '/')
{
- goto deal_with_path; /* backwards predicted taken! */
+ goto deal_with_path; /* backwards predicted taken! */
}
uri->scheme = axutil_strmemdup(uri_str, s - uri_str, env);
s += 3;
-deal_with_authority:
+ deal_with_authority:
hostinfo = s;
- while ((uri_delims[*(unsigned char *)s] & NOTEND_HOSTINFO) == 0)
+ while ((uri_delims[*(unsigned char *) s] & NOTEND_HOSTINFO) == 0)
{
++s;
}
- uri_str = s; /* whatever follows hostinfo is start of uri */
+ uri_str = s; /* whatever follows hostinfo is start of uri */
uri->hostinfo = axutil_strmemdup(hostinfo, uri_str - hostinfo, env);
/* If there's a username:password@host:port, the @ we want is the last @...
@@ -401,7 +413,7 @@
if (s < hostinfo)
{
/* again we want the common case to be fall through */
-deal_with_host:
+ deal_with_host:
/* We expect hostinfo to point to the first character of
* the hostname. If there's a port it is the first colon,
* except with IPv6.
@@ -417,7 +429,7 @@
}
if (*++s != ':')
{
- s = NULL; /* no port */
+ s = NULL; /* no port */
}
}
else
@@ -427,13 +439,11 @@
if (!s)
{
/* we expect the common case to have no port */
- uri->hostname = axutil_strmemdup(hostinfo + v6_offset1,
- uri_str - hostinfo - v6_offset2, env);
+ uri->hostname =
+ 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)
@@ -470,13 +480,15 @@
}
/* Special case for CONNECT parsing: it comes with the hostinfo part only */
+
/* See the INTERNET-DRAFT document "Tunneling SSL Through a WWW Proxy"
* currently at http://www.mcom.com/newsref/std/tunneling_ssl.html
* for the format of the "CONNECT host:port HTTP/1.0" request
*/
AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
-axutil_uri_parse_hostinfo(const axutil_env_t *env,
- const axis2_char_t *hostinfo)
+axutil_uri_parse_hostinfo(
+ const axutil_env_t * env,
+ const axis2_char_t * hostinfo)
{
axutil_uri_t *uri = NULL;
const axis2_char_t *s;
@@ -501,8 +513,7 @@
*/
if (*hostinfo == '[')
{
- if (!(rsb = strchr(hostinfo, ']')) ||
- *(rsb + 1) != ':')
+ if (!(rsb = strchr(hostinfo, ']')) || *(rsb + 1) != ':')
{
return NULL;
}
@@ -536,16 +547,16 @@
/* Resolve relative to a base. This means host/etc, and (crucially) path */
AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
-axutil_uri_resolve_relative(const axutil_env_t *env,
- const axutil_uri_t* base,
- axutil_uri_t* uri)
+axutil_uri_resolve_relative(
+ const axutil_env_t * env,
+ const axutil_uri_t * base,
+ axutil_uri_t * uri)
{
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, base, NULL);
AXIS2_PARAM_CHECK(env->error, uri, NULL);
- if (!uri || !base || ! base->is_initialized
- || ! uri->is_initialized)
+ if (!uri || !base || !base->is_initialized || !uri->is_initialized)
{
return NULL;
}
@@ -555,22 +566,22 @@
if (!uri->hostname)
{
/* is this compatible with is_initialised? Harmless in any case */
- uri->path = base->path ? base->path : axutil_strdup(env, "/") ;
+ uri->path = base->path ? base->path : axutil_strdup(env, "/");
}
else
{
/* deal with the idiosyncracy of APR allowing path==NULL
* without risk of breaking back-compatibility
*/
- uri->path = axutil_strdup(env, "/") ;
+ uri->path = axutil_strdup(env, "/");
}
}
else if (uri->path[0] != '/')
{
- size_t baselen ;
- const char* basepath = base->path ? base->path : "/" ;
- const char* path = uri->path ;
- const char* base_end = strrchr(basepath, '/') ;
+ size_t baselen;
+ const char *basepath = base->path ? base->path : "/";
+ const char *path = uri->path;
+ const char *base_end = strrchr(basepath, '/');
/* if base is nonsensical, bail out */
if (basepath[0] != '/')
@@ -584,83 +595,85 @@
{
if (*--base_end == '/')
{
- break ;
+ break;
}
}
- path += 3 ;
+ path += 3;
}
/* munch "here" components at the start */
while (!strncmp(path, "./", 2))
{
- path += 2 ;
+ path += 2;
}
- baselen = base_end - basepath + 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) ;
+ baselen = base_end - basepath + 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);
}
/* The trivial bits are everything-but-path */
if (!uri->scheme)
{
- uri->scheme = axutil_strdup(env, base->scheme) ;
+ uri->scheme = axutil_strdup(env, base->scheme);
}
if (!uri->hostinfo)
{
- uri->hostinfo = axutil_strdup(env, base->hostinfo) ;
+ uri->hostinfo = axutil_strdup(env, base->hostinfo);
}
if (!uri->user)
{
- uri->user = axutil_strdup(env, base->user) ;
+ uri->user = axutil_strdup(env, base->user);
}
if (!uri->password)
{
- uri->password = axutil_strdup(env, base->password) ;
+ uri->password = axutil_strdup(env, base->password);
}
if (!uri->hostname)
{
- uri->hostname = axutil_strdup(env, base->hostname) ;
+ uri->hostname = axutil_strdup(env, base->hostname);
}
if (!uri->port_str)
{
- uri->port_str = axutil_strdup(env, base->port_str) ;
+ uri->port_str = axutil_strdup(env, base->port_str);
}
if (!uri->hostent)
{
- uri->hostent = base->hostent ;
+ uri->hostent = base->hostent;
}
- if (! uri->port)
+ if (!uri->port)
{
- uri->port = base->port ;
+ uri->port = base->port;
}
return uri;
}
AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
-axutil_uri_parse_relative(const axutil_env_t *env,
- const axutil_uri_t* base,
- const char* uri)
+axutil_uri_parse_relative(
+ const axutil_env_t * env,
+ const axutil_uri_t * base,
+ const char *uri)
{
axutil_uri_t *uptr = NULL;
- uptr = axutil_uri_parse_string(env, uri) ;
- if (! uptr && AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ uptr = axutil_uri_parse_string(env, uri);
+ if (!uptr && AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
- return uptr ;
+ return uptr;
}
- uptr = axutil_uri_resolve_relative(env, base, uptr) ;
+ uptr = axutil_uri_resolve_relative(env, base, uptr);
return uptr;
}
AXIS2_EXTERN axis2_port_t AXIS2_CALL
-axutil_uri_port_of_scheme(const axis2_char_t *scheme_str)
+axutil_uri_port_of_scheme(
+ const axis2_char_t * scheme_str)
{
schemes_t *scheme;
if (scheme_str)
{
- for (scheme = schemes; scheme->name ; ++scheme)
+ for (scheme = schemes; scheme->name; ++scheme)
{
if (axutil_strcasecmp(scheme_str, scheme->name) == 0)
{
@@ -672,8 +685,9 @@
}
AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
-axutil_uri_clone(const axutil_uri_t* uri,
- const axutil_env_t *env)
+axutil_uri_clone(
+ const axutil_uri_t * uri,
+ const axutil_env_t * env)
{
axutil_uri_t *new_uri = NULL;
@@ -701,9 +715,10 @@
/* Unparse a axutil_uri_t structure to an URI string.
* Optionally suppress the password for security reasons.
*/
-AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axutil_uri_to_string(const axutil_uri_t *uri,
- const axutil_env_t *env,
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_uri_to_string(
+ const axutil_uri_t * uri,
+ const axutil_env_t * env,
unsigned flags)
{
axis2_char_t *ret = "";
@@ -717,46 +732,45 @@
* AXIS2_URI_UNP_ flags: */
if (uri->user || uri->password)
{
- ret = axutil_strcat(env,
- (uri->user && !(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);
+ ret =
+ axutil_strcat(env,
+ (uri->user &&
+ !(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);
}
/* Construct scheme://site string */
if (uri->hostname)
-{
+ {
int is_default_port;
- const axis2_char_t *lbrk = "", *rbrk = "";
+ const axis2_char_t *lbrk = "",
+ *rbrk = "";
if (strchr(uri->hostname, ':'))
- { /* v6 literal */
+ { /* v6 literal */
lbrk = "[";
rbrk = "]";
}
- is_default_port =
- (uri->port_str == NULL ||
- uri->port == 0 ||
- uri->port == axutil_uri_port_of_scheme(uri->scheme));
+ is_default_port = (uri->port_str == NULL || uri->port == 0 ||
+ 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);
+ ret =
+ axutil_strcat(env, uri->scheme, "://", ret, lbrk, uri->hostname, rbrk,
+ is_default_port ? "" : ":", is_default_port ? "" : uri->port_str,
+ NULL);
}
else
{
@@ -765,11 +779,10 @@
* to the authority, so include the authority prefix while
* omitting the "scheme:" that the user neglected to pass us.
*/
- ret = axutil_strcat(env,
- "//", ret, lbrk, uri->hostname, rbrk,
- is_default_port ? "" : ":",
- is_default_port ? "" : uri->port_str,
- NULL);
+ ret =
+ axutil_strcat(env, "//", ret, lbrk, uri->hostname, rbrk,
+ is_default_port ? "" : ":", is_default_port ? "" : uri->port_str,
+ NULL);
}
}
}
@@ -778,48 +791,48 @@
if (!(flags & AXIS2_URI_UNP_OMITPATHINFO))
{
/* 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);
+ 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);
}
return ret;
}
axis2_char_t *AXIS2_CALL
-axutil_uri_get_protocol(axutil_uri_t *uri,
- const axutil_env_t *env)
+axutil_uri_get_protocol(
+ axutil_uri_t * uri,
+ const axutil_env_t * env)
{
return uri->scheme;
}
axis2_char_t *AXIS2_CALL
-axutil_uri_get_server(axutil_uri_t *uri,
- const axutil_env_t *env)
+axutil_uri_get_server(
+ axutil_uri_t * uri,
+ const axutil_env_t * env)
{
return uri->hostinfo;
}
axis2_port_t AXIS2_CALL
-axutil_uri_get_port(axutil_uri_t *uri,
- const axutil_env_t *env)
+axutil_uri_get_port(
+ axutil_uri_t * uri,
+ const axutil_env_t * env)
{
return uri->port;
}
axis2_char_t *AXIS2_CALL
-axutil_uri_get_path(axutil_uri_t *uri,
- const axutil_env_t *env)
+axutil_uri_get_path(
+ axutil_uri_t * uri,
+ const axutil_env_t * env)
{
return uri->path;
}
-
Modified: webservices/axis2/trunk/c/util/src/url.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?rev=580200&r1=580199&r2=580200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Thu Sep 27 20:12:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,19 +31,19 @@
axis2_char_t *path;
};
-AXIS2_EXTERN axutil_url_t * AXIS2_CALL
-axutil_url_create(const axutil_env_t *env,
- const axis2_char_t *protocol,
- const axis2_char_t *server,
+AXIS2_EXTERN axutil_url_t *AXIS2_CALL
+axutil_url_create(
+ const axutil_env_t * env,
+ const axis2_char_t * protocol,
+ const axis2_char_t * server,
const int port,
- const axis2_char_t *path)
+ const axis2_char_t * path)
{
axutil_url_t *url = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, protocol, NULL);
- url = (axutil_url_t *)AXIS2_MALLOC(env->allocator,
- sizeof(axutil_url_t));
+ url = (axutil_url_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_url_t));
if (!url)
{
@@ -56,15 +57,16 @@
if (server)
{
- url->server = (axis2_char_t *)axutil_strdup(env, server);
+ url->server = (axis2_char_t *) axutil_strdup(env, server);
}
+
/** if the path is not starting with / we have to make it so
*/
if (path)
{
if (path[0] == '/')
{
- url->path = (axis2_char_t *)axutil_strdup(env, path);
+ url->path = (axis2_char_t *) axutil_strdup(env, path);
}
else
{
@@ -76,10 +78,12 @@
return url;
}
-AXIS2_EXTERN axutil_url_t * AXIS2_CALL
-axutil_url_parse_string(const axutil_env_t *env,
- const axis2_char_t *str_url)
+AXIS2_EXTERN axutil_url_t *AXIS2_CALL
+axutil_url_parse_string(
+ const axutil_env_t * env,
+ const axis2_char_t * str_url)
{
+
/**
* Only accepted format is :
* protocol://server:port/path
@@ -108,15 +112,13 @@
server = strstr(tmp_url_str, "://");
if (!server)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS, AXIS2_FAILURE);
AXIS2_FREE(env->allocator, tmp_url_str);
return NULL;
}
if (axutil_strlen(server) < 3 * sizeof(axis2_char_t))
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS, AXIS2_FAILURE);
AXIS2_FREE(env->allocator, tmp_url_str);
return NULL;
}
@@ -124,15 +126,14 @@
server += 3 * sizeof(axis2_char_t); /* skip "://" part */
if (axutil_strlen(server) <= 0)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS, AXIS2_FAILURE);
AXIS2_FREE(env->allocator, tmp_url_str);
return NULL;
}
/* if the url is file:// thing we need the protocol and
* path only
*/
- if (0 == axutil_strcasecmp(protocol, (const axis2_char_t *)"file"))
+ if (0 == axutil_strcasecmp(protocol, (const axis2_char_t *) "file"))
{
ret = axutil_url_create(env, protocol, NULL, 0, server);
AXIS2_FREE(env->allocator, tmp_url_str);
@@ -149,7 +150,7 @@
port = 20;
else if (axutil_strcasecmp(protocol, "smtp") == 0)
port = 25;
-
+
path = strchr(server, '/');
if (!path)
{
@@ -213,24 +214,25 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axutil_url_free(axutil_url_t *url,
- const axutil_env_t *env)
+axutil_url_free(
+ axutil_url_t * url,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (url->protocol)
{
AXIS2_FREE(env->allocator, url->protocol);
- url->protocol = NULL;
+ url->protocol = NULL;
}
if (url->server)
{
AXIS2_FREE(env->allocator, url->server);
- url->server = NULL;
+ url->server = NULL;
}
if (url->path)
{
AXIS2_FREE(env->allocator, url->path);
- url->path = NULL;
+ url->path = NULL;
}
url->port = -1;
@@ -239,9 +241,10 @@
return;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_url_to_external_form(axutil_url_t *url,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_url_to_external_form(
+ axutil_url_t * url,
+ const axutil_env_t * env)
{
axis2_char_t *external_form = NULL;
axis2_ssize_t len = 0;
@@ -250,21 +253,19 @@
AXIS2_PARAM_CHECK(env->error, url, NULL);
sprintf(port_str, "%d", url->port);
- len = axutil_strlen(url->protocol) +
- axutil_strlen(url->server) + axutil_strlen(url->path) +
+ len =
+ 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);
+ 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);
return external_form;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axutil_url_set_protocol(axutil_url_t *url,
- const axutil_env_t *env,
- axis2_char_t *protocol)
+axutil_url_set_protocol(
+ axutil_url_t * url,
+ const axutil_env_t * env,
+ axis2_char_t * protocol)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, protocol, AXIS2_FAILURE);
@@ -277,18 +278,19 @@
return AXIS2_SUCCESS;
}
-
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_url_get_protocol(axutil_url_t *url,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_url_get_protocol(
+ axutil_url_t * url,
+ const axutil_env_t * env)
{
return url->protocol;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axutil_url_set_server(axutil_url_t *url,
- const axutil_env_t *env,
- axis2_char_t *server)
+axutil_url_set_server(
+ axutil_url_t * url,
+ const axutil_env_t * env,
+ axis2_char_t * server)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, server, AXIS2_FAILURE);
@@ -300,17 +302,18 @@
return AXIS2_SUCCESS;
}
-
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_url_get_server(axutil_url_t *url,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_url_get_server(
+ axutil_url_t * url,
+ const axutil_env_t * env)
{
return url->server;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axutil_url_set_port(axutil_url_t *url,
- const axutil_env_t *env,
+axutil_url_set_port(
+ axutil_url_t * url,
+ const axutil_env_t * env,
int port)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -318,18 +321,19 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN int AXIS2_CALL
-axutil_url_get_port(axutil_url_t *url,
- const axutil_env_t *env)
+axutil_url_get_port(
+ axutil_url_t * url,
+ const axutil_env_t * env)
{
return url->port;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axutil_url_set_path(axutil_url_t *url,
- const axutil_env_t *env,
- axis2_char_t *path)
+axutil_url_set_path(
+ axutil_url_t * url,
+ const axutil_env_t * env,
+ axis2_char_t * path)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, path, AXIS2_FAILURE);
@@ -341,29 +345,28 @@
return AXIS2_SUCCESS;
}
-
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axutil_url_get_path(axutil_url_t *url,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_url_get_path(
+ axutil_url_t * url,
+ const axutil_env_t * env)
{
return url->path;
}
-AXIS2_EXTERN axutil_url_t* AXIS2_CALL
-axutil_url_clone(axutil_url_t *url,
- const axutil_env_t *env)
+AXIS2_EXTERN axutil_url_t *AXIS2_CALL
+axutil_url_clone(
+ axutil_url_t * url,
+ const axutil_env_t * env)
{
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
-axutil_url_to_uri(axutil_url_t *url,
- const axutil_env_t *env)
+axutil_url_to_uri(
+ axutil_url_t * url,
+ const axutil_env_t * env)
{
axis2_char_t *url_str = NULL;
axutil_uri_t *uri = NULL;
@@ -372,4 +375,3 @@
uri = axutil_uri_parse_string(env, url_str);
return uri;
}
-
Modified: webservices/axis2/trunk/c/util/src/utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/utils.c?rev=580200&r1=580199&r2=580200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/utils.c (original)
+++ webservices/axis2/trunk/c/util/src/utils.c Thu Sep 27 20:12:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -23,21 +24,19 @@
AXIS2_EXPORT axis2_char_t *axis2_request_url_prefix = "services";
-AXIS2_EXTERN axis2_char_t** AXIS2_CALL
-axutil_parse_request_url_for_svc_and_op(const axutil_env_t *env,
- const axis2_char_t *request)
-
+AXIS2_EXTERN axis2_char_t **AXIS2_CALL
+axutil_parse_request_url_for_svc_and_op(
+ const axutil_env_t * env,
+ const axis2_char_t * request)
{
axis2_char_t **ret = NULL;
axis2_char_t *service_str = NULL;
axis2_char_t *tmp = NULL;
int i = 0;
AXIS2_ENV_CHECK(env, NULL);
- ret = AXIS2_MALLOC(env->allocator,
- 2 * (sizeof(axis2_char_t *)));
- memset(ret, 0, 2*sizeof(axis2_char_t*));
- tmp = (axis2_char_t *)request;
-
+ ret = AXIS2_MALLOC(env->allocator, 2 * (sizeof(axis2_char_t *)));
+ memset(ret, 0, 2 * sizeof(axis2_char_t *));
+ tmp = (axis2_char_t *) request;
while (1)
{
@@ -58,7 +57,7 @@
if ('\0' != *service_str)
{
if (*service_str == '/')
- service_str++; /*to remove the leading '/' */
+ service_str++; /*to remove the leading '/' */
tmp = strchr(service_str, '/');
if (tmp)
{
@@ -76,8 +75,7 @@
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';
}
@@ -98,8 +96,8 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axutil_xml_quote_string(
- const axutil_env_t *env,
- const axis2_char_t *s,
+ const axutil_env_t * env,
+ const axis2_char_t * s,
axis2_bool_t quotes)
{
const char *scan;
@@ -109,14 +107,14 @@
char *qscan;
char c;
- for (scan = s; (c = *scan) != '\0'; ++scan, ++len)
+ for (scan = s; (c = *scan) != '\0'; ++scan, ++len)
{
if (c == '<' || c == '>')
- extra += 3; /* < or > */
+ extra += 3; /* < or > */
else if (c == '&')
- extra += 4; /* & */
+ extra += 4; /* & */
else if (quotes && c == '"')
- extra += 5; /* " */
+ extra += 5; /* " */
}
/* nothing to do */
@@ -124,23 +122,23 @@
return NULL;
qstr = AXIS2_MALLOC(env->allocator, len + extra + 1);
- for (scan = s, qscan = qstr; (c = *scan) != '\0'; ++scan)
+ for (scan = s, qscan = qstr; (c = *scan) != '\0'; ++scan)
{
- if (c == '<')
+ if (c == '<')
{
*qscan++ = '&';
*qscan++ = 'l';
*qscan++ = 't';
*qscan++ = ';';
}
- else if (c == '>')
+ else if (c == '>')
{
*qscan++ = '&';
*qscan++ = 'g';
*qscan++ = 't';
*qscan++ = ';';
}
- else if (c == '&')
+ else if (c == '&')
{
*qscan++ = '&';
*qscan++ = 'a';
@@ -148,7 +146,7 @@
*qscan++ = 'p';
*qscan++ = ';';
}
- else if (quotes && c == '"')
+ else if (quotes && c == '"')
{
*qscan++ = '&';
*qscan++ = 'q';
@@ -157,7 +155,7 @@
*qscan++ = 't';
*qscan++ = ';';
}
- else
+ else
{
*qscan++ = c;
}
@@ -166,4 +164,3 @@
*qscan = '\0';
return qstr;
}
-
Modified: webservices/axis2/trunk/c/util/src/uuid_gen.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uuid_gen.c?rev=580200&r1=580199&r2=580200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/uuid_gen.c (original)
+++ webservices/axis2/trunk/c/util/src/uuid_gen.c Thu Sep 27 20:12:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -17,20 +18,17 @@
#include <axutil_uuid_gen.h>
-
-
-AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axutil_uuid_gen(const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axutil_uuid_gen(
+ const axutil_env_t * env)
{
axis2_char_t *str = AXIS2_MALLOC(env->allocator, 40 * sizeof(char));
axutil_platform_uuid_gen(str);
if (!str)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_UUID_GEN_FAILED,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_UUID_GEN_FAILED, AXIS2_FAILURE);
return NULL;
}
return str;
}
-
Modified: webservices/axis2/trunk/c/util/src/version.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/version.c?rev=580200&r1=580199&r2=580200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/version.c (original)
+++ webservices/axis2/trunk/c/util/src/version.c Thu Sep 27 20:12:58 2007
@@ -1,3 +1,4 @@
+
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -17,8 +18,9 @@
#include <axutil_version.h>
-AXIS2_EXTERN void AXIS2_CALL
-axis2_version(axis2_version_t *pvsn)
+AXIS2_EXTERN void AXIS2_CALL
+axis2_version(
+ axis2_version_t * pvsn)
{
pvsn->major = AXIS2_MAJOR_VERSION;
pvsn->minor = AXIS2_MINOR_VERSION;
@@ -30,9 +32,9 @@
#endif
}
-AXIS2_EXTERN const char *AXIS2_CALL
-axis2_version_string(void)
+AXIS2_EXTERN const char *AXIS2_CALL
+axis2_version_string(
+ void)
{
return AXIS2_VERSION_STRING;
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org