You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/03/22 04:27:21 UTC
svn commit: r387697 - in /webservices/axis2/trunk/c:
include/axis2_msg_recv.h modules/core/deployment/dep_engine.c
modules/core/engine/engine.c modules/core/receivers/msg_recv.c
modules/util/log.c
Author: samisa
Date: Tue Mar 21 19:27:18 2006
New Revision: 387697
URL: http://svn.apache.org/viewcvs?rev=387697&view=rev
Log:
Some fixes to eliminate compiler warinings. There were some bugs fixed as well.
Modified:
webservices/axis2/trunk/c/include/axis2_msg_recv.h
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
webservices/axis2/trunk/c/modules/util/log.c
Modified: webservices/axis2/trunk/c/include/axis2_msg_recv.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_msg_recv.h?rev=387697&r1=387696&r2=387697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_recv.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_recv.h Tue Mar 21 19:27:18 2006
@@ -75,8 +75,8 @@
axis2_status_t (AXIS2_CALL *
receive) (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
- struct axis2_msg_ctx *in_msg_ctx);
-
+ struct axis2_msg_ctx *in_msg_ctx,
+ void *callback_recv_param);
/**
* This contain synchronous receiving logic.
* @param in_msg_ctx
@@ -221,8 +221,8 @@
#define AXIS2_MSG_RECV_FREE(msg_recv, env) ((msg_recv)->ops->free (msg_recv, env))
-#define AXIS2_MSG_RECV_RECEIVE(msg_recv, env, msg_ctx) \
- ((msg_recv)->ops->receive (msg_recv, env, msg_ctx))
+#define AXIS2_MSG_RECV_RECEIVE(msg_recv, env, msg_ctx, callback_recv_param) \
+ ((msg_recv)->ops->receive (msg_recv, env, msg_ctx, callback_recv_param))
#define AXIS2_MSG_RECV_RECEIVE_SYNC(msg_recv, env, msg_ctx) \
((msg_recv)->ops->receive_sync (msg_recv, env, msg_ctx))
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=387697&r1=387696&r2=387697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Tue Mar 21 19:27:18 2006
@@ -172,10 +172,6 @@
axis2_dep_engine_validate_system_predefined_phases(axis2_dep_engine_t *dep_engine,
axis2_env_t **env);
-static axis2_conf_t *
-axis2_dep_engine_create_conf(axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
-
static axis2_status_t
axis2_dep_engine_add_new_svc(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
@@ -1045,15 +1041,6 @@
*/
return AXIS2_SUCCESS;
}
-
-static axis2_conf_t *
-axis2_dep_engine_create_conf(axis2_dep_engine_t *dep_engine,
- axis2_env_t **env)
-{
- AXIS2_ENV_CHECK(env, NULL);
- return axis2_conf_create(env);
-}
-
static axis2_status_t
axis2_dep_engine_add_new_svc(axis2_dep_engine_t *dep_engine,
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=387697&r1=387696&r2=387697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Tue Mar 21 19:27:18 2006
@@ -325,7 +325,7 @@
AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Message receiver not set in operation description");
return AXIS2_FAILURE;
}
- AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx);
+ AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx, NULL);
}
AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Axis2 engine receive successful");
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?rev=387697&r1=387696&r2=387697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Tue Mar 21 19:27:18 2006
@@ -45,7 +45,8 @@
axis2_status_t AXIS2_CALL
axis2_msg_recv_receive (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
- struct axis2_msg_ctx *in_msg_ctx);
+ struct axis2_msg_ctx *in_msg_ctx,
+ void *callback_recv_param);
axis2_status_t AXIS2_CALL
axis2_raw_xml_in_out_msg_recv_receive_sync(axis2_msg_recv_t *msg_recv,
@@ -163,7 +164,8 @@
axis2_status_t AXIS2_CALL
axis2_msg_recv_receive (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
- axis2_msg_ctx_t *in_msg_ctx)
+ axis2_msg_ctx_t *in_msg_ctx,
+ void *callback_recv_param)
{
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/util/log.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/log.c?rev=387697&r1=387696&r2=387697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/log.c (original)
+++ webservices/axis2/trunk/c/modules/util/log.c Tue Mar 21 19:27:18 2006
@@ -13,13 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <platforms/axis2_platform_auto_sense.h>
#include <axis2_log_default.h>
#include <axis2_file_handler.h>
#include <axis2_thread.h>
-#include <stdio.h>
typedef struct axis2_log_impl axis2_log_impl_t;