You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/30 20:28:34 UTC
svn commit: r524225 [6/22] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/src/util/ include/ modules/core/addr/
modules/core/clientapi/ modules/core/context/ modules/...
Copied: webservices/axis2/trunk/c/util/include/axutil_hash.h (from r524188, webservices/axis2/trunk/c/util/include/axis2_hash.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_hash.h?view=diff&rev=524225&p1=webservices/axis2/trunk/c/util/include/axis2_hash.h&r1=524188&p2=webservices/axis2/trunk/c/util/include/axutil_hash.h&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_hash.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_hash.h Fri Mar 30 11:28:18 2007
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-#ifndef AXIS2_HASH_H
-#define AXIS2_HASH_H
+#ifndef AXUTIL_HASH_H
+#define AXUTIL_HASH_H
/**
- * @file axis2_hash.h
+ * @file axutil_hash.h
* @brief Axis2 Hash Tables
*/
@@ -32,32 +32,32 @@
#endif
/**
- * @defgroup axis2_hash hash
+ * @defgroup axutil_hash hash
* @ingroup axis2_util
* @{
*/
/**
- * When passing a key to axis2_hash_set or axis2_hash_get, this value can be
- * passed to indicate a string-valued key, and have axis2_hash compute the
+ * When passing a key to axutil_hash_set or axutil_hash_get, this value can be
+ * passed to indicate a string-valued key, and have axutil_hash compute the
* length automatically.
*
- * @remark axis2_hash will use strlen(key) for the length. The NUL terminator
+ * @remark axutil_hash will use strlen(key) for the length. The NUL terminator
* is not included in the hash value (why throw a constant in?).
* Since the hash table merely references the provided key (rather
- * than copying it), axis2_hash_this() will return the NUL-term'd key.
+ * than copying it), axutil_hash_this() will return the NUL-term'd key.
*/
#define AXIS2_HASH_KEY_STRING (-1)
/**
* Abstract type for hash tables.
*/
- typedef struct axis2_hash_t axis2_hash_t;
+ typedef struct axutil_hash_t axutil_hash_t;
/**
* Abstract type for scanning hash tables.
*/
- typedef struct axis2_hash_index_t axis2_hash_index_t;
+ typedef struct axutil_hash_index_t axutil_hash_index_t;
/**
* Callback functions for calculating hash values.
@@ -65,12 +65,12 @@
* @param klen The length of the key, or AXIS2_HASH_KEY_STRING to use the string
* length. If AXIS2_HASH_KEY_STRING then returns the actual key length.
*/
- typedef unsigned int(*axis2_hashfunc_t)(const char *key, axis2_ssize_t *klen);
+ typedef unsigned int(*axutil_hashfunc_t)(const char *key, axis2_ssize_t *klen);
/**
* The default hash function.
*/
- unsigned int axis2_hashfunc_default(const char *key,
+ unsigned int axutil_hashfunc_default(const char *key,
axis2_ssize_t *klen);
/**
@@ -78,8 +78,8 @@
* @param env The environment to allocate the hash table out of
* @return The hash table just created
*/
- AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
- axis2_hash_make(const axutil_env_t *env);
+ AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+ axutil_hash_make(const axutil_env_t *env);
/**
* Create a hash table with a custom hash function
@@ -87,9 +87,9 @@
* @param hash_func A custom hash function.
* @return The hash table just created
*/
- AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
- axis2_hash_make_custom(const axutil_env_t *env,
- axis2_hashfunc_t hash_func);
+ AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+ axutil_hash_make_custom(const axutil_env_t *env,
+ axutil_hashfunc_t hash_func);
/**
* Make a copy of a hash table
@@ -98,8 +98,8 @@
* @return The hash table just created
* @remark Makes a shallow copy
*/
- AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
- axis2_hash_copy(const axis2_hash_t *ht,
+ AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+ axutil_hash_copy(const axutil_hash_t *ht,
const axutil_env_t *env);
/**
@@ -111,7 +111,7 @@
* @remark If the value is NULL the hash entry is deleted.
*/
AXIS2_EXTERN void AXIS2_CALL
- axis2_hash_set(axis2_hash_t *ht,
+ axutil_hash_set(axutil_hash_t *ht,
const void *key,
axis2_ssize_t klen,
const void *val);
@@ -124,14 +124,14 @@
* @return Returns NULL if the key is not present.
*/
AXIS2_EXTERN void* AXIS2_CALL
- axis2_hash_get(axis2_hash_t *ht,
+ axutil_hash_get(axutil_hash_t *ht,
const void *key,
axis2_ssize_t klen);
/**
* Start iterating over the entries in a hash table.
* @param ht The hash table
- * @param p The environment to allocate the axis2_hash_index_t iterator. If this
+ * @param p The environment to allocate the axutil_hash_index_t iterator. If this
* environment is NULL, then an internal, non-thread-safe iterator is used.
* @remark There is no restriction on adding or deleting hash entries during
* an iteration (although the results may be unpredictable unless all you do
@@ -143,21 +143,21 @@
/**
* <PRE>
*
- * int sum_values(const axutil_env_t *env, axis2_hash_t *ht)
+ * int sum_values(const axutil_env_t *env, axutil_hash_t *ht)
* {
- * axis2_hash_index_t *hi;
+ * axutil_hash_index_t *hi;
* void *val;
* int sum = 0;
- * for (hi = axis2_hash_first(p, ht); hi; hi = axis2_hash_next(p, hi)) {
- * axis2_hash_this(hi, NULL, NULL, &val);
+ * for (hi = axutil_hash_first(p, ht); hi; hi = axutil_hash_next(p, hi)) {
+ * axutil_hash_this(hi, NULL, NULL, &val);
* sum += *(int *)val;
* }
* return sum;
* }
* </PRE>
*/
- AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL
- axis2_hash_first(axis2_hash_t *ht,
+ AXIS2_EXTERN axutil_hash_index_t* AXIS2_CALL
+ axutil_hash_first(axutil_hash_t *ht,
const axutil_env_t *env);
/**
@@ -166,9 +166,9 @@
* @return a pointer to the updated iteration state. NULL if there are no more
* entries.
*/
- AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL
- axis2_hash_next(const axutil_env_t *env,
- axis2_hash_index_t *hi);
+ AXIS2_EXTERN axutil_hash_index_t* AXIS2_CALL
+ axutil_hash_next(const axutil_env_t *env,
+ axutil_hash_index_t *hi);
/**
* Get the current entry's details from the iteration state.
@@ -180,7 +180,7 @@
* corresponding data, or they may be NULL if the data isn't interesting.
*/
AXIS2_EXTERN void AXIS2_CALL
- axis2_hash_this(axis2_hash_index_t *hi,
+ axutil_hash_this(axutil_hash_index_t *hi,
const void **key,
axis2_ssize_t *klen,
void **val);
@@ -191,7 +191,7 @@
* @return The number of key/value pairs in the hash table.
*/
AXIS2_EXTERN unsigned int AXIS2_CALL
- axis2_hash_count(axis2_hash_t *ht);
+ axutil_hash_count(axutil_hash_t *ht);
/**
* Merge two hash tables into one new hash table. The values of the overlay
@@ -202,10 +202,10 @@
* @param base The table that represents the initial values of the new table
* @return A new hash table containing all of the data from the two passed in
*/
- AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
- axis2_hash_overlay(const axis2_hash_t *overlay,
+ AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+ axutil_hash_overlay(const axutil_hash_t *overlay,
const axutil_env_t *env,
- const axis2_hash_t *base);
+ const axutil_hash_t *base);
/**
* Merge two hash tables into one new hash table. If the same key
@@ -217,14 +217,14 @@
* @param h2 The second of the tables to merge
* @param merger A callback function to merge values, or NULL to
* make values from h1 override values from h2 (same semantics as
- * axis2_hash_overlay())
+ * axutil_hash_overlay())
* @param data Client data to pass to the merger function
* @return A new hash table containing all of the data from the two passed in
*/
- AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
- axis2_hash_merge(const axis2_hash_t *h1,
+ AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+ axutil_hash_merge(const axutil_hash_t *h1,
const axutil_env_t *env,
- const axis2_hash_t *h2,
+ const axutil_hash_t *h2,
void *(*merger)(const axutil_env_t *env,
const void *key,
axis2_ssize_t klen,
@@ -241,7 +241,7 @@
* @return return whether hash table contains key
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- axis2_hash_contains_key(axis2_hash_t *ht,
+ axutil_hash_contains_key(axutil_hash_t *ht,
const axutil_env_t *env,
const axis2_char_t *key);
@@ -253,7 +253,7 @@
*/
AXIS2_EXTERN void AXIS2_CALL
- axis2_hash_free(axis2_hash_t *ht,
+ axutil_hash_free(axutil_hash_t *ht,
const axutil_env_t *env);
/**
@@ -264,7 +264,7 @@
*/
AXIS2_EXTERN void AXIS2_CALL
- axis2_hash_free_void_arg(void *ht_void,
+ axutil_hash_free_void_arg(void *ht_void,
const axutil_env_t* env);
/** @} */
Modified: webservices/axis2/trunk/c/util/src/hash.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/hash.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/util/src/hash.c (original)
+++ webservices/axis2/trunk/c/util/src/hash.c Fri Mar 30 11:28:18 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include "axis2_hash.h"
+#include "axutil_hash.h"
#include <axis2_string.h>
@@ -28,11 +28,11 @@
* isn't too bad given that environments have a low allocation overhead.
*/
-typedef struct axis2_hash_entry_t axis2_hash_entry_t;
+typedef struct axutil_hash_entry_t axutil_hash_entry_t;
-struct axis2_hash_entry_t
+struct axutil_hash_entry_t
{
- axis2_hash_entry_t *next;
+ axutil_hash_entry_t *next;
unsigned int hash;
const void *key;
axis2_ssize_t klen;
@@ -44,12 +44,12 @@
*
* We keep a pointer to the next hash entry here to allow the current
* hash entry to be freed or otherwise mangled between calls to
- * axis2_hash_next().
+ * axutil_hash_next().
*/
-struct axis2_hash_index_t
+struct axutil_hash_index_t
{
- axis2_hash_t *ht;
- axis2_hash_entry_t *this, *next;
+ axutil_hash_t *ht;
+ axutil_hash_entry_t *this, *next;
unsigned int index;
};
@@ -60,14 +60,14 @@
* The count of hash entries may be greater depending on the chosen
* collision rate.
*/
-struct axis2_hash_t
+struct axutil_hash_t
{
const axutil_env_t *env;
- axis2_hash_entry_t **array;
- axis2_hash_index_t iterator; /* For axis2_hash_first(NULL, ...) */
+ axutil_hash_entry_t **array;
+ axutil_hash_index_t iterator; /* For axutil_hash_first(NULL, ...) */
unsigned int count, max;
- axis2_hashfunc_t hash_func;
- axis2_hash_entry_t *free; /* List of recycled entries */
+ axutil_hashfunc_t hash_func;
+ axutil_hash_entry_t *free; /* List of recycled entries */
};
#define INITIAL_MAX 15 /* tunable == 2^n - 1 */
@@ -77,37 +77,37 @@
* Hash creation functions.
*/
-static axis2_hash_entry_t **
-axis2_hash_alloc_array(axis2_hash_t *ht, unsigned int max)
+static axutil_hash_entry_t **
+axutil_hash_alloc_array(axutil_hash_t *ht, unsigned int max)
{
return memset(AXIS2_MALLOC(ht->env->allocator,
sizeof(*ht->array) *(max + 1)), 0,
sizeof(*ht->array) *(max + 1));
}
-AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axis2_hash_make(const axutil_env_t *env)
+AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+axutil_hash_make(const axutil_env_t *env)
{
- axis2_hash_t *ht;
+ axutil_hash_t *ht;
AXIS2_ENV_CHECK(env, NULL);
- ht = AXIS2_MALLOC(env->allocator, sizeof(axis2_hash_t));
+ ht = AXIS2_MALLOC(env->allocator, sizeof(axutil_hash_t));
ht->env = env;
ht->free = NULL;
ht->count = 0;
ht->max = INITIAL_MAX;
- ht->array = axis2_hash_alloc_array(ht, ht->max);
- ht->hash_func = axis2_hashfunc_default;
+ ht->array = axutil_hash_alloc_array(ht, ht->max);
+ ht->hash_func = axutil_hashfunc_default;
return ht;
}
-AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axis2_hash_make_custom(const axutil_env_t *env,
- axis2_hashfunc_t hash_func)
+AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+axutil_hash_make_custom(const axutil_env_t *env,
+ axutil_hashfunc_t hash_func)
{
- axis2_hash_t *ht;
+ axutil_hash_t *ht;
AXIS2_ENV_CHECK(env, NULL);
- ht = axis2_hash_make(env);
+ ht = axutil_hash_make(env);
ht->hash_func = hash_func;
return ht;
}
@@ -117,8 +117,8 @@
* Hash iteration functions.
*/
-AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL
-axis2_hash_next(const axutil_env_t *env, axis2_hash_index_t *hi)
+AXIS2_EXTERN axutil_hash_index_t* AXIS2_CALL
+axutil_hash_next(const axutil_env_t *env, axutil_hash_index_t *hi)
{
hi->this = hi->next;
while (!hi->this)
@@ -136,10 +136,10 @@
return hi;
}
-AXIS2_EXTERN axis2_hash_index_t* AXIS2_CALL
-axis2_hash_first(axis2_hash_t *ht, const axutil_env_t *env)
+AXIS2_EXTERN axutil_hash_index_t* AXIS2_CALL
+axutil_hash_first(axutil_hash_t *ht, const axutil_env_t *env)
{
- axis2_hash_index_t *hi;
+ axutil_hash_index_t *hi;
if (env)
hi = AXIS2_MALLOC(env->allocator, sizeof(*hi));
else
@@ -149,11 +149,11 @@
hi->index = 0;
hi->this = NULL;
hi->next = NULL;
- return axis2_hash_next(env, hi);
+ return axutil_hash_next(env, hi);
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_hash_this(axis2_hash_index_t *hi,
+axutil_hash_this(axutil_hash_index_t *hi,
const void **key, axis2_ssize_t *klen, void **val)
{
if (key)
@@ -170,17 +170,17 @@
*/
static void
-axis2_hash_expand_array(axis2_hash_t * ht)
+axutil_hash_expand_array(axutil_hash_t * ht)
{
- axis2_hash_index_t *hi;
+ axutil_hash_index_t *hi;
- axis2_hash_entry_t **new_array;
+ axutil_hash_entry_t **new_array;
unsigned int new_max;
new_max = ht->max * 2 + 1;
- new_array = axis2_hash_alloc_array(ht, new_max);
- for (hi = axis2_hash_first(ht, NULL); hi;
- hi = axis2_hash_next(NULL, hi))
+ new_array = axutil_hash_alloc_array(ht, new_max);
+ for (hi = axutil_hash_first(ht, NULL); hi;
+ hi = axutil_hash_next(NULL, hi))
{
unsigned int i = hi->this->hash & new_max;
hi->this->next = new_array[i];
@@ -192,7 +192,7 @@
}
unsigned int
-axis2_hashfunc_default(const char *char_key, axis2_ssize_t * klen)
+axutil_hashfunc_default(const char *char_key, axis2_ssize_t * klen)
{
unsigned int hash = 0;
const unsigned char *key = (const unsigned char *) char_key;
@@ -266,11 +266,11 @@
* that hash entries can be removed.
*/
-static axis2_hash_entry_t **
-axis2_hash_find_entry(axis2_hash_t * ht,
+static axutil_hash_entry_t **
+axutil_hash_find_entry(axutil_hash_t * ht,
const void *key, axis2_ssize_t klen, const void *val)
{
- axis2_hash_entry_t **hep, *he;
+ axutil_hash_entry_t **hep, *he;
unsigned int hash;
hash = ht->hash_func(key, &klen);
@@ -302,32 +302,32 @@
return hep;
}
-AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axis2_hash_copy(const axis2_hash_t *orig, const axutil_env_t *env)
+AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+axutil_hash_copy(const axutil_hash_t *orig, const axutil_env_t *env)
{
- axis2_hash_t *ht;
- axis2_hash_entry_t *new_vals;
+ axutil_hash_t *ht;
+ axutil_hash_entry_t *new_vals;
unsigned int i, j;
AXIS2_ENV_CHECK(env, NULL);
- ht = AXIS2_MALLOC(env->allocator, sizeof(axis2_hash_t) +
+ ht = AXIS2_MALLOC(env->allocator, sizeof(axutil_hash_t) +
sizeof(*ht->array) * (orig->max + 1) +
- sizeof(axis2_hash_entry_t) * orig->count);
+ sizeof(axutil_hash_entry_t) * orig->count);
ht->env = env;
ht->free = NULL;
ht->count = orig->count;
ht->max = orig->max;
ht->hash_func = orig->hash_func;
- ht->array = (axis2_hash_entry_t **)((char *) ht + sizeof(axis2_hash_t));
+ ht->array = (axutil_hash_entry_t **)((char *) ht + sizeof(axutil_hash_t));
- new_vals = (axis2_hash_entry_t *)((char *)(ht) + sizeof(axis2_hash_t) +
+ new_vals = (axutil_hash_entry_t *)((char *)(ht) + sizeof(axutil_hash_t) +
sizeof(*ht->array) * (orig->max + 1));
j = 0;
for (i = 0; i <= ht->max; i++)
{
- axis2_hash_entry_t **new_entry = &(ht->array[i]);
- axis2_hash_entry_t *orig_entry = orig->array[i];
+ axutil_hash_entry_t **new_entry = &(ht->array[i]);
+ axutil_hash_entry_t *orig_entry = orig->array[i];
while (orig_entry)
{
*new_entry = &new_vals[j++];
@@ -344,10 +344,10 @@
}
AXIS2_EXTERN void* AXIS2_CALL
-axis2_hash_get(axis2_hash_t *ht, const void *key, axis2_ssize_t klen)
+axutil_hash_get(axutil_hash_t *ht, const void *key, axis2_ssize_t klen)
{
- axis2_hash_entry_t *he;
- he = *axis2_hash_find_entry(ht, key, klen, NULL);
+ axutil_hash_entry_t *he;
+ he = *axutil_hash_find_entry(ht, key, klen, NULL);
if (he)
return (void *) he->val;
else
@@ -355,17 +355,17 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_hash_set(axis2_hash_t *ht,
+axutil_hash_set(axutil_hash_t *ht,
const void *key, axis2_ssize_t klen, const void *val)
{
- axis2_hash_entry_t **hep;
- hep = axis2_hash_find_entry(ht, key, klen, val);
+ axutil_hash_entry_t **hep;
+ hep = axutil_hash_find_entry(ht, key, klen, val);
if (*hep)
{
if (!val)
{
/* delete entry */
- axis2_hash_entry_t *old = *hep;
+ axutil_hash_entry_t *old = *hep;
*hep = (*hep)->next;
old->next = ht->free;
ht->free = old;
@@ -378,7 +378,7 @@
/* check that the collision rate isn't too high */
if (ht->count > ht->max)
{
- axis2_hash_expand_array(ht);
+ axutil_hash_expand_array(ht);
}
}
}
@@ -386,29 +386,29 @@
}
AXIS2_EXTERN unsigned int AXIS2_CALL
-axis2_hash_count(axis2_hash_t * ht)
+axutil_hash_count(axutil_hash_t * ht)
{
return ht->count;
}
-AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axis2_hash_overlay(const axis2_hash_t *overlay, const axutil_env_t *env
- , const axis2_hash_t * base)
+AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+axutil_hash_overlay(const axutil_hash_t *overlay, const axutil_env_t *env
+ , const axutil_hash_t * base)
{
AXIS2_ENV_CHECK(env, NULL);
- return axis2_hash_merge(overlay, env, base, NULL, NULL);
+ return axutil_hash_merge(overlay, env, base, NULL, NULL);
}
-AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axis2_hash_merge(const axis2_hash_t *overlay, const axutil_env_t *env
- , const axis2_hash_t * base, void *(*merger)(const axutil_env_t * env
+AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
+axutil_hash_merge(const axutil_hash_t *overlay, const axutil_env_t *env
+ , const axutil_hash_t * base, void *(*merger)(const axutil_env_t * env
, const void *key, axis2_ssize_t klen, const void *h1_val
, const void *h2_val, const void *data), const void *data)
{
- axis2_hash_t *res;
- axis2_hash_entry_t *new_vals = NULL;
- axis2_hash_entry_t *iter;
- axis2_hash_entry_t *ent;
+ axutil_hash_t *res;
+ axutil_hash_entry_t *new_vals = NULL;
+ axutil_hash_entry_t *iter;
+ axutil_hash_entry_t *ent;
unsigned int i, j, k;
AXIS2_ENV_CHECK(env, NULL);
@@ -420,18 +420,18 @@
if (!axutil_env_is_ancestor(overlay->env, p))
{
fprintf(stderr,
- "axis2_hash_merge: overlay's env is not an ancestor of p\n");
+ "axutil_hash_merge: overlay's env is not an ancestor of p\n");
abort();
}
if (!axutil_env_is_ancestor(base->env, p))
{
fprintf(stderr,
- "axis2_hash_merge: base's env is not an ancestor of p\n");
+ "axutil_hash_merge: base's env is not an ancestor of p\n");
abort();
}
#endif
- res = AXIS2_MALLOC(env->allocator, sizeof(axis2_hash_t));
+ res = AXIS2_MALLOC(env->allocator, sizeof(axutil_hash_t));
res->env = env;
res->free = NULL;
res->hash_func = base->hash_func;
@@ -441,12 +441,12 @@
{
res->max = res->max * 2 + 1;
}
- res->array = axis2_hash_alloc_array(res, res->max);
+ res->array = axutil_hash_alloc_array(res, res->max);
if (base->count + overlay->count)
{
new_vals =
AXIS2_MALLOC(env->allocator,
- sizeof(axis2_hash_entry_t) * (base->count +
+ sizeof(axutil_hash_entry_t) * (base->count +
overlay->count));
}
j = 0;
@@ -505,21 +505,21 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_hash_contains_key(
- axis2_hash_t *ht,
+axutil_hash_contains_key(
+ axutil_hash_t *ht,
const axutil_env_t *env,
const axis2_char_t *key)
{
- axis2_hash_index_t *i = NULL;
+ axutil_hash_index_t *i = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- for (i = axis2_hash_first(ht, env); i; i = axis2_hash_next(env, i))
+ for (i = axutil_hash_first(ht, env); i; i = axutil_hash_next(env, i))
{
const void *v = NULL;
const axis2_char_t *key_l = NULL;
- axis2_hash_this(i, &v, NULL, NULL);
+ axutil_hash_this(i, &v, NULL, NULL);
key_l = (const axis2_char_t *) v;
if (0 == axis2_strcmp(key, key_l))
return AXIS2_TRUE;
@@ -529,21 +529,21 @@
}
static void
-axis2_hash_entry_free(const axutil_env_t *env, axis2_hash_entry_t *hash_entry)
+axutil_hash_entry_free(const axutil_env_t *env, axutil_hash_entry_t *hash_entry)
{
AXIS2_ENV_CHECK(env, void);
if (!hash_entry)
return;
if (hash_entry->next)
{
- axis2_hash_entry_free(env, hash_entry->next);
+ axutil_hash_entry_free(env, hash_entry->next);
}
AXIS2_FREE(env->allocator, hash_entry);
return;
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_hash_free(axis2_hash_t *ht, const axutil_env_t* env)
+axutil_hash_free(axutil_hash_t *ht, const axutil_env_t* env)
{
int i = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -551,8 +551,8 @@
{
for (i = 0;i <= ht->max; i++)
{
- axis2_hash_entry_t *next = NULL;
- axis2_hash_entry_t *current = ht->array[i];
+ axutil_hash_entry_t *next = NULL;
+ axutil_hash_entry_t *current = ht->array[i];
while (current)
{
next = current->next;
@@ -563,8 +563,8 @@
}
if (ht->free)
{
- axis2_hash_entry_t *next = NULL;
- axis2_hash_entry_t *current = ht->free;
+ axutil_hash_entry_t *next = NULL;
+ axutil_hash_entry_t *current = ht->free;
while (current)
{
next = current->next;
@@ -580,17 +580,17 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_hash_free_void_arg(void *ht_void, const axutil_env_t* env)
+axutil_hash_free_void_arg(void *ht_void, const axutil_env_t* env)
{
int i = 0;
- axis2_hash_t *ht = (axis2_hash_t*)ht_void;
+ axutil_hash_t *ht = (axutil_hash_t*)ht_void;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (ht)
{
for (i = 0;i < ht->max; i++)
{
- axis2_hash_entry_t *next = NULL;
- axis2_hash_entry_t *current = ht->array[i];
+ axutil_hash_entry_t *next = NULL;
+ axutil_hash_entry_t *current = ht->array[i];
while (current)
{
next = current->next;
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/util/src/param.c (original)
+++ webservices/axis2/trunk/c/util/src/param.c Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
axis2_bool_t locked;
/** Parameter type */
int type; /*default is AXIS2_TEXT_PARAM */
- axis2_hash_t *attrs;
+ axutil_hash_t *attrs;
axutil_array_list_t *value_list;
axis2_status_t (AXIS2_CALL *
value_free) (void *param_value,
@@ -154,30 +154,30 @@
axis2_status_t AXIS2_CALL
axis2_param_set_attributes(axis2_param_t *param,
const axutil_env_t *env,
- axis2_hash_t *attrs)
+ axutil_hash_t *attrs)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, attrs, AXIS2_FAILURE);
if (param->attrs)
{
- axis2_hash_index_t *i = NULL;
+ axutil_hash_index_t *i = NULL;
void *v = NULL;
- for (i = axis2_hash_first(param->attrs, env); i;
- i = axis2_hash_next(env, i))
+ for (i = axutil_hash_first(param->attrs, env); i;
+ i = axutil_hash_next(env, i))
{
- axis2_hash_this(i, NULL, NULL, &v);
+ axutil_hash_this(i, NULL, NULL, &v);
axis2_generic_obj_free(v, env);
}
- axis2_hash_free(param->attrs, env);
+ axutil_hash_free(param->attrs, env);
}
param->attrs = attrs;
return AXIS2_SUCCESS;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
axis2_param_get_attributes(axis2_param_t *param,
const axutil_env_t *env)
{
@@ -243,16 +243,16 @@
if (param->attrs)
{
- axis2_hash_index_t *i = NULL;
+ axutil_hash_index_t *i = NULL;
void *v = NULL;
- for (i = axis2_hash_first(param->attrs, env); i;
- i = axis2_hash_next(env, i))
+ for (i = axutil_hash_first(param->attrs, env); i;
+ i = axutil_hash_next(env, i))
{
- axis2_hash_this(i, NULL, NULL, &v);
+ axutil_hash_this(i, NULL, NULL, &v);
axis2_generic_obj_free(v, env);
}
- axis2_hash_free(param->attrs, env);
+ axutil_hash_free(param->attrs, env);
}
if (param->value_list)
Modified: webservices/axis2/trunk/c/util/src/param_container.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param_container.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/util/src/param_container.c (original)
+++ webservices/axis2/trunk/c/util/src/param_container.c Fri Mar 30 11:28:18 2007
@@ -19,7 +19,7 @@
struct axis2_param_container
{
- axis2_hash_t *params;
+ axutil_hash_t *params;
axutil_array_list_t *params_list;
};
@@ -43,7 +43,7 @@
param_container->params_list = NULL;
param_container->params_list = axutil_array_list_create(env, 0);
- param_container->params = axis2_hash_make(env);
+ param_container->params = axutil_hash_make(env);
if (!param_container->params)
{
axis2_param_container_free(param_container, env);
@@ -62,13 +62,13 @@
if (param_container->params)
{
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
void *val = NULL;
- for (hi = axis2_hash_first(param_container->params, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(param_container->params, env); hi;
+ hi = axutil_hash_next(env, hi))
{
axis2_param_t *param = NULL;
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
param = (axis2_param_t *) val;
if (param)
{
@@ -77,7 +77,7 @@
}
val = NULL;
}
- axis2_hash_free(param_container->params, env);
+ axutil_hash_free(param_container->params, env);
}
if (param_container->params_list)
{
@@ -117,7 +117,7 @@
if (!(param_container->params))
{
- param_container->params = axis2_hash_make(env);
+ param_container->params = axutil_hash_make(env);
if (!param_container->params)
{
return AXIS2_FAILURE;
@@ -130,7 +130,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- axis2_hash_set(param_container->params, param_name,
+ axutil_hash_set(param_container->params, param_name,
AXIS2_HASH_KEY_STRING, param);
return AXIS2_SUCCESS;
@@ -141,7 +141,7 @@
const axutil_env_t *env,
const axis2_char_t *name)
{
- return (axis2_param_t *)(axis2_hash_get(param_container->params,
+ return (axis2_param_t *)(axutil_hash_get(param_container->params,
name, AXIS2_HASH_KEY_STRING));
}
@@ -149,7 +149,7 @@
axis2_param_container_get_params(axis2_param_container_t *param_container,
const axutil_env_t *env)
{
- axis2_hash_index_t *index_i = 0;
+ axutil_hash_index_t *index_i = 0;
axis2_status_t status = AXIS2_FAILURE;
void *value = NULL;
@@ -164,10 +164,10 @@
}
}
- for (index_i = axis2_hash_first(param_container->params, env);
- index_i; index_i = axis2_hash_next(env, index_i))
+ for (index_i = axutil_hash_first(param_container->params, env);
+ index_i; index_i = axutil_hash_next(env, index_i))
{
- axis2_hash_this(index_i, NULL, NULL, &value);
+ axutil_hash_this(index_i, NULL, NULL, &value);
status = axutil_array_list_add(param_container->params_list, env,
value);
if (AXIS2_SUCCESS != status)
@@ -189,7 +189,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- param = (axis2_param_t *)(axis2_hash_get(param_container->params,
+ param = (axis2_param_t *)(axutil_hash_get(param_container->params,
param_name, AXIS2_HASH_KEY_STRING));
if (!param)
{
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/util/src/properties.c (original)
+++ webservices/axis2/trunk/c/util/src/properties.c Fri Mar 30 11:28:18 2007
@@ -37,7 +37,7 @@
struct axis2_properties
{
- axis2_hash_t *prop_hash;
+ axutil_hash_t *prop_hash;
};
AXIS2_EXTERN axis2_properties_t *AXIS2_CALL
@@ -55,7 +55,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- properties->prop_hash = axis2_hash_make(env);
+ properties->prop_hash = axutil_hash_make(env);
return properties;
}
@@ -66,16 +66,16 @@
{
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (properties->prop_hash)
{
- for (hi = axis2_hash_first(properties->prop_hash, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(properties->prop_hash, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if (key)
{
AXIS2_FREE(env-> allocator, key);
@@ -85,7 +85,7 @@
AXIS2_FREE(env-> allocator, value);
}
}
- axis2_hash_free(properties->prop_hash, env);
+ axutil_hash_free(properties->prop_hash, env);
}
if (properties)
@@ -102,7 +102,7 @@
{
AXIS2_PARAM_CHECK(env-> error, key, NULL);
- return axis2_hash_get(properties-> prop_hash,
+ return axutil_hash_get(properties-> prop_hash,
key, AXIS2_HASH_KEY_STRING);
}
@@ -115,12 +115,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env-> error, key, AXIS2_FAILURE);
- axis2_hash_set(properties-> prop_hash, key,
+ axutil_hash_set(properties-> prop_hash, key,
AXIS2_HASH_KEY_STRING, value);
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
+AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
axis2_properties_get_all(axis2_properties_t *properties,
const axutil_env_t *env)
{
@@ -132,7 +132,7 @@
const axutil_env_t *env,
FILE *output)
{
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
@@ -141,10 +141,10 @@
if (properties->prop_hash)
{
- for (hi = axis2_hash_first(properties->prop_hash, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(properties->prop_hash, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if (key)
{
if (!value)
@@ -173,7 +173,7 @@
int status = LINE_STARTED;
axis2_char_t *key = NULL;
- axis2_hash_t *prop_hash = NULL;
+ axutil_hash_t *prop_hash = NULL;
axis2_char_t *buffer = NULL;
axis2_char_t loginfo[1024];
@@ -240,7 +240,7 @@
if (status == LINE_HALFWAY)
{
tag = axis2_properties_trunk_and_dup(tag, cur, env);
- axis2_hash_set(prop_hash,
+ axutil_hash_set(prop_hash,
key, AXIS2_HASH_KEY_STRING, tag);
}
status = LINE_STARTED;
@@ -250,7 +250,7 @@
{
*cur = '\0';
tag = axis2_properties_trunk_and_dup(tag, cur, env);
- axis2_hash_set(prop_hash,
+ axutil_hash_set(prop_hash,
key, AXIS2_HASH_KEY_STRING, tag);
status = LINE_STARTED;
}
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Fri Mar 30 11:28:18 2007
@@ -16,7 +16,7 @@
*/
#include <stdio.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_string.h>
#include <axutil_error_default.h>
#include <axutil_array_list.h>
@@ -46,10 +46,10 @@
int test_hash_get(const axutil_env_t *env)
{
- axis2_hash_t *ht;
+ axutil_hash_t *ht;
a *a1, *a2, *a3, *a4;
- axis2_hash_index_t *i = 0;
+ axutil_hash_index_t *i = 0;
void *v = NULL;
char *key1 = "key1";
@@ -68,34 +68,34 @@
a3->value = axis2_strdup(env, "value3");
a4->value = axis2_strdup(env, "value4");
- ht = axis2_hash_make(env);
+ ht = axutil_hash_make(env);
- axis2_hash_set(ht, key1, AXIS2_HASH_KEY_STRING, a1);
- axis2_hash_set(ht, key2, AXIS2_HASH_KEY_STRING, a2);
- axis2_hash_set(ht, key3, AXIS2_HASH_KEY_STRING, a3);
- axis2_hash_set(ht, key4, AXIS2_HASH_KEY_STRING, a4);
-
- axis2_hash_set(ht, key2, AXIS2_HASH_KEY_STRING, NULL);
- axis2_hash_set(ht, key2, AXIS2_HASH_KEY_STRING, a2);
- for (i = axis2_hash_first(ht, env); i; i = axis2_hash_next(env, i))
+ axutil_hash_set(ht, key1, AXIS2_HASH_KEY_STRING, a1);
+ axutil_hash_set(ht, key2, AXIS2_HASH_KEY_STRING, a2);
+ axutil_hash_set(ht, key3, AXIS2_HASH_KEY_STRING, a3);
+ axutil_hash_set(ht, key4, AXIS2_HASH_KEY_STRING, a4);
+
+ axutil_hash_set(ht, key2, AXIS2_HASH_KEY_STRING, NULL);
+ axutil_hash_set(ht, key2, AXIS2_HASH_KEY_STRING, a2);
+ for (i = axutil_hash_first(ht, env); i; i = axutil_hash_next(env, i))
{
- axis2_hash_this(i, NULL, NULL, &v);
+ axutil_hash_this(i, NULL, NULL, &v);
printf("\n %s \n", ((a *) v)->value);
}
printf("\n demo get %s ",
- ((a *) axis2_hash_get(ht, key1, AXIS2_HASH_KEY_STRING))->value);
+ ((a *) axutil_hash_get(ht, key1, AXIS2_HASH_KEY_STRING))->value);
printf("\n demo get %s ",
- ((a *) axis2_hash_get(ht, key2, AXIS2_HASH_KEY_STRING))->value);
+ ((a *) axutil_hash_get(ht, key2, AXIS2_HASH_KEY_STRING))->value);
printf("\n demo get %s ",
- ((a *) axis2_hash_get(ht, key3, AXIS2_HASH_KEY_STRING))->value);
+ ((a *) axutil_hash_get(ht, key3, AXIS2_HASH_KEY_STRING))->value);
printf("\n demo get %s \n",
- ((a *) axis2_hash_get(ht, key4, AXIS2_HASH_KEY_STRING))->value);
+ ((a *) axutil_hash_get(ht, key4, AXIS2_HASH_KEY_STRING))->value);
- axis2_hash_free(ht, env);
+ axutil_hash_free(ht, env);
AXIS2_FREE(env->allocator, a1->value);
AXIS2_FREE(env->allocator, a2->value);
AXIS2_FREE(env->allocator, a3->value);
Modified: webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -66,7 +66,7 @@
void *attr_extensible,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (
void *attr_extensible,
const axutil_env_t *env);
@@ -126,7 +126,7 @@
woden_attr_extensible_t *extensible,
const axutil_env_t *env,
woden_attr_extensible_t *extensible_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
#define WODEN_ATTR_EXTENSIBLE_FREE(extensible, env) \
(((woden_attr_extensible_t *) extensible)->ops->\
Modified: webservices/axis2/trunk/c/woden/include/woden_binding.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding.h Fri Mar 30 11:28:18 2007
@@ -55,7 +55,7 @@
free) (void *binding,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *binding,
const axutil_env_t *env);
@@ -202,7 +202,7 @@
woden_binding_t *binding,
const axutil_env_t *env,
woden_binding_t *binding_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_FREE(binding, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_element.h Fri Mar 30 11:28:18 2007
@@ -29,7 +29,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -175,7 +175,7 @@
woden_binding_element_resolve_methods(
woden_binding_element_t *binding_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_ELEMENT_FREE(binding_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_fault.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_fault.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_fault.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_fault.h Fri Mar 30 11:28:18 2007
@@ -56,7 +56,7 @@
free) (void *binding_fault,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *binding_fault,
const axutil_env_t *env);
@@ -169,7 +169,7 @@
woden_binding_fault_t *binding_fault,
const axutil_env_t *env,
woden_binding_fault_t *binding_fault_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_FAULT_FREE(binding_fault, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h Fri Mar 30 11:28:18 2007
@@ -29,7 +29,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -120,7 +120,7 @@
woden_binding_fault_element_resolve_methods(
woden_binding_fault_element_t *binding_fault_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_FAULT_ELEMENT_FREE(binding_fault_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref.h Fri Mar 30 11:28:18 2007
@@ -57,7 +57,7 @@
free) (void *binding_fault_ref,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *binding_fault_ref,
const axutil_env_t *env);
@@ -178,7 +178,7 @@
woden_binding_fault_ref_t *binding_fault_ref,
const axutil_env_t *env,
woden_binding_fault_ref_t *binding_fault_ref_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_FAULT_REF_FREE(binding_fault_ref, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -133,7 +133,7 @@
woden_binding_fault_ref_element_resolve_methods(
woden_binding_fault_ref_element_t *binding_fault_ref_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_FAULT_REF_ELEMENT_FREE(binding_fault_ref_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref.h Fri Mar 30 11:28:18 2007
@@ -61,7 +61,7 @@
to_binding_msg_ref_free) (void *binding_msg_ref,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *binding_msg_ref,
const axutil_env_t *env);
@@ -172,7 +172,7 @@
woden_binding_msg_ref_t *binding_msg_ref,
const axutil_env_t *env,
woden_binding_msg_ref_t *binding_msg_ref_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_MSG_REF_FREE(binding_msg_ref, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -116,7 +116,7 @@
woden_binding_msg_ref_element_resolve_methods(
woden_binding_msg_ref_element_t *binding_msg_ref_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_MSG_REF_ELEMENT_FREE(binding_msg_ref_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_op.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_op.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_op.h Fri Mar 30 11:28:18 2007
@@ -60,7 +60,7 @@
to_binding_op_free) (void *binding_op,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *binding_op,
const axutil_env_t *env);
@@ -182,7 +182,7 @@
woden_binding_op_t *binding_op,
const axutil_env_t *env,
woden_binding_op_t *binding_op_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_OP_FREE(binding_op, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -156,7 +156,7 @@
woden_binding_op_element_resolve_methods(
woden_binding_op_element_t *binding_op_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BINDING_OP_ELEMENT_FREE(binding_op_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_bool_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_bool_attr.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_bool_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_bool_attr.h Fri Mar 30 11:28:18 2007
@@ -128,7 +128,7 @@
woden_bool_attr_resolve_methods(
woden_bool_attr_t *bool_attr,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_BOOL_ATTR_FREE(bool_attr, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_component_exts.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_component_exts.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_component_exts.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_component_exts.h Fri Mar 30 11:28:18 2007
@@ -45,7 +45,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <woden.h>
@@ -123,7 +123,7 @@
woden_component_exts_resolve_methods(
woden_component_exts_t *component_exts,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
#define WODEN_COMPONENT_EXTS_FREE(component_exts, env) \
(((woden_component_exts_t *) component_exts)->ops->\
Modified: webservices/axis2/trunk/c/woden/include/woden_configurable.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_configurable.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_configurable.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_configurable.h Fri Mar 30 11:28:18 2007
@@ -63,7 +63,7 @@
void *configurable,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (
void *configurable,
const axutil_env_t *env);
@@ -107,7 +107,7 @@
woden_configurable_t *configurable,
const axutil_env_t *env,
woden_configurable_t *configurable_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_CONFIGURABLE_FREE(configurable, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_configurable_component.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_configurable_component.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_configurable_component.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_configurable_component.h Fri Mar 30 11:28:18 2007
@@ -31,7 +31,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
#include <woden.h>
@@ -94,7 +94,7 @@
woden_configurable_component_resolve_methods(
woden_configurable_component_t *configurable_component,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_CONFIGURABLE_COMPONENT_FREE(configurable_component, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_configurable_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_configurable_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_configurable_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_configurable_element.h Fri Mar 30 11:28:18 2007
@@ -39,7 +39,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <woden.h>
#include <woden_wsdl_element.h>
@@ -113,7 +113,7 @@
woden_configurable_element_resolve_methods(
woden_configurable_element_t *configurable_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_CONFIGURABLE_ELEMENT_FREE(conf_el, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_desc.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_desc.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_desc.h Fri Mar 30 11:28:18 2007
@@ -80,7 +80,7 @@
to_desc_free) (void *desc,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *desc,
const axutil_env_t *env);
@@ -242,7 +242,7 @@
woden_desc_t *desc,
const axutil_env_t *env,
woden_desc_t *desc_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_DESC_FREE(desc, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_desc_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_desc_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_desc_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_desc_element.h Fri Mar 30 11:28:18 2007
@@ -37,7 +37,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <woden.h>
@@ -138,7 +138,7 @@
const axutil_env_t *env,
axis2_char_t *prefix);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
get_namespaces) (
void *desc_el,
const axutil_env_t *env);/* TODO return arrays instead of Map? */
@@ -342,7 +342,7 @@
woden_desc_element_resolve_methods(
woden_desc_element_t *desc_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_DESC_ELEMENT_FREE(desc_el, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_direction.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_direction.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_direction.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_direction.h Fri Mar 30 11:28:18 2007
@@ -52,7 +52,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <woden.h>
Modified: webservices/axis2/trunk/c/woden/include/woden_documentable.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_documentable.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_documentable.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_documentable.h Fri Mar 30 11:28:18 2007
@@ -62,7 +62,7 @@
void *documentable,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (
void *documentable,
const axutil_env_t *env);
@@ -117,7 +117,7 @@
woden_documentable_t *documentable,
const axutil_env_t *env,
woden_documentable_t *documentable_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
Modified: webservices/axis2/trunk/c/woden/include/woden_documentable_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_documentable_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_documentable_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_documentable_element.h Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axutil_array_list.h>
#include <woden_wsdl_element.h>
#include <woden.h>
@@ -91,7 +91,7 @@
woden_documentable_element_resolve_methods(
woden_documentable_element_t *documentable_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_DOCUMENTABLE_ELEMENT_FREE(doc_el, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_documentation.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_documentation.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_documentation.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_documentation.h Fri Mar 30 11:28:18 2007
@@ -58,7 +58,7 @@
free) (void *documentation,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *documentation,
const axutil_env_t *env);
@@ -111,7 +111,7 @@
woden_documentation_t *documentation,
const axutil_env_t *env,
woden_documentation_t *documentation_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
Modified: webservices/axis2/trunk/c/woden/include/woden_documentation_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_documentation_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_documentation_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_documentation_element.h Fri Mar 30 11:28:18 2007
@@ -33,7 +33,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <woden_wsdl_element.h>
#include <woden.h>
@@ -92,7 +92,7 @@
woden_documentation_element_resolve_methods(
woden_documentation_element_t *documentation_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_DOCUMENTATION_ELEMENT_FREE(doc_el, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_element_decl.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_element_decl.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_element_decl.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_element_decl.h Fri Mar 30 11:28:18 2007
@@ -39,7 +39,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -78,7 +78,7 @@
element_decl,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (
void *
element_decl,
@@ -196,7 +196,7 @@
woden_element_decl_t *decl,
const axutil_env_t *env,
woden_element_decl_t *decl_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
#define WODEN_ELEMENT_DECL_FREE(decl, env) \
(((woden_element_decl_t *) decl)->ops->\
Modified: webservices/axis2/trunk/c/woden/include/woden_element_extensible.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_element_extensible.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_element_extensible.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_element_extensible.h Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -62,7 +62,7 @@
element_extensible,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (
void *
element_extensible,
@@ -121,7 +121,7 @@
woden_element_extensible_t *extensible,
const axutil_env_t *env,
woden_element_extensible_t *extensible_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
#define WODEN_ELEMENT_EXTENSIBLE_FREE(extensible, env) \
(((woden_element_extensible_t *) extensible)->ops->\
Modified: webservices/axis2/trunk/c/woden/include/woden_endpoint.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_endpoint.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_endpoint.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_endpoint.h Fri Mar 30 11:28:18 2007
@@ -59,7 +59,7 @@
free) (void *endpoint,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *endpoint,
const axutil_env_t *env);
@@ -187,7 +187,7 @@
woden_endpoint_t *endpoint,
const axutil_env_t *env,
woden_endpoint_t *endpoint_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_ENDPOINT_FREE(endpoint, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_endpoint_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_endpoint_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_endpoint_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_endpoint_element.h Fri Mar 30 11:28:18 2007
@@ -31,7 +31,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <woden.h>
@@ -128,7 +128,7 @@
woden_endpoint_element_resolve_methods(
woden_endpoint_element_t *endpoint_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_ENDPOINT_ELEMENT_FREE(endpoint_el, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_ext_deserializer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_ext_deserializer.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_ext_deserializer.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_ext_deserializer.h Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
#include <axis2_string.h>
#include <axis2_utils.h>
#include <axis2_qname.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axiom_node.h>
#include <woden.h>
#include <woden_ext_registry.h>
@@ -93,7 +93,7 @@
woden_ext_deserializer_resolve_methods(
woden_ext_deserializer_t *ext_deserializer,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_EXT_DESERIALIZER_FREE(ext_deserializer, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_ext_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_ext_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_ext_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_ext_element.h Fri Mar 30 11:28:18 2007
@@ -38,7 +38,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <woden.h>
@@ -109,7 +109,7 @@
woden_ext_element_resolve_methods(
woden_ext_element_t *ext_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
#define WODEN_EXT_ELEMENT_FREE(ext_element, env) \
(((woden_ext_element_t *) ext_element)->ops->free (ext_element, env))
Modified: webservices/axis2/trunk/c/woden/include/woden_ext_registry.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_ext_registry.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_ext_registry.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_ext_registry.h Fri Mar 30 11:28:18 2007
@@ -29,7 +29,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
Modified: webservices/axis2/trunk/c/woden/include/woden_fault_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_fault_ref_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_fault_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_fault_ref_element.h Fri Mar 30 11:28:18 2007
@@ -31,7 +31,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -70,7 +70,7 @@
void *fault_ref_element,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (
void *fault_ref_element,
const axutil_env_t *env);
@@ -138,7 +138,7 @@
woden_fault_ref_element_resolve_methods(
woden_fault_ref_element_t *fault_ref_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_FAULT_REF_ELEMENT_FREE(fault_ref_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_feature.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_feature.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_feature.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_feature.h Fri Mar 30 11:28:18 2007
@@ -60,7 +60,7 @@
free) (void *feature,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *feature,
const axutil_env_t *env);
@@ -167,7 +167,7 @@
woden_feature_t *feature,
const axutil_env_t *env,
woden_feature_t *feature_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_FEATURE_FREE(feature, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_feature_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_feature_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_feature_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_feature_element.h Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <woden.h>
@@ -103,7 +103,7 @@
woden_feature_element_resolve_methods(
woden_feature_element_t *feature_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_FEATURE_ELEMENT_FREE(doc_el, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_import.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_import.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_import.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_import.h Fri Mar 30 11:28:18 2007
@@ -55,7 +55,7 @@
free) (void *import,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *import,
const axutil_env_t *env);
@@ -126,7 +126,7 @@
woden_import_t *import,
const axutil_env_t *env,
woden_import_t *import_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_IMPORT_FREE(import, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_import_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_import_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_import_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_import_element.h Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <woden.h>
@@ -110,7 +110,7 @@
woden_import_element_resolve_methods(
woden_import_element_t *import_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_IMPORT_ELEMENT_FREE(import_el, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_imported_schema.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_imported_schema.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_imported_schema.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_imported_schema.h Fri Mar 30 11:28:18 2007
@@ -52,7 +52,7 @@
void *schema,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (
void *schema,
const axutil_env_t *env);
@@ -104,7 +104,7 @@
woden_imported_schema_t *schema,
const axutil_env_t *env,
woden_imported_schema_t *schema_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_IMPORTED_SCHEMA_FREE(schema, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_include.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_include.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_include.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_include.h Fri Mar 30 11:28:18 2007
@@ -55,7 +55,7 @@
free) (void *include,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *include,
const axutil_env_t *env);
@@ -119,7 +119,7 @@
woden_include_t *include,
const axutil_env_t *env,
woden_include_t *include_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INCLUDE_FREE(include, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_include_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_include_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_include_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_include_element.h Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <woden.h>
@@ -100,7 +100,7 @@
woden_include_element_resolve_methods(
woden_include_element_t *include_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INCLUDE_ELEMENT_FREE(include_el, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_inlined_schema.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_inlined_schema.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_inlined_schema.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_inlined_schema.h Fri Mar 30 11:28:18 2007
@@ -52,7 +52,7 @@
void *schema,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (
void *schema,
const axutil_env_t *env);
@@ -104,7 +104,7 @@
woden_inlined_schema_t *schema,
const axutil_env_t *env,
woden_inlined_schema_t *schema_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INLINED_SCHEMA_FREE(schema, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface.h Fri Mar 30 11:28:18 2007
@@ -57,7 +57,7 @@
free) (void *woden_interface,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *woden_interface,
const axutil_env_t *env);
@@ -153,7 +153,7 @@
woden_interface_t *woden_interface,
const axutil_env_t *env,
woden_interface_t *interface_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_FREE(interface, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_element.h Fri Mar 30 11:28:18 2007
@@ -31,7 +31,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -147,7 +147,7 @@
woden_interface_element_resolve_methods(
woden_interface_element_t *interface_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_ELEMENT_FREE(interface_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_fault.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_fault.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_fault.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_fault.h Fri Mar 30 11:28:18 2007
@@ -56,7 +56,7 @@
free) (void *interface_fault,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *interface_fault,
const axutil_env_t *env);
@@ -162,7 +162,7 @@
woden_interface_fault_t *interface_fault,
const axutil_env_t *env,
woden_interface_fault_t *interface_fault_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_FAULT_FREE(interface_fault, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -144,7 +144,7 @@
woden_interface_fault_element_resolve_methods(
woden_interface_fault_element_t *interface_fault_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_FAULT_ELEMENT_FREE(interface_fault_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref.h Fri Mar 30 11:28:18 2007
@@ -57,7 +57,7 @@
free) (void *interface_fault_ref,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *interface_fault_ref,
const axutil_env_t *env);
@@ -172,7 +172,7 @@
woden_interface_fault_ref_t *interface_fault_ref,
const axutil_env_t *env,
woden_interface_fault_ref_t *interface_fault_ref_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_FAULT_REF_FREE(interface_fault_ref, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -134,7 +134,7 @@
woden_interface_fault_ref_element_resolve_methods(
woden_interface_fault_ref_element_t *interface_fault_ref_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_FAULT_REF_ELEMENT_FREE(interface_fault_ref_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref.h Fri Mar 30 11:28:18 2007
@@ -54,7 +54,7 @@
free) (void *interface_msg_ref,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *interface_msg_ref,
const axutil_env_t *env);
@@ -186,7 +186,7 @@
woden_interface_msg_ref_t *interface_msg_ref,
const axutil_env_t *env,
woden_interface_msg_ref_t *interface_msg_ref_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_MSG_REF_FREE(interface_msg_ref, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_msg_ref_element.h Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -160,7 +160,7 @@
woden_interface_msg_ref_element_resolve_methods(
woden_interface_msg_ref_element_t *interface_msg_ref_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_MSG_REF_ELEMENT_FREE(interface_msg_ref_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_op.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_op.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_op.h Fri Mar 30 11:28:18 2007
@@ -54,7 +54,7 @@
free) (void *interface_op,
const axutil_env_t *env);
- axis2_hash_t *(AXIS2_CALL *
+ axutil_hash_t *(AXIS2_CALL *
super_objs) (void *interface_op,
const axutil_env_t *env);
@@ -175,7 +175,7 @@
woden_interface_op_t *interface_op,
const axutil_env_t *env,
woden_interface_op_t *interface_op_impl,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_OP_FREE(interface_op, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_op_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_op_element.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_op_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_op_element.h Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <axis2_uri.h>
#include <axutil_array_list.h>
@@ -169,7 +169,7 @@
woden_interface_op_element_resolve_methods(
woden_interface_op_element_t *interface_op_element,
const axutil_env_t *env,
- axis2_hash_t *methods);
+ axutil_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
#define WODEN_INTERFACE_OP_ELEMENT_FREE(interface_op_element, env) \
Modified: webservices/axis2/trunk/c/woden/include/woden_msg_label.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_msg_label.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_msg_label.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_msg_label.h Fri Mar 30 11:28:18 2007
@@ -53,7 +53,7 @@
#include <axutil_error.h>
#include <axis2_string.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_qname.h>
#include <woden.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org