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 pi...@apache.org on 2007/03/30 21:54:23 UTC
svn commit: r524255 [3/6] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/util/ guththila/include/ include/
modules/core/clientapi/ modules/core/contex...
Copied: webservices/axis2/trunk/c/util/include/axutil_uri.h (from r524243, webservices/axis2/trunk/c/util/include/axis2_uri.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_uri.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/axis2_uri.h&r1=524243&p2=webservices/axis2/trunk/c/util/include/axutil_uri.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_uri.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_uri.h Fri Mar 30 12:54:08 2007
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-#ifndef AXIS2_URI_H
-#define AXIS2_URI_H
+#ifndef AXUTIL_URI_H
+#define AXUTIL_URI_H
/**
- * @file axis2_uri.h
+ * @file axutil_uri.h
* @brief AXIS2-UTIL URI Routines
- * axis2_uri.h: External Interface of axis2_uri.c
+ * axutil_uri.h: External Interface of axutil_uri.c
*/
#include <axutil_string.h>
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
#include <axutil_env.h>
#ifdef __cplusplus
@@ -35,7 +35,7 @@
#endif
/**
- * @defgroup axis2_uri URI
+ * @defgroup axutil_uri URI
* @ingroup axis2_util
* @{
*/
@@ -76,11 +76,11 @@
/** Omit the "?queryarg" from the path */
#define AXIS2_URI_UNP_OMITQUERY (1U<<5)
- /** @see axis2_uri_t */
+ /** @see axutil_uri_t */
typedef unsigned short axis2_port_t;
- /* axis2_uri.c */
+ /* axutil_uri.c */
- typedef struct axis2_uri axis2_uri_t;
+ typedef struct axutil_uri axutil_uri_t;
/**
* Return the default port for a given scheme. The schemes recognized are
@@ -89,39 +89,39 @@
* @return The default port for this scheme
*/
AXIS2_EXTERN axis2_port_t AXIS2_CALL
- axis2_uri_port_of_scheme(
+ axutil_uri_port_of_scheme(
const axis2_char_t *scheme_str);
/**
- * Parse a given URI, fill in all supplied fields of a axis2_uri_t
+ * Parse a given URI, fill in all supplied fields of a axutil_uri_t
* structure. This eliminates the necessity of extracting host, port,
* path, query info repeatedly in the modules.
* @param uri The uri to parse
- * @param uptr The axis2_uri_t to fill out
+ * @param uptr The axutil_uri_t to fill out
* @return AXIS2_SUCCESS for success or error code
*/
- AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
- axis2_uri_parse_string(
+ AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+ axutil_uri_parse_string(
const axutil_env_t *env,
const axis2_char_t *uri);
/**
* Special case for CONNECT parsing: it comes with the hostinfo part only
* @param hostinfo The hostinfo string to parse
- * @param uptr The axis2_uri_t to fill out
+ * @param uptr The axutil_uri_t to fill out
* @return AXIS2_SUCCESS for success or error code
*/
- AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
- axis2_uri_parse_hostinfo(
+ AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+ axutil_uri_parse_hostinfo(
const axutil_env_t *env,
const axis2_char_t *hostinfo);
/** Resolve relative to a base. This means host/etc, and (crucially) path */
- AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
- axis2_uri_resolve_relative(
+ AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+ axutil_uri_resolve_relative(
const axutil_env_t *env,
- const axis2_uri_t* base,
- axis2_uri_t* uptr);
+ const axutil_uri_t* base,
+ axutil_uri_t* uptr);
/**
* Return a URI created from a context URI and a relative URI.
@@ -135,18 +135,18 @@
* absolute file path
* @return the URIcreated from context_uri and uri
*/
- AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
- axis2_uri_parse_relative(
+ AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+ axutil_uri_parse_relative(
const axutil_env_t *env,
- const axis2_uri_t* base,
+ const axutil_uri_t* base,
const char* uri);
AXIS2_EXTERN void AXIS2_CALL
- axis2_uri_free(axis2_uri_t *uri,
+ axutil_uri_free(axutil_uri_t *uri,
const axutil_env_t *env);
/**
- * Unparse a axis2_uri_t structure to an URI string. Optionally
+ * Unparse a axutil_uri_t structure to an URI string. Optionally
* suppress the password for security reasons.
* @param uptr All of the parts of the uri
* @param flags How to unparse the uri. One of:
@@ -162,28 +162,28 @@
* @return The uri as a string
*/
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_uri_to_string(const axis2_uri_t *uri,
+ axutil_uri_to_string(const axutil_uri_t *uri,
const axutil_env_t *env,
unsigned flags);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_uri_get_protocol(axis2_uri_t *uri,
+ axutil_uri_get_protocol(axutil_uri_t *uri,
const axutil_env_t *env);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_uri_get_server(axis2_uri_t *uri,
+ axutil_uri_get_server(axutil_uri_t *uri,
const axutil_env_t *env);
AXIS2_EXTERN axis2_port_t AXIS2_CALL
- axis2_uri_get_port(axis2_uri_t *uri,
+ axutil_uri_get_port(axutil_uri_t *uri,
const axutil_env_t *env);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_uri_get_path(axis2_uri_t *uri,
+ axutil_uri_get_path(axutil_uri_t *uri,
const axutil_env_t *env);
- AXIS2_EXTERN axis2_uri_t* AXIS2_CALL
- axis2_uri_clone(const axis2_uri_t *uri,
+ AXIS2_EXTERN axutil_uri_t* AXIS2_CALL
+ axutil_uri_clone(const axutil_uri_t *uri,
const axutil_env_t *env);
Copied: webservices/axis2/trunk/c/util/include/axutil_url.h (from r524188, webservices/axis2/trunk/c/util/include/axis2_url.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_url.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/axis2_url.h&r1=524188&p2=webservices/axis2/trunk/c/util/include/axutil_url.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_url.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_url.h Fri Mar 30 12:54:08 2007
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-#ifndef AXIS2_URL_H
-#define AXIS2_URL_H
+#ifndef AXUTIL_URL_H
+#define AXUTIL_URL_H
/**
- * @file axis2_url.h
+ * @file axutil_url.h
* @brief axis2 URL container implementation
*/
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
#include <axutil_env.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
#ifdef __cplusplus
extern "C"
@@ -39,72 +39,72 @@
* @{
*/
- typedef struct axis2_url axis2_url_t;
+ typedef struct axutil_url axutil_url_t;
- AXIS2_EXTERN axis2_url_t * AXIS2_CALL
- axis2_url_create(
+ 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);
- AXIS2_EXTERN axis2_url_t * AXIS2_CALL
- axis2_url_parse_string(
+ AXIS2_EXTERN axutil_url_t * AXIS2_CALL
+ axutil_url_parse_string(
const axutil_env_t *env,
const axis2_char_t *str_url);
- AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
- axis2_url_to_uri(
- axis2_url_t *url,
+ AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+ axutil_url_to_uri(
+ axutil_url_t *url,
const axutil_env_t *env);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_url_to_external_form(axis2_url_t *url,
+ axutil_url_to_external_form(axutil_url_t *url,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_url_set_protocol(axis2_url_t *url,
+ axutil_url_set_protocol(axutil_url_t *url,
const axutil_env_t *env,
axis2_char_t *protocol);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_url_get_protocol(axis2_url_t *url,
+ axutil_url_get_protocol(axutil_url_t *url,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_url_set_server(axis2_url_t *url,
+ axutil_url_set_server(axutil_url_t *url,
const axutil_env_t *env,
axis2_char_t *server);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_url_get_server(axis2_url_t *url,
+ axutil_url_get_server(axutil_url_t *url,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_url_set_port(axis2_url_t *url,
+ axutil_url_set_port(axutil_url_t *url,
const axutil_env_t *env,
int port);
AXIS2_EXTERN int AXIS2_CALL
- axis2_url_get_port(axis2_url_t *url,
+ axutil_url_get_port(axutil_url_t *url,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_url_set_path(axis2_url_t *url,
+ axutil_url_set_path(axutil_url_t *url,
const axutil_env_t *env,
axis2_char_t *path);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
- axis2_url_get_path(axis2_url_t *url,
+ axutil_url_get_path(axutil_url_t *url,
const axutil_env_t *env);
- AXIS2_EXTERN axis2_url_t* AXIS2_CALL
- axis2_url_clone(axis2_url_t *url,
+ AXIS2_EXTERN axutil_url_t* AXIS2_CALL
+ axutil_url_clone(axutil_url_t *url,
const axutil_env_t *env);
AXIS2_EXTERN void AXIS2_CALL
- axis2_url_free(axis2_url_t *url,
+ axutil_url_free(axutil_url_t *url,
const axutil_env_t *env);
/** @} */
Copied: webservices/axis2/trunk/c/util/include/axutil_utils.h (from r524208, webservices/axis2/trunk/c/util/include/axis2_utils.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_utils.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/axis2_utils.h&r1=524208&p2=webservices/axis2/trunk/c/util/include/axutil_utils.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_utils.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_utils.h Fri Mar 30 12:54:08 2007
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-#ifndef AXIS2_UTILS_H
-#define AXIS2_UTILS_H
+#ifndef AXUTIL_UTILS_H
+#define AXUTIL_UTILS_H
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#include <axutil_error.h>
#include <axutil_env.h>
#include <axutil_date_time.h>
@@ -30,13 +30,13 @@
#endif
/**
- * @defgroup axis2_utils utils
+ * @defgroup axutil_utils utils
* @ingroup axis2_util
* @{
*/
/**
- * @file axis2_utils.h
+ * @file axutil_utils.h
*/
Copied: webservices/axis2/trunk/c/util/include/axutil_utils_defines.h (from r524179, webservices/axis2/trunk/c/util/include/axis2_utils_defines.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_utils_defines.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/axis2_utils_defines.h&r1=524179&p2=webservices/axis2/trunk/c/util/include/axutil_utils_defines.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_utils_defines.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_utils_defines.h Fri Mar 30 12:54:08 2007
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef AXIS2_UTILS_DEFINES_H
-#define AXIS2_UTILS_DEFINES_H
+#ifndef AXUTIL_UTILS_DEFINES_H
+#define AXUTIL_UTILS_DEFINES_H
#include <stddef.h>
Copied: webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h (from r524188, webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h&r1=524188&p2=webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_uuid_gen.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_uuid_gen.h Fri Mar 30 12:54:08 2007
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#ifndef AXIS2_UUID_GEN_H
-#define AXIS2_UUID_GEN_H
+#ifndef AXUTIL_UUID_GEN_H
+#define AXUTIL_UUID_GEN_H
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
#include <axutil_env.h>
#include <platforms/axis2_platform_auto_sense.h>
@@ -30,7 +30,7 @@
/**
- * @defgroup axis2_uuid_gen UUID generator
+ * @defgroup axutil_uuid_gen UUID generator
* @ingroup axis2_util
* @{
*/
@@ -40,7 +40,7 @@
* @return generated uuid as a string
*/
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- axis2_uuid_gen(const axutil_env_t *env);
+ axutil_uuid_gen(const axutil_env_t *env);
/** @} */
Modified: webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/axis2_platform_auto_sense.h Fri Mar 30 12:54:08 2007
@@ -37,10 +37,10 @@
#if defined( WIN32 )
#include "windows/axis2_windows.h"
#include "windows/axis2_dir_windows.h"
- #include "windows/axis2_uuid_gen_windows.h"
+ #include "windows/axutil_uuid_gen_windows.h"
#include "windows/axis2_getopt_windows.h"
#include "windows/axutil_date_time_util_windows.h"
- #include "windows/axis2_thread_windows.h"
+ #include "windows/axutil_thread_windows.h"
#elif defined ( __OS400__ )
#include <os400/axis2_os400.h>
#elif defined ( AIX )
Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axis2_unix.h Fri Mar 30 12:54:08 2007
@@ -111,7 +111,7 @@
#include <strings.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include "axis2_uuid_gen_unix.h" /* uuid_gen unix implementation */
+#include "axutil_uuid_gen_unix.h" /* uuid_gen unix implementation */
#include <netinet/tcp.h> /* TCP_NODELAY */
#include <utime.h>
#include <getopt.h>
Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h Fri Mar 30 12:54:08 2007
@@ -17,8 +17,8 @@
#ifndef AXUTIL_DATE_TIME_UTIL_UNIX_H
#define AXUTIL_DATE_TIME_UTIL_UNIX_H
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
#include <stdio.h>
#include <sys/timeb.h>
#include <time.h>
Copied: webservices/axis2/trunk/c/util/include/platforms/unix/axutil_thread_unix.h (from r524179, webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axutil_thread_unix.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h&r1=524179&p2=webservices/axis2/trunk/c/util/include/platforms/unix/axutil_thread_unix.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axis2_thread_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axutil_thread_unix.h Fri Mar 30 12:54:08 2007
@@ -15,36 +15,36 @@
* limitations under the License.
*/
-#ifndef AXIS2_THREAD_UNIX_H
-#define AXIS2_THREAD_UNIX_H
+#ifndef AXUTIL_THREAD_UNIX_H
+#define AXUTIL_THREAD_UNIX_H
-#include <axis2_thread.h>
+#include <axutil_thread.h>
#include <pthread.h>
#define SHELL_PATH "/bin/sh"
typedef pthread_t axis2_os_thread_t; /* Native thread */
-struct axis2_thread_t {
+struct axutil_thread_t {
pthread_t *td;
void *data;
- axis2_thread_start_t func;
+ axutil_thread_start_t func;
};
-struct axis2_threadattr_t {
+struct axutil_threadattr_t {
pthread_attr_t attr;
};
-struct axis2_threadkey_t {
+struct axutil_threadkey_t {
pthread_key_t key;
};
-struct axis2_thread_once_t {
+struct axutil_thread_once_t {
pthread_once_t once;
};
/*************************Thread locking functions*****************************/
-struct axis2_thread_mutex_t {
+struct axutil_thread_mutex_t {
axutil_allocator_t *allocator;
pthread_mutex_t mutex;
};
Copied: webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h (from r524179, webservices/axis2/trunk/c/util/include/platforms/unix/axis2_uuid_gen_unix.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h?view=diff&rev=524255&p1=webservices/axis2/trunk/c/util/include/platforms/unix/axis2_uuid_gen_unix.h&r1=524179&p2=webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axis2_uuid_gen_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axutil_uuid_gen_unix.h Fri Mar 30 12:54:08 2007
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#ifndef AXIS2_UUID_GEN_UNIX_H
-#define AXIS2_UUID_GEN_UNIX_H
+#ifndef AXUTIL_UUID_GEN_UNIX_H
+#define AXUTIL_UUID_GEN_UNIX_H
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
#define UUIDS_PER_TICK 100
@@ -31,7 +31,7 @@
/**
- * @defgroup axis2_uuid_gen UUID Generator
+ * @defgroup axutil_uuid_gen UUID Generator
* @ingroup axis2_util
* @{
*/
@@ -71,7 +71,7 @@
* @return generated uuid as a axis2_uuid_t
*/
axis2_uuid_t* AXIS2_CALL
-axis2_uuid_gen_v1();
+axutil_uuid_gen_v1();
/**
* Generates a uuid
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <windows.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
/* struct dirent - same as Unix dirent.h */
struct dirent
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
#ifndef _AXIS2_GETOPT_WINDOWS_H_
#define _AXIS2_GETOPT_WINDOWS_H_
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
/**
* @file axis2_getopt_windows.h
* @brief windows cutdown version of getopt function in unix
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_mutex_windows.h Fri Mar 30 12:54:08 2007
@@ -32,7 +32,7 @@
* and nested_mutex on Win9x only. Otherwise critical_section
* is used for NT nexted mutexes providing optimal performance.
*/
-struct axis2_thread_mutex_t
+struct axutil_thread_mutex_t
{
thread_mutex_type type;
HANDLE handle;
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_thread_windows.h Fri Mar 30 12:54:08 2007
@@ -20,7 +20,7 @@
#include <windows.h>
#include <process.h>
-#include <axis2_thread.h>
+#include <axutil_thread.h>
#define SHELL_PATH "cmd.exe"
@@ -28,53 +28,53 @@
/* Chosen for us by apr_initialize */
-struct axis2_thread_t
+struct axutil_thread_t
{
HANDLE *td;
void *data;
- axis2_thread_start_t func;
+ axutil_thread_start_t func;
};
-struct axis2_threadattr_t
+struct axutil_threadattr_t
{
int detach;
size_t stacksize;
};
-struct axis2_threadkey_t
+struct axutil_threadkey_t
{
DWORD key;
};
-struct axis2_thread_once_t
+struct axutil_thread_once_t
{
long value;
};
-AXIS2_EXTERN axis2_threadattr_t* AXIS2_CALL
-axis2_threadattr_create(axutil_allocator_t *allocator);
+AXIS2_EXTERN axutil_threadattr_t* AXIS2_CALL
+axutil_threadattr_create(axutil_allocator_t *allocator);
/* Destroy the threadattr object */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
threadattr_cleanup(void *data);
-AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_threadattr_detach_set(
- axis2_threadattr_t *attr,
+AXIS2_EXTERN axis2_status_t AXIS2_CALL axutil_threadattr_detach_set(
+ axutil_threadattr_t *attr,
axis2_bool_t detached);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_threadattr_detach_get(axis2_threadattr_t *attr, const axutil_env_t *env);
+axutil_threadattr_detach_get(axutil_threadattr_t *attr, const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_threadattr_stacksize_set(axis2_threadattr_t *attr, size_t stacksize);
+axutil_threadattr_stacksize_set(axutil_threadattr_t *attr, size_t stacksize);
-AXIS2_EXTERN axis2_thread_t* AXIS2_CALL
-axis2_thread_create(axutil_allocator_t *allocator, axis2_threadattr_t *attr,
- axis2_thread_start_t func, void *data);
+AXIS2_EXTERN axutil_thread_t* AXIS2_CALL
+axutil_thread_create(axutil_allocator_t *allocator, axutil_threadattr_t *attr,
+ axutil_thread_start_t func, void *data);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_exit(axis2_thread_t *thd, axutil_allocator_t *allocator);
+axutil_thread_exit(axutil_thread_t *thd, axutil_allocator_t *allocator);
AXIS2_EXTERN axis2_os_thread_t AXIS2_CALL
axis2_os_thread_current(void);
@@ -83,18 +83,18 @@
axis2_os_thread_equal(axis2_os_thread_t tid1, axis2_os_thread_t tid2);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_join(axis2_thread_t *thd);
+axutil_thread_join(axutil_thread_t *thd);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_detach(axis2_thread_t *thd);
+axutil_thread_detach(axutil_thread_t *thd);
AXIS2_EXTERN axis2_os_thread_t AXIS2_CALL
-axis2_os_thread_get(axis2_thread_t *thd, const axutil_env_t *env);
+axis2_os_thread_get(axutil_thread_t *thd, const axutil_env_t *env);
-AXIS2_EXTERN axis2_thread_once_t * AXIS2_CALL
-axis2_thread_once_init(axutil_allocator_t *allocator);
+AXIS2_EXTERN axutil_thread_once_t * AXIS2_CALL
+axutil_thread_once_init(axutil_allocator_t *allocator);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_once(axis2_thread_once_t *control, void(*func)(void));
+axutil_thread_once(axutil_thread_once_t *control, void(*func)(void));
#endif /* AXIS2_THREAD_WINDOWS_H */
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
#ifndef AXIS2_UDDI_GEN_WINDOWS_H
#define AXIS2_UDDI_GEN_WINDOWS_H
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
* @file axis2_unix.h
* @brief axis2 unix platform specific interface
*/
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axutil_date_time_util_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axutil_date_time_util_windows.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axutil_date_time_util_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axutil_date_time_util_windows.h Fri Mar 30 12:54:08 2007
@@ -17,8 +17,8 @@
#ifndef AXUTIL_DATE_TIME_UTIL_WINDOWS_H
#define AXUTIL_DATE_TIME_UTIL_WINDOWS_H
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
#include <stdio.h>
#include <sys/timeb.h>
#include <time.h>
Modified: webservices/axis2/trunk/c/util/src/allocator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/allocator.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/allocator.c (original)
+++ webservices/axis2/trunk/c/util/src/allocator.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
*/
#include <axutil_allocator.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <stdlib.h>
void *AXIS2_CALL
Modified: webservices/axis2/trunk/c/util/src/array_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/array_list.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/array_list.c (original)
+++ webservices/axis2/trunk/c/util/src/array_list.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
*/
#include <axutil_array_list.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <string.h>
struct axutil_array_list
Modified: webservices/axis2/trunk/c/util/src/base64_binary.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/base64_binary.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/base64_binary.c (original)
+++ webservices/axis2/trunk/c/util/src/base64_binary.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
#include <axutil_base64_binary.h>
#include <string.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
struct axutil_base64_binary
{
Modified: webservices/axis2/trunk/c/util/src/date_time.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/date_time.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/date_time.c (original)
+++ webservices/axis2/trunk/c/util/src/date_time.c Fri Mar 30 12:54:08 2007
@@ -20,7 +20,7 @@
#include <time.h>
#include <stdlib.h>
#include <axutil_error.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <axutil_date_time_util.h>
struct axutil_date_time
Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Fri Mar 30 12:54:08 2007
@@ -30,7 +30,7 @@
axutil_error_t *error = NULL;
axutil_log_t *log = NULL;
axutil_allocator_t *allocator = NULL;
- axis2_thread_pool_t *thread_pool = NULL;
+ axutil_thread_pool_t *thread_pool = NULL;
allocator = axutil_allocator_init(NULL);
error = axutil_error_create(allocator);
@@ -43,7 +43,7 @@
if (!log)
log = axutil_log_create_default(allocator);
- thread_pool = axis2_thread_pool_init(allocator);
+ thread_pool = axutil_thread_pool_init(allocator);
env = axutil_env_create_with_error_log_thread_pool(allocator, error, log, thread_pool);
if (env->log)
{
@@ -166,7 +166,7 @@
axutil_env_create_with_error_log_thread_pool(axutil_allocator_t *allocator,
axutil_error_t *error,
axutil_log_t *log,
- axis2_thread_pool_t *pool)
+ axutil_thread_pool_t *pool)
{
axutil_env_t *environment;
if (! allocator)
Modified: webservices/axis2/trunk/c/util/src/linked_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/linked_list.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/linked_list.c (original)
+++ webservices/axis2/trunk/c/util/src/linked_list.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
*/
#include <axutil_linked_list.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
struct axutil_linked_list
{
Modified: webservices/axis2/trunk/c/util/src/log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/log.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/log.c (original)
+++ webservices/axis2/trunk/c/util/src/log.c Fri Mar 30 12:54:08 2007
@@ -21,7 +21,7 @@
#include <platforms/axis2_platform_auto_sense.h>
#include <axutil_log_default.h>
#include <axutil_file_handler.h>
-#include <axis2_thread.h>
+#include <axutil_thread.h>
typedef struct axutil_log_impl axutil_log_impl_t;
@@ -34,7 +34,7 @@
AXIS2_EXTERN void AXIS2_CALL
axutil_log_impl_write_to_file(FILE *fd,
- axis2_thread_mutex_t *mutex,
+ axutil_thread_mutex_t *mutex,
axutil_log_levels_t level,
const axis2_char_t * file,
const int line,
@@ -48,7 +48,7 @@
{
axutil_log_t log;
void *stream;
- axis2_thread_mutex_t *mutex;
+ axutil_thread_mutex_t *mutex;
};
#define AXIS2_INTF_TO_IMPL(log) ((axutil_log_impl_t*)(log))
@@ -70,7 +70,7 @@
if (log_impl->mutex)
{
- axis2_thread_mutex_destroy(log_impl->mutex);
+ axutil_thread_mutex_destroy(log_impl->mutex);
}
if (AXIS2_INTF_TO_IMPL(log)->stream)
{
@@ -104,7 +104,7 @@
if (!log_impl)
return NULL;
- log_impl->mutex = axis2_thread_mutex_create(allocator,
+ log_impl->mutex = axutil_thread_mutex_create(allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
if (!log_impl->mutex)
@@ -150,11 +150,11 @@
AXIS2_SNPRINTF(log_file_name, 500, "%s", tmp_filename);
}
- axis2_thread_mutex_lock(log_impl->mutex);
+ axutil_thread_mutex_lock(log_impl->mutex);
log_impl->stream = axutil_file_handler_open(log_file_name, "a+");
- axis2_thread_mutex_unlock(log_impl->mutex);
+ axutil_thread_mutex_unlock(log_impl->mutex);
if (!log_impl->stream)
log_impl->stream = stderr;
@@ -215,7 +215,7 @@
AXIS2_EXTERN void AXIS2_CALL
-axutil_log_impl_write_to_file(FILE *fd, axis2_thread_mutex_t *mutex,
+axutil_log_impl_write_to_file(FILE *fd, axutil_thread_mutex_t *mutex,
axutil_log_levels_t level, const axis2_char_t *file,
const int line, const axis2_char_t *value)
{
@@ -245,7 +245,7 @@
level_str = "[...TRACE...] ";
break;
}
- axis2_thread_mutex_lock(mutex);
+ axutil_thread_mutex_lock(mutex);
if (file)
fprintf(fd, "[%s] %s%s(%d) %s\n", axutil_log_impl_get_time_str(),
level_str, file, line, value);
@@ -253,7 +253,7 @@
fprintf(fd, "[%s] %s %s\n", axutil_log_impl_get_time_str(),
level_str, value);
fflush(fd);
- axis2_thread_mutex_unlock(mutex);
+ axutil_thread_mutex_unlock(mutex);
}
@@ -262,7 +262,7 @@
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
- axis2_thread_mutex_t *mutex = NULL;
+ axutil_thread_mutex_t *mutex = NULL;
if (log && format && log->enabled)
{
@@ -297,7 +297,7 @@
axutil_log_impl_log_info(axutil_log_t *log, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
- axis2_thread_mutex_t *mutex = NULL;
+ axutil_thread_mutex_t *mutex = NULL;
if (log && format && log->enabled)
{
@@ -333,7 +333,7 @@
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
- axis2_thread_mutex_t *mutex = NULL;
+ axutil_thread_mutex_t *mutex = NULL;
if (log && format && log->enabled)
{
@@ -371,7 +371,7 @@
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
- axis2_thread_mutex_t *mutex = NULL;
+ axutil_thread_mutex_t *mutex = NULL;
char value[AXIS2_LEN_VALUE+1];
va_list ap;
@@ -407,7 +407,7 @@
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
- axis2_thread_mutex_t *mutex = NULL;
+ axutil_thread_mutex_t *mutex = NULL;
char value[AXIS2_LEN_VALUE+1];
va_list ap;
@@ -472,7 +472,7 @@
if (!log_impl)
return NULL;
- log_impl->mutex = axis2_thread_mutex_create(allocator,
+ log_impl->mutex = axutil_thread_mutex_create(allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
if (!log_impl->mutex)
@@ -481,9 +481,9 @@
return NULL;
}
- axis2_thread_mutex_lock(log_impl->mutex);
+ axutil_thread_mutex_lock(log_impl->mutex);
log_impl->stream = stderr;
- axis2_thread_mutex_unlock(log_impl->mutex);
+ axutil_thread_mutex_unlock(log_impl->mutex);
/* by default, log is enabled */
log_impl->log.enabled = 1;
log_impl->log.level = AXIS2_LOG_LEVEL_DEBUG;
@@ -499,7 +499,7 @@
const int linenumber, const axis2_char_t *format, ...)
{
FILE *fd = NULL;
- axis2_thread_mutex_t *mutex = NULL;
+ axutil_thread_mutex_t *mutex = NULL;
if (log && format && log->enabled)
{
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=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/param.c (original)
+++ webservices/axis2/trunk/c/util/src/param.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
*/
#include <axutil_param.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <axutil_string.h>
#include <axutil_generic_obj.h>
Modified: webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c Fri Mar 30 12:54:08 2007
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-#include "axis2_thread_unix.h"
+#include "axutil_thread_unix.h"
-AXIS2_EXTERN axis2_threadattr_t* AXIS2_CALL
-axis2_threadattr_create(axutil_allocator_t* allocator)
+AXIS2_EXTERN axutil_threadattr_t* AXIS2_CALL
+axutil_threadattr_create(axutil_allocator_t* allocator)
{
int stat = 0;
- axis2_threadattr_t *new = NULL;
+ axutil_threadattr_t *new = NULL;
- new = AXIS2_MALLOC(allocator, sizeof(axis2_threadattr_t));
+ new = AXIS2_MALLOC(allocator, sizeof(axutil_threadattr_t));
if (!new)
{
return NULL;
@@ -43,7 +43,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
threadattr_cleanup(void *data)
{
- axis2_threadattr_t *attr = data;
+ axutil_threadattr_t *attr = data;
int rv;
rv = pthread_attr_destroy(&(attr->attr));
@@ -58,7 +58,7 @@
#define DETACH_ARG(v) ((v) ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE)
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_threadattr_detach_set(axis2_threadattr_t *attr, axis2_bool_t detached)
+axutil_threadattr_detach_set(axutil_threadattr_t *attr, axis2_bool_t detached)
{
if (0 == pthread_attr_setdetachstate(&(attr->attr), DETACH_ARG(detached)))
{
@@ -68,7 +68,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_threadattr_detach_get(axis2_threadattr_t *attr)
+axutil_threadattr_detach_get(axutil_threadattr_t *attr)
{
int state = 0;
pthread_attr_getdetachstate(&(attr->attr), &state);
@@ -81,19 +81,19 @@
static void *dummy_worker(void *opaque)
{
- axis2_thread_t *thread = (axis2_thread_t*)opaque;
+ axutil_thread_t *thread = (axutil_thread_t*)opaque;
return thread->func(thread, thread->data);
}
-AXIS2_EXTERN axis2_thread_t* AXIS2_CALL
-axis2_thread_create(axutil_allocator_t* allocator, axis2_threadattr_t *attr,
- axis2_thread_start_t func, void *data)
+AXIS2_EXTERN axutil_thread_t* AXIS2_CALL
+axutil_thread_create(axutil_allocator_t* allocator, axutil_threadattr_t *attr,
+ axutil_thread_start_t func, void *data)
{
axis2_status_t stat;
pthread_attr_t *temp = NULL;
- axis2_thread_t *new = NULL;
+ axutil_thread_t *new = NULL;
- new = (axis2_thread_t *)AXIS2_MALLOC(allocator, sizeof(axis2_thread_t));
+ new = (axutil_thread_t *)AXIS2_MALLOC(allocator, sizeof(axutil_thread_t));
if (!new)
{
@@ -137,7 +137,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_exit(axis2_thread_t *thd, axutil_allocator_t *allocator)
+axutil_thread_exit(axutil_thread_t *thd, axutil_allocator_t *allocator)
{
if (thd)
{
@@ -152,7 +152,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_join(axis2_thread_t *thd)
+axutil_thread_join(axutil_thread_t *thd)
{
void *thread_stat;
if (0 == pthread_join(*(thd->td), (void *)(&thread_stat)))
@@ -163,7 +163,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_detach(axis2_thread_t *thd)
+axutil_thread_detach(axutil_thread_t *thd)
{
if (0 == pthread_detach(*(thd->td)))
{
@@ -172,7 +172,7 @@
return AXIS2_FAILURE;
}
-void axis2_thread_yield(void)
+void axutil_thread_yield(void)
{
return;
}
@@ -183,8 +183,8 @@
* its copy of the value as it wishes.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_key_create(
- axis2_threadkey_t *axis2_key,
+axutil_thread_key_create(
+ axutil_threadkey_t *axis2_key,
void (*destructor)(void *))
{
int rc = -1;
@@ -201,8 +201,8 @@
* @return void*. A key's value is simply a void pointer (void*)
*/
AXIS2_EXTERN void * AXIS2_CALL
-axis2_thread_getspecific(
- axis2_threadkey_t *axis2_key)
+axutil_thread_getspecific(
+ axutil_threadkey_t *axis2_key)
{
void *value = NULL;
pthread_key_t key = axis2_key->key;
@@ -216,8 +216,8 @@
* store in it anything that we want
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_setspecific(
- axis2_threadkey_t *axis2_key,
+axutil_thread_setspecific(
+ axutil_threadkey_t *axis2_key,
void *value)
{
int rc = -1;
@@ -230,7 +230,7 @@
}
AXIS2_EXTERN axis2_os_thread_t* AXIS2_CALL
-axis2_os_thread_get(axis2_thread_t *thd)
+axis2_os_thread_get(axutil_thread_t *thd)
{
if (!thd)
{
@@ -239,12 +239,12 @@
return thd->td;
}
-AXIS2_EXTERN axis2_thread_once_t* AXIS2_CALL
-axis2_thread_once_init(axutil_allocator_t* allocator)
+AXIS2_EXTERN axutil_thread_once_t* AXIS2_CALL
+axutil_thread_once_init(axutil_allocator_t* allocator)
{
static const pthread_once_t once_init = PTHREAD_ONCE_INIT;
- axis2_thread_once_t *control = AXIS2_MALLOC(allocator,
- sizeof(axis2_thread_once_t));
+ axutil_thread_once_t *control = AXIS2_MALLOC(allocator,
+ sizeof(axutil_thread_once_t));
if (!control)
{
return NULL;
@@ -255,18 +255,18 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_once(axis2_thread_once_t *control, void(*func)(void))
+axutil_thread_once(axutil_thread_once_t *control, void(*func)(void))
{
return pthread_once(&(control->once), func);
}
/*************************Thread locking functions*****************************/
-AXIS2_EXTERN axis2_thread_mutex_t * AXIS2_CALL
-axis2_thread_mutex_create(axutil_allocator_t *allocator, unsigned int flags)
+AXIS2_EXTERN axutil_thread_mutex_t * AXIS2_CALL
+axutil_thread_mutex_create(axutil_allocator_t *allocator, unsigned int flags)
{
- axis2_thread_mutex_t *new_mutex = NULL;
+ axutil_thread_mutex_t *new_mutex = NULL;
- new_mutex = AXIS2_MALLOC(allocator, sizeof(axis2_thread_mutex_t));
+ new_mutex = AXIS2_MALLOC(allocator, sizeof(axutil_thread_mutex_t));
new_mutex->allocator = allocator;
if (pthread_mutex_init(&(new_mutex->mutex), NULL) != 0)
@@ -278,13 +278,13 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex)
+axutil_thread_mutex_lock(axutil_thread_mutex_t *mutex)
{
return pthread_mutex_lock(&(mutex->mutex));
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_mutex_unlock(axis2_thread_mutex_t *mutex)
+axutil_thread_mutex_unlock(axutil_thread_mutex_t *mutex)
{
if (pthread_mutex_unlock(&(mutex->mutex)) != 0)
{
@@ -294,7 +294,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_mutex_destroy(axis2_thread_mutex_t *mutex)
+axutil_thread_mutex_destroy(axutil_thread_mutex_t *mutex)
{
if (0 != pthread_mutex_destroy(&(mutex->mutex)))
{
Modified: webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c Fri Mar 30 12:54:08 2007
@@ -44,17 +44,17 @@
# endif
#endif
-#include <platforms/unix/axis2_uuid_gen_unix.h>
+#include <platforms/unix/axutil_uuid_gen_unix.h>
#include <platforms/axis2_platform_auto_sense.h>
/* We need these static variables to track throughout the program execution */
-static axis2_bool_t axis2_uuid_gen_is_first = AXIS2_TRUE;
+static axis2_bool_t axutil_uuid_gen_is_first = AXIS2_TRUE;
static struct axis2_uuid_st axis2_uuid_static;
axis2_uuid_t* AXIS2_CALL
-axis2_uuid_gen_v1()
+axutil_uuid_gen_v1()
{
struct timeval time_now;
struct timeval tv;
@@ -64,14 +64,14 @@
axis2_uuid_t *ret_uuid = NULL;
unsigned short int time_high_version = 0;
- if (AXIS2_TRUE == axis2_uuid_gen_is_first)
+ if (AXIS2_TRUE == axutil_uuid_gen_is_first)
{
char *mac_addr = axis2_uuid_get_mac_addr();
memcpy(axis2_uuid_static.mac, mac_addr, 6);
axis2_uuid_static.time_seq = 0;
axis2_uuid_static.clock = 0;
free(mac_addr);
- axis2_uuid_gen_is_first = AXIS2_FALSE;
+ axutil_uuid_gen_is_first = AXIS2_FALSE;
}
/*
* GENERATE TIME
@@ -185,7 +185,7 @@
{
return NULL;
}
- uuid_struct = axis2_uuid_gen_v1();
+ uuid_struct = axutil_uuid_gen_v1();
if (! uuid_struct)
{
return NULL;
Modified: webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c Fri Mar 30 12:54:08 2007
@@ -16,17 +16,17 @@
*/
-#include <axis2_thread.h>
-#include <platforms/windows/axis2_thread_mutex_windows.h>
+#include <axutil_thread.h>
+#include <platforms/windows/axutil_thread_mutex_windows.h>
static axis2_status_t thread_mutex_cleanup(void *data)
{
- axis2_thread_mutex_t *lock = NULL;
+ axutil_thread_mutex_t *lock = NULL;
axutil_allocator_t *allocator = NULL;
if (!data)
return AXIS2_FAILURE;
- lock = (axis2_thread_mutex_t *)data;
+ lock = (axutil_thread_mutex_t *)data;
allocator = lock ->allocator;
if (lock ->type == thread_mutex_critical_section)
@@ -45,12 +45,12 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_thread_mutex_t * AXIS2_CALL axis2_thread_mutex_create(axutil_allocator_t *allocator,
+AXIS2_EXTERN axutil_thread_mutex_t * AXIS2_CALL axutil_thread_mutex_create(axutil_allocator_t *allocator,
unsigned int flags)
{
- axis2_thread_mutex_t *mutex = NULL;
+ axutil_thread_mutex_t *mutex = NULL;
- mutex = (axis2_thread_mutex_t *)AXIS2_MALLOC(allocator, sizeof(axis2_thread_mutex_t));
+ mutex = (axutil_thread_mutex_t *)AXIS2_MALLOC(allocator, sizeof(axutil_thread_mutex_t));
mutex->allocator = allocator;
if (flags == AXIS2_THREAD_MUTEX_DEFAULT) /*unnested*/
@@ -70,7 +70,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex)
+axutil_thread_mutex_lock(axutil_thread_mutex_t *mutex)
{
if (mutex->type == thread_mutex_critical_section)
{
@@ -89,7 +89,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_mutex_trylock(axis2_thread_mutex_t *mutex)
+axutil_thread_mutex_trylock(axutil_thread_mutex_t *mutex)
{
if (mutex->type == thread_mutex_critical_section)
@@ -109,7 +109,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_mutex_unlock(axis2_thread_mutex_t *mutex)
+axutil_thread_mutex_unlock(axutil_thread_mutex_t *mutex)
{
if (mutex->type == thread_mutex_critical_section)
{
@@ -135,7 +135,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_mutex_destroy(axis2_thread_mutex_t *mutex)
+axutil_thread_mutex_destroy(axutil_thread_mutex_t *mutex)
{
return thread_mutex_cleanup((void*)mutex);
}
Modified: webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c Fri Mar 30 12:54:08 2007
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-#include <axis2_utils.h>
-#include <platforms/windows/axis2_thread_windows.h>
+#include <axutil_utils.h>
+#include <platforms/windows/axutil_thread_windows.h>
-DWORD tls_axis2_thread = 0;
+DWORD tls_axutil_thread = 0;
-AXIS2_EXTERN axis2_threadattr_t* AXIS2_CALL
-axis2_threadattr_create(axutil_allocator_t *allocator)
+AXIS2_EXTERN axutil_threadattr_t* AXIS2_CALL
+axutil_threadattr_create(axutil_allocator_t *allocator)
{
- axis2_threadattr_t *new = NULL;
+ axutil_threadattr_t *new = NULL;
- new = AXIS2_MALLOC(allocator, sizeof(axis2_threadattr_t));
+ new = AXIS2_MALLOC(allocator, sizeof(axutil_threadattr_t));
if (! new)
{
/*AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)*/
@@ -41,13 +41,13 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
threadattr_cleanup(void *data)
{
- axis2_threadattr_t *attr = data;
+ axutil_threadattr_t *attr = data;
/*nothing to clean up*/
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_threadattr_detach_set(
- axis2_threadattr_t *attr,
+AXIS2_EXTERN axis2_status_t AXIS2_CALL axutil_threadattr_detach_set(
+ axutil_threadattr_t *attr,
axis2_bool_t detached)
{
attr->detach = detached;
@@ -55,7 +55,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_threadattr_detach_get(axis2_threadattr_t *attr, const axutil_env_t *env)
+axutil_threadattr_detach_get(axutil_threadattr_t *attr, const axutil_env_t *env)
{
if (1 == attr->detach)
{
@@ -65,7 +65,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_threadattr_stacksize_set(axis2_threadattr_t *attr, size_t stacksize)
+axutil_threadattr_stacksize_set(axutil_threadattr_t *attr, size_t stacksize)
{
attr->stacksize = stacksize;
return AXIS2_SUCCESS;
@@ -73,21 +73,21 @@
static void *dummy_worker(void *opaque)
{
- axis2_thread_t *thd = (axis2_thread_t *)opaque;
- TlsSetValue(tls_axis2_thread, thd->td);
+ axutil_thread_t *thd = (axutil_thread_t *)opaque;
+ TlsSetValue(tls_axutil_thread, thd->td);
return thd->func(thd, thd->data);
}
-AXIS2_EXTERN axis2_thread_t* AXIS2_CALL
-axis2_thread_create(axutil_allocator_t *allocator, axis2_threadattr_t *attr,
- axis2_thread_start_t func, void *data)
+AXIS2_EXTERN axutil_thread_t* AXIS2_CALL
+axutil_thread_create(axutil_allocator_t *allocator, axutil_threadattr_t *attr,
+ axutil_thread_start_t func, void *data)
{
HANDLE handle;
unsigned temp;
- axis2_thread_t *new = NULL;
+ axutil_thread_t *new = NULL;
- new = (axis2_thread_t *)AXIS2_MALLOC(allocator,
- sizeof(axis2_thread_t));
+ new = (axutil_thread_t *)AXIS2_MALLOC(allocator,
+ sizeof(axutil_thread_t));
if (! new)
{
@@ -120,7 +120,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_exit(axis2_thread_t *thd, axutil_allocator_t *allocator)
+axutil_thread_exit(axutil_thread_t *thd, axutil_allocator_t *allocator)
{
if (thd)
{
@@ -134,7 +134,7 @@
AXIS2_EXTERN axis2_os_thread_t AXIS2_CALL
axis2_os_thread_current(void)
{
- HANDLE hthread = (HANDLE)TlsGetValue(tls_axis2_thread);
+ HANDLE hthread = (HANDLE)TlsGetValue(tls_axutil_thread);
HANDLE hproc;
if (hthread)
@@ -150,7 +150,7 @@
{
return NULL;
}
- TlsSetValue(tls_axis2_thread, hthread);
+ TlsSetValue(tls_axutil_thread, hthread);
return hthread;
}
@@ -161,7 +161,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_join(axis2_thread_t *thd)
+axutil_thread_join(axutil_thread_t *thd)
{
axis2_status_t rv = AXIS2_SUCCESS, rv1;
@@ -184,7 +184,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_detach(axis2_thread_t *thd)
+axutil_thread_detach(axutil_thread_t *thd)
{
if (thd->td && CloseHandle(thd->td))
{
@@ -198,21 +198,21 @@
}
AXIS2_EXTERN axis2_os_thread_t AXIS2_CALL
-axis2_os_thread_get(axis2_thread_t *thd, const axutil_env_t *env)
+axis2_os_thread_get(axutil_thread_t *thd, const axutil_env_t *env)
{
return thd->td;
}
-AXIS2_EXTERN axis2_thread_once_t * AXIS2_CALL
-axis2_thread_once_init(axutil_allocator_t *allocator)
+AXIS2_EXTERN axutil_thread_once_t * AXIS2_CALL
+axutil_thread_once_init(axutil_allocator_t *allocator)
{
- axis2_thread_once_t *control = NULL;
+ axutil_thread_once_t *control = NULL;
control = AXIS2_MALLOC(allocator, sizeof(*control));
return control;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_once(axis2_thread_once_t *control, void(*func)(void))
+axutil_thread_once(axutil_thread_once_t *control, void(*func)(void))
{
if (!InterlockedExchange(&control->value, 1))
{
Modified: webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c Fri Mar 30 12:54:08 2007
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-#include <platforms/windows/axis2_uuid_gen_windows.h>
+#include <platforms/windows/axutil_uuid_gen_windows.h>
#include <rpc.h>
#include <stdio.h>
#include <string.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
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=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/properties.c (original)
+++ webservices/axis2/trunk/c/util/src/properties.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
#include <axutil_properties.h>
#include <axutil_string.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#define MAX_SIZE 1024
Modified: webservices/axis2/trunk/c/util/src/qname.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/qname.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/qname.c (original)
+++ webservices/axis2/trunk/c/util/src/qname.c Fri Mar 30 12:54:08 2007
@@ -17,8 +17,8 @@
#include <axutil_qname.h>
#include <axutil_env.h>
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
#include <string.h>
#include <stdio.h>
Modified: webservices/axis2/trunk/c/util/src/stack.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stack.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/stack.c (original)
+++ webservices/axis2/trunk/c/util/src/stack.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
*/
#include <axutil_stack.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <axutil_env.h>
#include <stdlib.h>
#include <string.h>
Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Fri Mar 30 12:54:08 2007
@@ -17,8 +17,8 @@
#include <axutil_string.h>
#include <stdlib.h>
-#include <axis2_utils.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils.h>
+#include <axutil_utils_defines.h>
#include <stdarg.h> /* NULL */
struct axutil_string
Modified: webservices/axis2/trunk/c/util/src/string_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string_util.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
#include <axutil_string_util.h>
#include <string.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_tokenize(const axutil_env_t *env,
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?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/thread_pool.c (original)
+++ webservices/axis2/trunk/c/util/src/thread_pool.c Fri Mar 30 12:54:08 2007
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-#include <axis2_thread_pool.h>
+#include <axutil_thread_pool.h>
#include <axutil_env.h>
#include <axutil_error_default.h>
-struct axis2_thread_pool
+struct axutil_thread_pool
{
axutil_allocator_t *allocator;
};
-AXIS2_EXTERN axis2_thread_pool_t * AXIS2_CALL
-axis2_thread_pool_init(axutil_allocator_t *allocator)
+AXIS2_EXTERN axutil_thread_pool_t * AXIS2_CALL
+axutil_thread_pool_init(axutil_allocator_t *allocator)
{
- axis2_thread_pool_t *pool = NULL;
+ axutil_thread_pool_t *pool = NULL;
- pool = (axis2_thread_pool_t *)AXIS2_MALLOC(allocator,
- sizeof(axis2_thread_pool_t));
+ pool = (axutil_thread_pool_t *)AXIS2_MALLOC(allocator,
+ sizeof(axutil_thread_pool_t));
if (!pool)
{
@@ -43,7 +43,7 @@
AXIS2_EXTERN void AXIS2_CALL
-axis2_thread_pool_free(axis2_thread_pool_t *pool)
+axutil_thread_pool_free(axutil_thread_pool_t *pool)
{
if (!pool)
{
@@ -57,9 +57,9 @@
return;
}
-AXIS2_EXTERN axis2_thread_t* AXIS2_CALL
-axis2_thread_pool_get_thread(axis2_thread_pool_t *pool,
- axis2_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)
{
@@ -69,42 +69,42 @@
{
return NULL;
}
- return axis2_thread_create(pool->allocator, NULL, func, data);
+ return axutil_thread_create(pool->allocator, NULL, func, data);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_pool_join_thread(axis2_thread_pool_t *pool,
- axis2_thread_t *thd)
+axutil_thread_pool_join_thread(axutil_thread_pool_t *pool,
+ axutil_thread_t *thd)
{
if (!pool || !thd)
{
return AXIS2_FAILURE;
}
- return axis2_thread_join(thd);
+ return axutil_thread_join(thd);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_pool_exit_thread(axis2_thread_pool_t *pool,
- axis2_thread_t *thd)
+axutil_thread_pool_exit_thread(axutil_thread_pool_t *pool,
+ axutil_thread_t *thd)
{
if (!pool || !thd)
{
return AXIS2_FAILURE;
}
- return axis2_thread_exit(thd, pool->allocator);
+ return axutil_thread_exit(thd, pool->allocator);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_pool_thread_detach(axis2_thread_pool_t *pool,
- axis2_thread_t *thd)
+axutil_thread_pool_thread_detach(axutil_thread_pool_t *pool,
+ axutil_thread_t *thd)
{
if (!pool || !thd)
{
return AXIS2_FAILURE;
}
- return axis2_thread_detach(thd);
+ return axutil_thread_detach(thd);
}
AXIS2_EXTERN axutil_env_t *AXIS2_CALL
Modified: webservices/axis2/trunk/c/util/src/types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/types.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/types.c (original)
+++ webservices/axis2/trunk/c/util/src/types.c Fri Mar 30 12:54:08 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <axis2_types.h>
+#include <axutil_types.h>
AXIS2_EXTERN int AXIS2_CALL
axis2_atoi(const char *s)
Modified: webservices/axis2/trunk/c/util/src/uri.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uri.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/uri.c (original)
+++ webservices/axis2/trunk/c/util/src/uri.c Fri Mar 30 12:54:08 2007
@@ -19,7 +19,7 @@
#define AXIS2_WANT_STRFUNC
-#include <axis2_uri.h>
+#include <axutil_uri.h>
typedef struct schemes_t schemes_t;
@@ -141,7 +141,7 @@
/**
* A structure to encompass all of the fields in a uri
*/
-struct axis2_uri
+struct axutil_uri
{
/** scheme ("http"/"ftp"/...) */
axis2_char_t *scheme;
@@ -180,14 +180,14 @@
1;
};
-AXIS2_EXTERN axis2_uri_t * AXIS2_CALL
-axis2_uri_create(const axutil_env_t *env)
+AXIS2_EXTERN axutil_uri_t * AXIS2_CALL
+axutil_uri_create(const axutil_env_t *env)
{
- axis2_uri_t *uri = NULL;
+ axutil_uri_t *uri = NULL;
AXIS2_ENV_CHECK(env, NULL);
- uri = (axis2_uri_t *)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_uri_t));
+ uri = (axutil_uri_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_uri_t));
if (!uri)
{
@@ -209,7 +209,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_uri_free(axis2_uri_t *uri,
+axutil_uri_free(axutil_uri_t *uri,
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -282,11 +282,11 @@
* - none on any of the r->* fields
*/
-AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
-axis2_uri_parse_string(const axutil_env_t *env,
+AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+axutil_uri_parse_string(const axutil_env_t *env,
const axis2_char_t *uri_str)
{
- axis2_uri_t *uri = NULL;
+ axutil_uri_t *uri = NULL;
const axis2_char_t *s;
const axis2_char_t *s1;
const axis2_char_t *hostinfo;
@@ -297,7 +297,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, uri_str, NULL);
- uri = (axis2_uri_t *) axis2_uri_create(env);
+ uri = (axutil_uri_t *) axutil_uri_create(env);
/* Initialize the structure. parse_uri() and parse_uri_components()
* can be called more than once per request.
@@ -447,7 +447,7 @@
/* Invalid characters after ':' found */
return NULL;
}
- uri->port = axis2_uri_port_of_scheme(uri->scheme);
+ uri->port = axutil_uri_port_of_scheme(uri->scheme);
goto deal_with_path;
}
@@ -474,11 +474,11 @@
* 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 axis2_uri_t *AXIS2_CALL
-axis2_uri_parse_hostinfo(const axutil_env_t *env,
+AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+axutil_uri_parse_hostinfo(const axutil_env_t *env,
const axis2_char_t *hostinfo)
{
- axis2_uri_t *uri = NULL;
+ axutil_uri_t *uri = NULL;
const axis2_char_t *s;
axis2_char_t *endstr;
const axis2_char_t *rsb;
@@ -487,7 +487,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, hostinfo, NULL);
- uri = (axis2_uri_t *) axis2_uri_create(env);
+ uri = (axutil_uri_t *) axutil_uri_create(env);
/* Initialize the structure. parse_uri() and parse_uri_components()
* can be called more than once per request.
@@ -535,10 +535,10 @@
}
/* Resolve relative to a base. This means host/etc, and (crucially) path */
-AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
-axis2_uri_resolve_relative(const axutil_env_t *env,
- const axis2_uri_t* base,
- axis2_uri_t* uri)
+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)
{
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, base, NULL);
@@ -637,24 +637,24 @@
return uri;
}
-AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
-axis2_uri_parse_relative(const axutil_env_t *env,
- const axis2_uri_t* base,
+AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+axutil_uri_parse_relative(const axutil_env_t *env,
+ const axutil_uri_t* base,
const char* uri)
{
- axis2_uri_t *uptr = NULL;
+ axutil_uri_t *uptr = NULL;
- uptr = axis2_uri_parse_string(env, uri) ;
+ uptr = axutil_uri_parse_string(env, uri) ;
if (! uptr && AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
return uptr ;
}
- uptr = axis2_uri_resolve_relative(env, base, uptr) ;
+ uptr = axutil_uri_resolve_relative(env, base, uptr) ;
return uptr;
}
AXIS2_EXTERN axis2_port_t AXIS2_CALL
-axis2_uri_port_of_scheme(const axis2_char_t *scheme_str)
+axutil_uri_port_of_scheme(const axis2_char_t *scheme_str)
{
schemes_t *scheme;
@@ -671,14 +671,14 @@
return 0;
}
-AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
-axis2_uri_clone(const axis2_uri_t* uri,
+AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+axutil_uri_clone(const axutil_uri_t* uri,
const axutil_env_t *env)
{
- axis2_uri_t *new_uri = NULL;
+ axutil_uri_t *new_uri = NULL;
AXIS2_ENV_CHECK(env, NULL);
- new_uri = (axis2_uri_t *) axis2_uri_create(env);
+ new_uri = (axutil_uri_t *) axutil_uri_create(env);
new_uri->scheme = axis2_strdup(env, uri->scheme);
new_uri->hostinfo = axis2_strdup(env, uri->hostinfo);
@@ -698,11 +698,11 @@
return new_uri;
}
-/* Unparse a axis2_uri_t structure to an URI string.
+/* Unparse a axutil_uri_t structure to an URI string.
* Optionally suppress the password for security reasons.
*/
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_uri_to_string(const axis2_uri_t *uri,
+axutil_uri_to_string(const axutil_uri_t *uri,
const axutil_env_t *env,
unsigned flags)
{
@@ -747,7 +747,7 @@
is_default_port =
(uri->port_str == NULL ||
uri->port == 0 ||
- uri->port == axis2_uri_port_of_scheme(uri->scheme));
+ uri->port == axutil_uri_port_of_scheme(uri->scheme));
if (uri->scheme)
{
@@ -796,28 +796,28 @@
}
axis2_char_t *AXIS2_CALL
-axis2_uri_get_protocol(axis2_uri_t *uri,
+axutil_uri_get_protocol(axutil_uri_t *uri,
const axutil_env_t *env)
{
return uri->scheme;
}
axis2_char_t *AXIS2_CALL
-axis2_uri_get_server(axis2_uri_t *uri,
+axutil_uri_get_server(axutil_uri_t *uri,
const axutil_env_t *env)
{
return uri->hostinfo;
}
axis2_port_t AXIS2_CALL
-axis2_uri_get_port(axis2_uri_t *uri,
+axutil_uri_get_port(axutil_uri_t *uri,
const axutil_env_t *env)
{
return uri->port;
}
axis2_char_t *AXIS2_CALL
-axis2_uri_get_path(axis2_uri_t *uri,
+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?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Fri Mar 30 12:54:08 2007
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-#include <axis2_url.h>
+#include <axutil_url.h>
#include <axutil_string.h>
#include <axutil_string.h>
#include <axutil_file_handler.h>
#include <axutil_network_handler.h>
-#include <axis2_types.h>
+#include <axutil_types.h>
-struct axis2_url
+struct axutil_url
{
axis2_char_t *protocol;
axis2_char_t *server;
@@ -30,19 +30,19 @@
axis2_char_t *path;
};
-AXIS2_EXTERN axis2_url_t * AXIS2_CALL
-axis2_url_create(const axutil_env_t *env,
+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)
{
- axis2_url_t *url = NULL;
+ axutil_url_t *url = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, protocol, NULL);
- url = (axis2_url_t *)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_url_t));
+ url = (axutil_url_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_url_t));
if (!url)
{
@@ -76,8 +76,8 @@
return url;
}
-AXIS2_EXTERN axis2_url_t * AXIS2_CALL
-axis2_url_parse_string(const axutil_env_t *env,
+AXIS2_EXTERN axutil_url_t * AXIS2_CALL
+axutil_url_parse_string(const axutil_env_t *env,
const axis2_char_t *str_url)
{
/**
@@ -88,7 +88,7 @@
* if path is not present / (root) is assumed
*/
axis2_char_t *tmp_url_str = NULL;
- axis2_url_t *ret = NULL;
+ axutil_url_t *ret = NULL;
const axis2_char_t *protocol = NULL;
axis2_char_t *path = NULL;
axis2_char_t *port_str = NULL;
@@ -134,7 +134,7 @@
*/
if (0 == axis2_strcasecmp(protocol, (const axis2_char_t *)"file"))
{
- ret = axis2_url_create(env, protocol, NULL, 0, server);
+ ret = axutil_url_create(env, protocol, NULL, 0, server);
AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
@@ -163,7 +163,7 @@
*params = '\0';
}
/* here we have protocol + server + def port + def path */
- ret = axis2_url_create(env, protocol, server, port, "/");
+ ret = axutil_url_create(env, protocol, server, port, "/");
AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
@@ -176,7 +176,7 @@
*params = '\0';
}
/* here we have protocol + server + def port + path */
- ret = axis2_url_create(env, protocol, server, port, path);
+ ret = axutil_url_create(env, protocol, server, port, path);
AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
@@ -189,7 +189,7 @@
{
port = AXIS2_ATOI(port_str);
/* here we have protocol + server + port + def path */
- ret = axis2_url_create(env, protocol, server, port, "/");
+ ret = axutil_url_create(env, protocol, server, port, "/");
AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
@@ -200,14 +200,14 @@
if (axis2_strlen(path) > 0)
{
/* here we have protocol + server + port + path */
- ret = axis2_url_create(env, protocol, server, port, path);
+ ret = axutil_url_create(env, protocol, server, port, path);
AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
else
{
/* here we have protocol + server + port + def path */
- ret = axis2_url_create(env, protocol, server, port, "/");
+ ret = axutil_url_create(env, protocol, server, port, "/");
AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
@@ -216,7 +216,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_url_free(axis2_url_t *url,
+axutil_url_free(axutil_url_t *url,
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -241,7 +241,7 @@
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_url_to_external_form(axis2_url_t *url,
+axutil_url_to_external_form(axutil_url_t *url,
const axutil_env_t *env)
{
axis2_char_t *external_form = NULL;
@@ -263,7 +263,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_url_set_protocol(axis2_url_t *url,
+axutil_url_set_protocol(axutil_url_t *url,
const axutil_env_t *env,
axis2_char_t *protocol)
{
@@ -280,14 +280,14 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_url_get_protocol(axis2_url_t *url,
+axutil_url_get_protocol(axutil_url_t *url,
const axutil_env_t *env)
{
return url->protocol;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_url_set_server(axis2_url_t *url,
+axutil_url_set_server(axutil_url_t *url,
const axutil_env_t *env,
axis2_char_t *server)
{
@@ -303,14 +303,14 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_url_get_server(axis2_url_t *url,
+axutil_url_get_server(axutil_url_t *url,
const axutil_env_t *env)
{
return url->server;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_url_set_port(axis2_url_t *url,
+axutil_url_set_port(axutil_url_t *url,
const axutil_env_t *env,
int port)
{
@@ -321,14 +321,14 @@
AXIS2_EXTERN int AXIS2_CALL
-axis2_url_get_port(axis2_url_t *url,
+axutil_url_get_port(axutil_url_t *url,
const axutil_env_t *env)
{
return url->port;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_url_set_path(axis2_url_t *url,
+axutil_url_set_path(axutil_url_t *url,
const axutil_env_t *env,
axis2_char_t *path)
{
@@ -344,33 +344,33 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_url_get_path(axis2_url_t *url,
+axutil_url_get_path(axutil_url_t *url,
const axutil_env_t *env)
{
return url->path;
}
-AXIS2_EXTERN axis2_url_t* AXIS2_CALL
-axis2_url_clone(axis2_url_t *url,
+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 axis2_url_create(env, url->protocol,
+ return axutil_url_create(env, url->protocol,
url->server,
url->port,
url->path);
}
-AXIS2_EXTERN axis2_uri_t *AXIS2_CALL
-axis2_url_to_uri(axis2_url_t *url,
+AXIS2_EXTERN axutil_uri_t *AXIS2_CALL
+axutil_url_to_uri(axutil_url_t *url,
const axutil_env_t *env)
{
axis2_char_t *url_str = NULL;
- axis2_uri_t *uri = NULL;
+ axutil_uri_t *uri = NULL;
AXIS2_ENV_CHECK(env, NULL);
- url_str = axis2_url_to_external_form(url, env);
- uri = axis2_uri_parse_string(env, url_str);
+ url_str = axutil_url_to_external_form(url, env);
+ 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?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/utils.c (original)
+++ webservices/axis2/trunk/c/util/src/utils.c Fri Mar 30 12:54:08 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <stdlib.h>
#include <axutil_string.h>
#include <string.h>
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?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/src/uuid_gen.c (original)
+++ webservices/axis2/trunk/c/util/src/uuid_gen.c Fri Mar 30 12:54:08 2007
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_uuid_gen(const axutil_env_t *env)
+axutil_uuid_gen(const axutil_env_t *env)
{
axis2_char_t *str = AXIS2_MALLOC(env->allocator, 40 * sizeof(char));
Modified: webservices/axis2/trunk/c/util/test/util/test_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_thread.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_thread.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_thread.c Fri Mar 30 12:54:08 2007
@@ -22,23 +22,23 @@
#include <axutil_log.h>
#include <axutil_log_default.h>
#include <axutil_allocator.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include "test_thread.h"
#include <unistd.h>
const axutil_env_t *env = NULL;
-static axis2_thread_mutex_t *thread_lock = NULL;
-static axis2_thread_once_t *control = NULL;
+static axutil_thread_mutex_t *thread_lock = NULL;
+static axutil_thread_once_t *control = NULL;
static int x = 0;
static int value = 0;
-static axis2_thread_t *t1 = NULL;
-static axis2_thread_t *t2 = NULL;
+static axutil_thread_t *t1 = NULL;
+static axutil_thread_t *t2 = NULL;
/*for detach tests*/
-static axis2_thread_t *t3 = NULL;
-static axis2_thread_t *t4 = NULL;
+static axutil_thread_t *t3 = NULL;
+static axutil_thread_t *t4 = NULL;
void init_func(void)
{
@@ -51,36 +51,36 @@
allocator = env->allocator;
- control = axis2_thread_once_init(allocator);
+ control = axutil_thread_once_init(allocator);
- if (control) printf("success - thread_init - axis2_thread_once_init \n");
- else printf("failure - thread_init - axis2_thread_once_init \n");
+ if (control) printf("success - thread_init - axutil_thread_once_init \n");
+ else printf("failure - thread_init - axutil_thread_once_init \n");
- thread_lock = axis2_thread_mutex_create(allocator, AXIS2_THREAD_MUTEX_DEFAULT);
+ thread_lock = axutil_thread_mutex_create(allocator, AXIS2_THREAD_MUTEX_DEFAULT);
- if (thread_lock) printf("success - thread_init - axis2_thread_mutex_create \n");
- else printf("failure - thread_init - axis2_thread_mutex_create \n");
+ if (thread_lock) printf("success - thread_init - axutil_thread_mutex_create \n");
+ else printf("failure - thread_init - axutil_thread_mutex_create \n");
}
-void * AXIS2_CALL test_function(axis2_thread_t *td, void *param)
+void * AXIS2_CALL test_function(axutil_thread_t *td, void *param)
{
int i;
i = *((int*)param);
printf("thread data = %d \n", i);
- axis2_thread_once(control, init_func);
+ axutil_thread_once(control, init_func);
- axis2_thread_mutex_lock(thread_lock);
+ axutil_thread_mutex_lock(thread_lock);
printf("x = %d \n", ++x);
- axis2_thread_mutex_unlock(thread_lock);
+ axutil_thread_mutex_unlock(thread_lock);
- axis2_thread_exit(td, env->allocator);
+ axutil_thread_exit(td, env->allocator);
return (void*)1;
}
-void test_axis2_thread_create(const axutil_env_t *env)
+void test_axutil_thread_create(const axutil_env_t *env)
{
axis2_status_t rv = AXIS2_FAILURE;
axutil_allocator_t *allocator = NULL;
@@ -89,76 +89,76 @@
allocator = env->allocator;
i = AXIS2_MALLOC(allocator, sizeof(int));
*i = 5;
- t1 = axis2_thread_create(allocator, NULL, test_function, (void*)i);
+ t1 = axutil_thread_create(allocator, NULL, test_function, (void*)i);
- if (t1) printf("success - test_axis2_thread_create - axis2_thread_create \n");
- else printf("failure - test_axis2_thread_create - axis2_thread_create \n");
+ if (t1) printf("success - test_axutil_thread_create - axutil_thread_create \n");
+ else printf("failure - test_axutil_thread_create - axutil_thread_create \n");
j = AXIS2_MALLOC(allocator, sizeof(int));
*j = 25;
- t2 = axis2_thread_create(allocator, NULL, test_function, (void*)j);
+ t2 = axutil_thread_create(allocator, NULL, test_function, (void*)j);
- if (t2) printf("success - test_axis2_thread_create - axis2_thread_create \n");
- else printf("failure - test_axis2_thread_create - axis2_thread_create \n");
+ if (t2) printf("success - test_axutil_thread_create - axutil_thread_create \n");
+ else printf("failure - test_axutil_thread_create - axutil_thread_create \n");
- rv = axis2_thread_join(t1);
+ rv = axutil_thread_join(t1);
- if (AXIS2_SUCCESS == rv) printf("success - test_axis2_thread_create - axis2_thread_join \n");
- else printf("failure - thread_init - test_axis2_thread_create - axis2_thread_join \n");
+ if (AXIS2_SUCCESS == rv) printf("success - test_axutil_thread_create - axutil_thread_join \n");
+ else printf("failure - thread_init - test_axutil_thread_create - axutil_thread_join \n");
- rv = axis2_thread_join(t2);
+ rv = axutil_thread_join(t2);
- if (AXIS2_SUCCESS == rv) printf("success - test_axis2_thread_create - axis2_thread_join \n");
- else printf("failure - thread_init - test_axis2_thread_create - axis2_thread_join \n");
+ if (AXIS2_SUCCESS == rv) printf("success - test_axutil_thread_create - axutil_thread_join \n");
+ else printf("failure - thread_init - test_axutil_thread_create - axutil_thread_join \n");
}
-void * AXIS2_CALL test_function2(axis2_thread_t *td, void *param)
+void * AXIS2_CALL test_function2(axutil_thread_t *td, void *param)
{
printf("thread \n");
- axis2_thread_exit(td, env->allocator);
+ axutil_thread_exit(td, env->allocator);
return (void*)1;
}
-void test_axis2_thread_detach(const axutil_env_t *env)
+void test_axutil_thread_detach(const axutil_env_t *env)
{
- axis2_threadattr_t *attr = NULL;
+ axutil_threadattr_t *attr = NULL;
axutil_allocator_t *allocator = NULL;
axis2_status_t rv = AXIS2_FAILURE;
allocator = env->allocator;
- attr = axis2_threadattr_create(allocator);
+ attr = axutil_threadattr_create(allocator);
if (!attr)
{
- printf("failure - test_axis2_thread_detach\n");
+ printf("failure - test_axutil_thread_detach\n");
return;
}
- rv = axis2_threadattr_detach_set(attr, 1);
+ rv = axutil_threadattr_detach_set(attr, 1);
if (AXIS2_SUCCESS != rv)
{
- printf("failure - test_axis2_thread_detach\n");
+ printf("failure - test_axutil_thread_detach\n");
return;
}
- t3 = axis2_thread_create(allocator, attr, test_function2, NULL);
+ t3 = axutil_thread_create(allocator, attr, test_function2, NULL);
if (!t3)
{
- printf("failure - test_axis2_thread_detach\n");
+ printf("failure - test_axutil_thread_detach\n");
return;
}
/*
* thread is already detached - should return AXIS2_FAILURE
*/
- rv = axis2_thread_detach(t3);
+ rv = axutil_thread_detach(t3);
if (AXIS2_FAILURE != rv)
{
- printf("failure - test_axis2_thread_detach\n");
+ printf("failure - test_axutil_thread_detach\n");
return;
}
@@ -166,45 +166,45 @@
* thread is already detached - should return AXIS2_FAILURE
* cannot join detached threads
*/
- rv = axis2_thread_join(t3);
+ rv = axutil_thread_join(t3);
if (AXIS2_FAILURE != rv)
{
- printf("failure - test_axis2_thread_detach\n");
+ printf("failure - test_axutil_thread_detach\n");
return;
}
- printf("success - test_axis2_thread_detach\n");
+ printf("success - test_axutil_thread_detach\n");
}
-void test_axis2_thread_detach2(const axutil_env_t *env)
+void test_axutil_thread_detach2(const axutil_env_t *env)
{
- axis2_threadattr_t *attr = NULL;
+ axutil_threadattr_t *attr = NULL;
axutil_allocator_t *allocator = NULL;
axis2_status_t rv = AXIS2_FAILURE;
allocator = env->allocator;
- attr = axis2_threadattr_create(allocator);
+ attr = axutil_threadattr_create(allocator);
if (!attr)
{
- printf("failure - test_axis2_thread_detach2\n");
+ printf("failure - test_axutil_thread_detach2\n");
return;
}
- t4 = axis2_thread_create(allocator, attr, test_function2, NULL);
+ t4 = axutil_thread_create(allocator, attr, test_function2, NULL);
if (!t4)
{
- printf("failure - test_axis2_thread_detach2\n");
+ printf("failure - test_axutil_thread_detach2\n");
return;
}
/*
* thread is not detached yet - should return AXIS2_SUCCESS
*/
- rv = axis2_thread_detach(t4);
+ rv = axutil_thread_detach(t4);
if (AXIS2_SUCCESS != rv)
{
- printf("failure - test_axis2_thread_detach\n");
+ printf("failure - test_axutil_thread_detach\n");
return;
}
@@ -212,13 +212,13 @@
* thread is already detached - should return AXIS2_FAILURE
* cannot join detached threads
*/
- rv = axis2_thread_join(t4);
+ rv = axutil_thread_join(t4);
if (AXIS2_FAILURE != rv)
{
- printf("failure - test_axis2_thread_detach2\n");
+ printf("failure - test_axutil_thread_detach2\n");
return;
}
- printf("success - test_axis2_thread_detach2\n");
+ printf("success - test_axutil_thread_detach2\n");
}
void check_locks()
@@ -237,11 +237,11 @@
void run_test_thread(const axutil_env_t *env)
{
thread_init(env);
- test_axis2_thread_create(env);
+ test_axutil_thread_create(env);
check_locks();
check_thread_once();
- test_axis2_thread_detach(env);
- test_axis2_thread_detach2(env);
+ test_axutil_thread_detach(env);
+ test_axutil_thread_detach2(env);
#if defined (WIN32)
Sleep(1000);/*to give time for detached threads to execute*/
@@ -249,7 +249,7 @@
sleep(1);
#endif
- axis2_thread_mutex_destroy(thread_lock);
+ axutil_thread_mutex_destroy(thread_lock);
}
const axutil_env_t *create_env_with_error_log()
Modified: webservices/axis2/trunk/c/util/test/util/test_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_thread.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_thread.h (original)
+++ webservices/axis2/trunk/c/util/test/util/test_thread.h Fri Mar 30 12:54:08 2007
@@ -19,16 +19,16 @@
#define TEST_LOG_H
#include <axutil_env.h>
-#include <axis2_thread.h>
+#include <axutil_thread.h>
void init_func(void);
void thread_init(const axutil_env_t *env);
-void * AXIS2_CALL test_function(axis2_thread_t *td,void *param);
-void test_axis2_thread_create(const axutil_env_t *env);
-void * AXIS2_CALL test_function2(axis2_thread_t *td,void *param);
-void test_axis2_thread_detach(const axutil_env_t *env);
-void test_axis2_thread_detach2(const axutil_env_t *env);
+void * AXIS2_CALL test_function(axutil_thread_t *td,void *param);
+void test_axutil_thread_create(const axutil_env_t *env);
+void * AXIS2_CALL test_function2(axutil_thread_t *td,void *param);
+void test_axutil_thread_detach(const axutil_env_t *env);
+void test_axutil_thread_detach2(const axutil_env_t *env);
void check_locks();
/*call this method from main*/
void run_test_thread(const axutil_env_t *env);
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=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Fri Mar 30 12:54:08 2007
@@ -21,7 +21,7 @@
#include <axutil_error_default.h>
#include <axutil_array_list.h>
#include <platforms/axis2_platform_auto_sense.h>
-#include <axis2_uuid_gen.h>
+#include <axutil_uuid_gen.h>
#include <axutil_log_default.h>
#include <axutil_log.h>
#include <axutil_dir_handler.h>
@@ -204,10 +204,10 @@
{
char *uuid = NULL;
printf("starting uuid_gen test...\n");
- uuid = axis2_uuid_gen(env);
+ uuid = axutil_uuid_gen(env);
printf("Generated UUID 1:%s\n", uuid);
AXIS2_FREE(env->allocator, uuid);
- uuid = axis2_uuid_gen(env);
+ uuid = axutil_uuid_gen(env);
printf("Generated UUID 2:%s\n", uuid);
AXIS2_FREE(env->allocator, uuid);
printf("finished uuid_gen test...\n");
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=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h Fri Mar 30 12:54:08 2007
@@ -29,10 +29,10 @@
#include <axutil_env.h>
#include <axutil_error.h>
#include <axutil_string.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
#include <axutil_hash.h>
#include <axutil_qname.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
#include <axutil_array_list.h>
#include <woden.h>
@@ -98,13 +98,13 @@
get_ext_attrs_for_namespace) (
void *extensible,
const axutil_env_t *env,
- axis2_uri_t *namespc);
+ axutil_uri_t *namespc);
axis2_bool_t (AXIS2_CALL *
has_ext_attrs_for_namespace) (
void *extensible,
const axutil_env_t *env,
- axis2_uri_t *namespc);
+ axutil_uri_t *namespc);
};
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org