Author: damitha
Date: Tue Oct 14 00:57:14 2008
New Revision: 704368
URL: http://svn.apache.org/viewvc?rev=704368&view=rev
Log:
code formatting
Modified:
webservices/savan/trunk/c/include/savan_constants.h
webservices/savan/trunk/c/src/client/savan_publishing_client.c
webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c
webservices/savan/trunk/c/src/subscribers/savan_subscriber.c
webservices/savan/trunk/c/src/util/savan_util.c
Modified: webservices/savan/trunk/c/include/savan_constants.h
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_constants.h?rev=704368&r1=704367&r2=704368&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_constants.h (original)
+++ webservices/savan/trunk/c/include/savan_constants.h Tue Oct 14 00:57:14 2008
@@ -124,6 +124,9 @@
#define SAVAN_TOPIC_LIST "savan_topic_list"
#define SAVAN_DB "savan_db"
#define SAVAN_MODULE "savan"
+#define SAVAN_TOPIC_URL "TopicURL"
+#define SAVAN_SUBSCRIPTION_MGR_URL "SubscriptionMgrURL"
+#define SAVAN_SVC_CLIENT "svc_client"
#define SAVAN_FILTER_TEMPLATE_PATH "savan_filter_template_path"
/** @} */
Modified: webservices/savan/trunk/c/src/client/savan_publishing_client.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/client/savan_publishing_client.c?rev=704368&r1=704367&r2=704368&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/client/savan_publishing_client.c (original)
+++ webservices/savan/trunk/c/src/client/savan_publishing_client.c Tue Oct 14
00:57:14 2008
@@ -37,11 +37,6 @@
axis2_svc_t *svc;
};
-/******************************************************************************/
-
-
-/******************************************************************************/
-
AXIS2_EXTERN savan_publishing_client_t * AXIS2_CALL
savan_publishing_client_create(
const axutil_env_t *env,
@@ -50,8 +45,6 @@
{
savan_publishing_client_t *client = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
client = AXIS2_MALLOC(env->allocator, sizeof(savan_publishing_client_t));
if (!client)
@@ -66,8 +59,6 @@
return client;
}
-/******************************************************************************/
-
AXIS2_EXTERN void AXIS2_CALL
savan_publishing_client_free(
savan_publishing_client_t *client,
@@ -97,18 +88,19 @@
conf = client->conf;
pubs_svc = client->svc;
- topic_param = axis2_svc_get_param(pubs_svc, env, "TopicURL");
+ topic_param = axis2_svc_get_param(pubs_svc, env, SAVAN_TOPIC_URL);
if (!topic_param)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] TopicURL param not
available");
return AXIS2_SUCCESS;
}
+
topic_url = axutil_param_get_value(topic_param, env);
- qname = axutil_qname_create(env, "savan", NULL, NULL);
+ qname = axutil_qname_create(env, SAVAN_MODULE, NULL, NULL);
module_desc = axis2_conf_get_module(conf, env, qname);
- param = axis2_module_desc_get_param(module_desc, env,
"SubscriptionMgrURL");
+ param = axis2_module_desc_get_param(module_desc, env,
SAVAN_SUBSCRIPTION_MGR_URL);
axutil_qname_free(qname, env);
if(param)
@@ -119,7 +111,7 @@
axutil_param_t *svc_client_param = NULL;
subs_mgr_url = axutil_param_get_value(param, env);
- svc_client_param = axis2_svc_get_param(pubs_svc, env, "svc_client");
+ svc_client_param = axis2_svc_get_param(pubs_svc, env,
SAVAN_SVC_CLIENT);
if(svc_client_param)
{
svc_client = axutil_param_get_value(svc_client_param, env);
@@ -127,16 +119,13 @@
if(!svc_client)
{
- svc_client =
- (axis2_svc_client_t *) savan_util_get_svc_client(env);
- svc_client_param = axutil_param_create(env, "svc_client",
- svc_client);
+ svc_client = (axis2_svc_client_t *) savan_util_get_svc_client(env);
+ svc_client_param = axutil_param_create(env, SAVAN_SVC_CLIENT,
svc_client);
axis2_svc_add_param(pubs_svc, env, svc_client_param);
}
- subs_store =
- savan_util_get_subscriber_list_from_remote_subs_mgr(env,
- topic_url, subs_mgr_url, svc_client);
+ subs_store = savan_util_get_subscriber_list_from_remote_subs_mgr(env,
topic_url,
+ subs_mgr_url, svc_client);
}
else
{
@@ -169,16 +158,14 @@
{
axis2_char_t *filter_template_path = NULL;
axis2_char_t *id = savan_subscriber_get_id(sub, env);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Publishing to %s", id);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Publishing to
%s", id);
filter_template_path = savan_util_get_module_param(env, conf,
SAVAN_FILTER_TEMPLATE_PATH);
savan_subscriber_set_filter_template_path(sub, env,
filter_template_path);
if(!savan_subscriber_publish(sub, env, payload))
{
- axis2_endpoint_ref_t *notifyto =
- savan_subscriber_get_notify_to(sub, env);
+ axis2_endpoint_ref_t *notifyto =
savan_subscriber_get_notify_to(sub, env);
const axis2_char_t *address = NULL;
if(notifyto)
Modified: webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c?rev=704368&r1=704367&r2=704368&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/savan/trunk/c/src/msgreceivers/savan_msg_recv.c Tue Oct 14
00:57:14 2008
@@ -225,7 +225,7 @@
module_desc = axis2_conf_get_module(conf, env, qname);
axutil_qname_free(qname, env);
subs_mgr_url_param = axis2_module_desc_get_param(module_desc, env,
- "SubscriptionMgrURL");
+ SAVAN_SUBSCRIPTION_MGR_URL);
if(subs_mgr_url_param)
{
submgr_addr = axutil_param_get_value(subs_mgr_url_param, env);
Modified: webservices/savan/trunk/c/src/subscribers/savan_subscriber.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subscribers/savan_subscriber.c?rev=704368&r1=704367&r2=704368&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subscribers/savan_subscriber.c (original)
+++ webservices/savan/trunk/c/src/subscribers/savan_subscriber.c Tue Oct 14
00:57:14 2008
@@ -45,8 +45,6 @@
#endif
};
-/*****************************************************************************/
-
AXIS2_EXTERN savan_subscriber_t * AXIS2_CALL
savan_subscriber_create(
const axutil_env_t *env)
@@ -93,28 +91,51 @@
const axutil_env_t *env)
{
if(subscriber->id)
+ {
AXIS2_FREE(env->allocator, subscriber->id);
+ }
+
if(subscriber->delivery_mode)
+ {
AXIS2_FREE(env->allocator, subscriber->delivery_mode);
+ }
+
if(subscriber->expires)
+ {
AXIS2_FREE(env->allocator, subscriber->expires);
+ }
+
if(subscriber->filter)
+ {
AXIS2_FREE(env->allocator, subscriber->filter);
+ }
+
if(subscriber->topic)
+ {
AXIS2_FREE(env->allocator, subscriber->topic);
+ }
+
#ifdef SAVAN_FILTERING
if(subscriber->xslt_filter)
+ {
AXIS2_FREE(env->allocator, subscriber->xslt_filter);
+ }
+
if(subscriber->filter_template_path)
+ {
AXIS2_FREE(env->allocator, subscriber->filter_template_path);
+ }
+
#endif
+
if(subscriber->filter_dialect)
+ {
AXIS2_FREE(env->allocator, subscriber->filter_dialect);
+ }
+
AXIS2_FREE(env->allocator, subscriber);
}
-/******************************************************************************/
-
void* AXIS2_CALL
savan_subscriber_get_filter_template(
savan_subscriber_t *subscriber,
@@ -127,21 +148,19 @@
#endif
}
-/******************************************************************************/
-
axis2_status_t AXIS2_CALL
savan_subscriber_set_filter_template(
savan_subscriber_t *subscriber,
const axutil_env_t *env,
void *xslt_filter_template)
{
- if (subscriber->filter == NULL)
+ if (!subscriber->filter)
{
return AXIS2_SUCCESS;
}
#ifdef SAVAN_FILTERING
- if (subscriber->xslt_filter != NULL)
+ if (subscriber->xslt_filter)
{
AXIS2_FREE(env->allocator, subscriber->filter);
subscriber->xslt_filter = NULL;
@@ -178,9 +197,6 @@
#endif
}
-
-/******************************************************************************/
-
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
savan_subscriber_get_id(
savan_subscriber_t *subscriber,
@@ -189,8 +205,6 @@
return subscriber->id;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_subscriber_set_id(
savan_subscriber_t *subscriber,
@@ -198,7 +212,7 @@
const axis2_char_t *id)
{
/* If id is already set, free it */
- if (subscriber->id != NULL)
+ if (subscriber->id)
{
AXIS2_FREE(env->allocator, subscriber->id);
subscriber->id = NULL;
@@ -210,15 +224,13 @@
return AXIS2_SUCCESS;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_subscriber_set_filter_dialect
(savan_subscriber_t *subscriber,
const axutil_env_t *env,
const axis2_char_t *filter_dialect)
{
- if(subscriber->filter_dialect != NULL)
+ if(subscriber->filter_dialect)
{
AXIS2_FREE(env->allocator, subscriber->filter_dialect);
subscriber->filter_dialect = NULL;
@@ -228,8 +240,6 @@
return AXIS2_SUCCESS;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
savan_subscriber_get_filter_dialect(
savan_subscriber_t *subscriber,
@@ -238,8 +248,6 @@
return subscriber->filter_dialect;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_subscriber_set_end_to(
savan_subscriber_t *subscriber,
@@ -251,8 +259,6 @@
return AXIS2_SUCCESS;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_endpoint_ref_t *AXIS2_CALL
savan_subscriber_get_end_to(
savan_subscriber_t *subscriber,
@@ -261,8 +267,6 @@
return subscriber->end_to;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_subscriber_set_notify_to(
savan_subscriber_t *subscriber,
@@ -274,8 +278,6 @@
return AXIS2_SUCCESS;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_endpoint_ref_t *AXIS2_CALL
savan_subscriber_get_notify_to(
savan_subscriber_t *subscriber,
@@ -284,8 +286,6 @@
return subscriber->notify_to;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_subscriber_set_delivery_mode(
savan_subscriber_t *subscriber,
@@ -293,7 +293,7 @@
const axis2_char_t *mode)
{
/* if already set, free it */
- if (subscriber->delivery_mode != NULL)
+ if (subscriber->delivery_mode)
{
AXIS2_FREE(env->allocator, subscriber->delivery_mode);
subscriber->delivery_mode = NULL;
@@ -305,8 +305,6 @@
return AXIS2_SUCCESS;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
savan_subscriber_get_delivery_mode(
savan_subscriber_t *subscriber,
@@ -315,8 +313,6 @@
return subscriber->delivery_mode;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_subscriber_set_expires(
savan_subscriber_t *subscriber,
@@ -324,7 +320,7 @@
const axis2_char_t *expires)
{
/* if already set, free it */
- if (subscriber->expires != NULL)
+ if (subscriber->expires)
{
AXIS2_FREE(env->allocator, subscriber->expires);
subscriber->expires = NULL;
@@ -336,8 +332,6 @@
return AXIS2_SUCCESS;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
savan_subscriber_get_expires(
savan_subscriber_t *subscriber,
@@ -346,8 +340,6 @@
return subscriber->expires;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_subscriber_set_filter(
savan_subscriber_t *subscriber,
@@ -355,7 +347,7 @@
const axis2_char_t *filter)
{
/* if already set, free it */
- if (subscriber->filter != NULL)
+ if (subscriber->filter)
{
AXIS2_FREE(env->allocator, subscriber->filter);
subscriber->filter = NULL;
@@ -375,8 +367,6 @@
return subscriber->filter;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_subscriber_publish(
savan_subscriber_t *subscriber,
@@ -390,8 +380,7 @@
axis2_endpoint_ref_t *to = NULL;
const axis2_char_t *address = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Start:savan_subscriber_publish");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan]
Start:savan_subscriber_publish");
path = AXIS2_GETENV("AXIS2C_HOME");
svc_client = axis2_svc_client_create(env, path);
@@ -399,8 +388,7 @@
if(!svc_client)
{
AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
- "[savan]svc_client creation failed, unable to\
-continue");
+ "[savan]svc_client creation failed, unable to continue");
return AXIS2_SUCCESS;
}
@@ -444,8 +432,6 @@
return status;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_subscriber_set_renew_status(
savan_subscriber_t *subscriber,
@@ -457,8 +443,6 @@
return AXIS2_SUCCESS;
}
-/******************************************************************************/
-
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
savan_subscriber_get_renew_status(
savan_subscriber_t *subscriber,
Modified: webservices/savan/trunk/c/src/util/savan_util.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/savan_util.c?rev=704368&r1=704367&r2=704368&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Tue Oct 14 00:57:14 2008
@@ -512,7 +512,7 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
qname = axutil_qname_create(env, "savan", NULL, NULL);
module_desc = axis2_conf_get_module(conf, env, qname);
- param = axis2_module_desc_get_param(module_desc, env,
"SubscriptionMgrURL");
+ param = axis2_module_desc_get_param(module_desc, env,
SAVAN_SUBSCRIPTION_MGR_URL);
axutil_qname_free(qname, env);
if(param)
{
