Author: nandika
Date: Thu Sep 13 04:58:48 2007
New Revision: 575277
URL: http://svn.apache.org/viewvc?rev=575277&view=rev
Log:
compile errors fixed
Modified:
webservices/savan/trunk/c/include/savan_db_mgr.h
webservices/savan/trunk/c/include/savan_util.h
webservices/savan/trunk/c/src/core/mod_savan.c
webservices/savan/trunk/c/src/core/savan_sub_processor.c
webservices/savan/trunk/c/src/util/db_mgr.c
Modified: webservices/savan/trunk/c/include/savan_db_mgr.h
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_db_mgr.h?rev=575277&r1=575276&r2=575277&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_db_mgr.h (original)
+++ webservices/savan/trunk/c/include/savan_db_mgr.h Thu Sep 13 04:58:48 2007
@@ -70,14 +70,14 @@
char **argv,
char **col_name);
-int AXIS2_CALL
+int
savan_db_mgr_subs_find_callback(
void *not_used,
int argc,
char **argv,
char **col_name);
-int AXIS2_CALL
+int
savan_db_mgr_subs_retrieve_callback(
void *not_used,
int argc,
@@ -109,7 +109,7 @@
const axutil_env_t *env,
axis2_char_t *sql_stmt_update);
-axutil_array_list_t *AXIS2_CALL
+axutil_array_list_t * AXIS2_CALL
savan_db_mgr_retrieve_all(
savan_db_mgr_t *db_mgr,
const axutil_env_t *env,
Modified: webservices/savan/trunk/c/include/savan_util.h
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_util.h?rev=575277&r1=575276&r2=575277&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_util.h (original)
+++ webservices/savan/trunk/c/include/savan_util.h Thu Sep 13 04:58:48 2007
@@ -53,13 +53,13 @@
*/
axis2_status_t AXIS2_CALL
- savan_create_fault_envelope(
- axis2_msg_ctx_t *msg_ctx,
- const axutil_env_t *env,
- axis2_char_t *code,
- axis2_char_t *subcode,
- axis2_char_t *reason,
- axis2_char_t *detail);
+ savan_util_create_fault_envelope(
+ axis2_msg_ctx_t *msg_ctx,
+ const axutil_env_t *env,
+ axis2_char_t *code,
+ axis2_char_t *subcode,
+ axis2_char_t *reason,
+ axis2_char_t *detail);
/**
* Build a savan fault message and send.
Modified: webservices/savan/trunk/c/src/core/mod_savan.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/core/mod_savan.c?rev=575277&r1=575276&r2=575277&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/core/mod_savan.c (original)
+++ webservices/savan/trunk/c/src/core/mod_savan.c Thu Sep 13 04:58:48 2007
@@ -71,6 +71,7 @@
sqlite3 *dbconn = NULL;
axis2_char_t *sql_stmt1 = NULL;
axis2_char_t *sql_stmt2 = NULL;
+ savan_db_mgr_t *db_mgr = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN] Start:mod_savan_init");
sql_stmt1 = "create table if not exists topic(topic_name varchar(100) "\
"primary key, topic_url varchar(200))";
@@ -79,7 +80,7 @@
"delivery_mode varchar(100), expires varchar(100), "\
"filter varchar(200), topic_name varchar(100), "\
"renewed boolean)";
- savan_db_mgr_t *db_mgr = savan_db_mgr_create(env, conf_ctx);
+ db_mgr = savan_db_mgr_create(env, conf_ctx);
dbconn = savan_db_mgr_get_dbconn(db_mgr, env);
rc = sqlite3_exec(dbconn, sql_stmt1, NULL, 0, &error_msg);
if( rc != SQLITE_OK )
Modified: webservices/savan/trunk/c/src/core/savan_sub_processor.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/core/savan_sub_processor.c?rev=575277&r1=575276&r2=575277&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/core/savan_sub_processor.c (original)
+++ webservices/savan/trunk/c/src/core/savan_sub_processor.c Thu Sep 13
04:58:48 2007
@@ -474,33 +474,6 @@
/******************************************************************************/
-axis2_bool_t AXIS2_CALL
-savan_sub_processor_validate_subscription(
- savan_subscriber_t *subscriber,
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
-{
- if(savan_sub_processor_validate_delivery_mode(subscriber,
- env, msg_ctx) == AXIS2_FAILURE)
- {
- return AXIS2_FAILURE;
- }
-
- if(savan_sub_processor_validate_expiration_time(subscriber,
- env, msg_ctx) == AXIS2_FAILURE)
- {
- return AXIS2_FAILURE;
- }
- if(savan_sub_processor_validate_filter(subscriber,
- env, msg_ctx) == AXIS2_FAILURE)
- {
- return AXIS2_FAILURE;
- }
-
- return AXIS2_SUCCESS;
-}
-
-/******************************************************************************/
axis2_bool_t AXIS2_CALL
savan_sub_processor_validate_delivery_mode(
@@ -601,3 +574,33 @@
return AXIS2_FAILURE;
}
}
+
+/****************************************************************************/
+
+axis2_bool_t AXIS2_CALL
+savan_sub_processor_validate_subscription(
+ savan_subscriber_t *subscriber,
+ const axutil_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
+{
+ if(savan_sub_processor_validate_delivery_mode(subscriber,
+ env, msg_ctx) == AXIS2_FAILURE)
+ {
+ return AXIS2_FAILURE;
+ }
+
+ if(savan_sub_processor_validate_expiration_time(subscriber,
+ env, msg_ctx) == AXIS2_FAILURE)
+ {
+ return AXIS2_FAILURE;
+ }
+ if(savan_sub_processor_validate_filter(subscriber,
+ env, msg_ctx) == AXIS2_FAILURE)
+ {
+ return AXIS2_FAILURE;
+ }
+
+ return AXIS2_SUCCESS;
+}
+
+/******************************************************************************/
Modified: webservices/savan/trunk/c/src/util/db_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/db_mgr.c?rev=575277&r1=575276&r2=575277&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/db_mgr.c (original)
+++ webservices/savan/trunk/c/src/util/db_mgr.c Thu Sep 13 04:58:48 2007
@@ -44,6 +44,16 @@
*
*/
+int
+savan_db_mgr_busy_handler(
+ sqlite3* dbconn,
+ char *sql_stmt,
+ int (*callback_func)(void *, int, char **, char **),
+ void *args,
+ char **error_msg,
+ int rc);
+
+
AXIS2_EXTERN savan_db_mgr_t * AXIS2_CALL
savan_db_mgr_create(
const axutil_env_t *env,
@@ -104,7 +114,7 @@
}
return 0;
}
-int AXIS2_CALL
+int
savan_db_mgr_subs_find_callback(
void *not_used,
int argc,
@@ -175,7 +185,7 @@
return 0;
}
-int AXIS2_CALL
+int
savan_db_mgr_subs_retrieve_callback(
void *not_used,
int argc,
@@ -183,11 +193,14 @@
char **col_name)
{
int i = 0;
- savan_db_mgr_args_t *args = (savan_db_mgr_args_t *) not_used;
- const axutil_env_t *env = args->env;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ savan_subscriber_t *subscriber = NULL;
+ const axutil_env_t *env = NULL;
+ savan_db_mgr_args_t *args = (savan_db_mgr_args_t *) not_used;
+ env = args->env;
+
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[SAVAN] Start:savan_db_mgr_subs_retrieve_callback");
- savan_subscriber_t *subscriber = (savan_subscriber_t *) args->data;
+ subscriber = (savan_subscriber_t *) args->data;
if(argc < 1)
{
args->data = NULL;
@@ -459,7 +472,7 @@
return subscriber;
}
-axutil_array_list_t *AXIS2_CALL
+axutil_array_list_t * AXIS2_CALL
savan_db_mgr_retrieve_all(
savan_db_mgr_t *db_mgr,
const axutil_env_t *env,
