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 na...@apache.org on 2006/11/30 07:38:38 UTC
svn commit: r480855 - in /webservices/axis2/trunk/c/tools/tcpmon:
include/tcpmon_entry.h include/tcpmon_session.h include/tcpmon_util.h
src/entry.c src/session.c src/tcpmon_entry_local.h src/util.c
Author: nandika
Date: Wed Nov 29 22:38:37 2006
New Revision: 480855
URL: http://svn.apache.org/viewvc?view=rev&rev=480855
Log:
tcpmon compilation errors fixed for windows
Modified:
webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_entry.h
webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h
webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h
webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
webservices/axis2/trunk/c/tools/tcpmon/src/session.c
webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h
webservices/axis2/trunk/c/tools/tcpmon/src/util.c
Modified: webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_entry.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_entry.h?view=diff&rev=480855&r1=480854&r2=480855
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_entry.h (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_entry.h Wed Nov 29 22:38:37 2006
@@ -135,7 +135,7 @@
* @param env double pointer to environment struct. MUST NOT be NULL
* @return pointer to newly created tcpmon_entry struct
*/
-AXIS2_EXTERN tcpmon_entry_t * AXIS2_CALL
+tcpmon_entry_t * AXIS2_CALL
tcpmon_entry_create(const axis2_env_t *env );
/*************************** Function macros **********************************/
Modified: webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h?view=diff&rev=480855&r1=480854&r2=480855
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_session.h Wed Nov 29 22:38:37 2006
@@ -191,7 +191,7 @@
* @param env double pointer to environment struct. MUST NOT be NULL
* @return pointer to newly created tcpmon_session struct
*/
-AXIS2_EXTERN tcpmon_session_t * AXIS2_CALL
+tcpmon_session_t * AXIS2_CALL
tcpmon_session_create(const axis2_env_t *env );
/*************************** Function macros **********************************/
Modified: webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h?view=diff&rev=480855&r1=480854&r2=480855
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/include/tcpmon_util.h Wed Nov 29 22:38:37 2006
@@ -41,7 +41,7 @@
* @param env pointer to environment struct. MUST NOT be NULL.
* @param data to be formatted
*/
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+axis2_char_t* AXIS2_CALL
tcpmon_util_format_as_xml (const axis2_env_t *env, axis2_char_t *data);
/** @} */
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/entry.c?view=diff&rev=480855&r1=480854&r2=480855
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/entry.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/entry.c Wed Nov 29 22:38:37 2006
@@ -22,8 +22,8 @@
#include <axis2_stream.h>
#include <time.h>
-#include <tcpmon_entry_local.h>
-#include <tcpmon_session_local.h>
+#include "tcpmon_entry_local.h"
+#include "tcpmon_session_local.h"
#define AXIS2_TCPMON
/**
@@ -104,7 +104,7 @@
char *buffer);
/************************** End of function prototypes ************************/
-AXIS2_EXTERN tcpmon_entry_t * AXIS2_CALL
+tcpmon_entry_t * AXIS2_CALL
tcpmon_entry_create(const axis2_env_t *env)
{
tcpmon_entry_impl_t *entry_impl = NULL;
@@ -221,7 +221,7 @@
{
tcpmon_entry_impl_t *entry_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
entry_impl = AXIS2_INTF_TO_IMPL(entry);
@@ -234,7 +234,7 @@
{
tcpmon_entry_impl_t *entry_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
entry_impl = AXIS2_INTF_TO_IMPL(entry);
@@ -247,7 +247,7 @@
{
tcpmon_entry_impl_t *entry_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
entry_impl = AXIS2_INTF_TO_IMPL(entry);
@@ -260,7 +260,7 @@
{
tcpmon_entry_impl_t *entry_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
entry_impl = AXIS2_INTF_TO_IMPL(entry);
@@ -273,7 +273,7 @@
{
tcpmon_entry_impl_t *entry_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
entry_impl = AXIS2_INTF_TO_IMPL(entry);
@@ -286,7 +286,7 @@
{
tcpmon_entry_impl_t *entry_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
entry_impl = AXIS2_INTF_TO_IMPL(entry);
@@ -299,7 +299,7 @@
{
tcpmon_entry_impl_t *entry_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
entry_impl = AXIS2_INTF_TO_IMPL(entry);
@@ -322,7 +322,7 @@
/** implimentations for protected methods */
/** executes as new entry arises */
-void* tcpmon_entry_new_entry_funct(axis2_thread_t *thd, void* data)
+void* AXIS2_CALL tcpmon_entry_new_entry_funct(axis2_thread_t *thd, void* data)
{
tcpmon_entry_request_data_t* req_data = data;
const axis2_env_t* env = NULL;
@@ -346,6 +346,8 @@
int target_port = 0;
axis2_char_t* target_host = NULL;
int test_bit = 0;
+ tcpmon_entry_t* entry = NULL;
+ tcpmon_entry_impl_t* entry_impl = NULL;
env = req_data -> env;
client_socket = req_data-> socket;
@@ -355,8 +357,7 @@
on_new_entry =
tcpmon_session_get_on_new_entry(session, env);
- tcpmon_entry_t* entry = NULL;
- tcpmon_entry_impl_t* entry_impl = NULL;
+
entry = tcpmon_entry_create(env);
entry_impl = AXIS2_INTF_TO_IMPL(entry);
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/session.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/session.c?view=diff&rev=480855&r1=480854&r2=480855
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/session.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/session.c Wed Nov 29 22:38:37 2006
@@ -23,8 +23,8 @@
#include <axis2_network_handler.h>
#include <axis2_array_list.h>
-#include <tcpmon_session_local.h>
-#include <tcpmon_entry_local.h>
+#include "tcpmon_session_local.h"
+#include "tcpmon_entry_local.h"
/**
* @brief
@@ -121,7 +121,7 @@
/************************** End of function prototypes ************************/
-AXIS2_EXTERN tcpmon_session_t * AXIS2_CALL
+tcpmon_session_t * AXIS2_CALL
tcpmon_session_create(const axis2_env_t *env)
{
tcpmon_session_impl_t *session_impl = NULL;
@@ -513,7 +513,7 @@
{
tcpmon_session_impl_t *session_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
session_impl = AXIS2_INTF_TO_IMPL(session);
@@ -526,7 +526,7 @@
{
tcpmon_session_impl_t *session_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
session_impl = AXIS2_INTF_TO_IMPL(session);
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h?view=diff&rev=480855&r1=480854&r2=480855
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon_entry_local.h Wed Nov 29 22:38:37 2006
@@ -1,6 +1,6 @@
#include <axis2_env.h>
-#include <tcpmon_entry.h>
-#include <tcpmon_session_local.h>
+#include "tcpmon_entry.h"
+#include "tcpmon_session_local.h"
typedef struct tcpmon_entry_request_data
{
@@ -9,5 +9,5 @@
tcpmon_session_t* session;
} tcpmon_entry_request_data_t;
-void* tcpmon_entry_new_entry_funct(axis2_thread_t *thd, void* data);
+void* AXIS2_CALL tcpmon_entry_new_entry_funct(axis2_thread_t *thd, void* data);
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/util.c?view=diff&rev=480855&r1=480854&r2=480855
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/util.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/util.c Wed Nov 29 22:38:37 2006
@@ -19,7 +19,7 @@
axis2_char_t c,
int turns);
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+axis2_char_t* AXIS2_CALL
tcpmon_util_format_as_xml(const axis2_env_t* env, axis2_char_t* data)
{
return data;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org