Author: jfrederic.clere(a)jboss.com
Date: 2008-06-03 11:23:05 -0400 (Tue, 03 Jun 2008)
New Revision: 1651
Modified:
trunk/mod_cluster/native/mod_manager/balancer.c
trunk/mod_cluster/native/mod_manager/context.c
trunk/mod_cluster/native/mod_manager/host.c
trunk/mod_cluster/native/mod_manager/node.c
Log:
Remove the useless APR_DECLARE().
--this line, and those below, will be ignored--
M mod_manager/context.c
M mod_manager/node.c
M mod_manager/balancer.c
M mod_manager/host.c
Modified: trunk/mod_cluster/native/mod_manager/balancer.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/balancer.c 2008-06-03 14:59:57 UTC (rev 1650)
+++ trunk/mod_cluster/native/mod_manager/balancer.c 2008-06-03 15:23:05 UTC (rev 1651)
@@ -133,7 +133,7 @@
}
return APR_NOTFOUND;
}
-APR_DECLARE(balancerinfo_t *) read_balancer(mem_t *s, balancerinfo_t *balancer)
+balancerinfo_t * read_balancer(mem_t *s, balancerinfo_t *balancer)
{
apr_status_t rv;
balancerinfo_t *ou = balancer;
@@ -154,7 +154,7 @@
* @param ids in the balancer table.
* @return APR_SUCCESS if all went well
*/
-APR_DECLARE(apr_status_t) get_balancer(mem_t *s, balancerinfo_t **balancer, int ids)
+apr_status_t get_balancer(mem_t *s, balancerinfo_t **balancer, int ids)
{
return(s->storage->ap_slotmem_mem(s->slotmem, ids, (void **) balancer));
}
@@ -165,7 +165,7 @@
* @param balancer balancer to remove from the shared table.
* @return APR_SUCCESS if all went well
*/
-APR_DECLARE(apr_status_t) remove_balancer(mem_t *s, balancerinfo_t *balancer)
+apr_status_t remove_balancer(mem_t *s, balancerinfo_t *balancer)
{
apr_status_t rv;
balancerinfo_t *ou = balancer;
@@ -186,7 +186,7 @@
* @param ids array of int to store the used id (must be big enough).
* @return number of balancer existing or -1 if error.
*/
-APR_DECLARE(int) get_ids_used_balancer(mem_t *s, int *ids)
+int get_ids_used_balancer(mem_t *s, int *ids)
{
return (s->storage->ap_slotmem_get_used(s->slotmem, ids));
}
@@ -196,7 +196,7 @@
* @param pointer to the shared table.
* @return number of balancer existing or -1 if error.
*/
-APR_DECLARE(int) get_max_size_balancer(mem_t *s)
+int get_max_size_balancer(mem_t *s)
{
return (s->storage->ap_slotmem_get_max_size(s->slotmem));
}
Modified: trunk/mod_cluster/native/mod_manager/context.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/context.c 2008-06-03 14:59:57 UTC (rev 1650)
+++ trunk/mod_cluster/native/mod_manager/context.c 2008-06-03 15:23:05 UTC (rev 1651)
@@ -134,7 +134,7 @@
}
return APR_NOTFOUND;
}
-APR_DECLARE(contextinfo_t *) read_context(mem_t *s, contextinfo_t *context)
+contextinfo_t * read_context(mem_t *s, contextinfo_t *context)
{
apr_status_t rv;
contextinfo_t *ou = context;
@@ -155,7 +155,7 @@
* @param ids in the context table.
* @return APR_SUCCESS if all went well
*/
-APR_DECLARE(apr_status_t) get_context(mem_t *s, contextinfo_t **context, int ids)
+apr_status_t get_context(mem_t *s, contextinfo_t **context, int ids)
{
return(s->storage->ap_slotmem_mem(s->slotmem, ids, (void **) context));
}
@@ -166,7 +166,7 @@
* @param context context to remove from the shared table.
* @return APR_SUCCESS if all went well
*/
-APR_DECLARE(apr_status_t) remove_context(mem_t *s, contextinfo_t *context)
+apr_status_t remove_context(mem_t *s, contextinfo_t *context)
{
apr_status_t rv;
contextinfo_t *ou = context;
@@ -187,7 +187,7 @@
* @param ids array of int to store the used id (must be big enough).
* @return number of context existing or -1 if error.
*/
-APR_DECLARE(int) get_ids_used_context(mem_t *s, int *ids)
+int get_ids_used_context(mem_t *s, int *ids)
{
return (s->storage->ap_slotmem_get_used(s->slotmem, ids));
}
@@ -197,7 +197,7 @@
* @param pointer to the shared table.
* @return number of context existing or -1 if error.
*/
-APR_DECLARE(int) get_max_size_context(mem_t *s)
+int get_max_size_context(mem_t *s)
{
return (s->storage->ap_slotmem_get_max_size(s->slotmem));
}
Modified: trunk/mod_cluster/native/mod_manager/host.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/host.c 2008-06-03 14:59:57 UTC (rev 1650)
+++ trunk/mod_cluster/native/mod_manager/host.c 2008-06-03 15:23:05 UTC (rev 1651)
@@ -133,7 +133,7 @@
}
return APR_NOTFOUND;
}
-APR_DECLARE(hostinfo_t *) read_host(mem_t *s, hostinfo_t *host)
+hostinfo_t * read_host(mem_t *s, hostinfo_t *host)
{
apr_status_t rv;
hostinfo_t *ou = host;
@@ -154,7 +154,7 @@
* @param ids in the host table.
* @return APR_SUCCESS if all went well
*/
-APR_DECLARE(apr_status_t) get_host(mem_t *s, hostinfo_t **host, int ids)
+apr_status_t get_host(mem_t *s, hostinfo_t **host, int ids)
{
return(s->storage->ap_slotmem_mem(s->slotmem, ids, (void **) host));
}
@@ -165,7 +165,7 @@
* @param host host to remove from the shared table.
* @return APR_SUCCESS if all went well
*/
-APR_DECLARE(apr_status_t) remove_host(mem_t *s, hostinfo_t *host)
+apr_status_t remove_host(mem_t *s, hostinfo_t *host)
{
apr_status_t rv;
hostinfo_t *ou = host;
@@ -186,7 +186,7 @@
* @param ids array of int to store the used id (must be big enough).
* @return number of host existing or -1 if error.
*/
-APR_DECLARE(int) get_ids_used_host(mem_t *s, int *ids)
+int get_ids_used_host(mem_t *s, int *ids)
{
return (s->storage->ap_slotmem_get_used(s->slotmem, ids));
}
@@ -196,7 +196,7 @@
* @param pointer to the shared table.
* @return number of host existing or -1 if error.
*/
-APR_DECLARE(int) get_max_size_host(mem_t *s)
+int get_max_size_host(mem_t *s)
{
return (s->storage->ap_slotmem_get_max_size(s->slotmem));
}
Modified: trunk/mod_cluster/native/mod_manager/node.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/node.c 2008-06-03 14:59:57 UTC (rev 1650)
+++ trunk/mod_cluster/native/mod_manager/node.c 2008-06-03 15:23:05 UTC (rev 1651)
@@ -148,7 +148,7 @@
}
return APR_NOTFOUND;
}
-APR_DECLARE(nodeinfo_t *) read_node(mem_t *s, nodeinfo_t *node)
+nodeinfo_t * read_node(mem_t *s, nodeinfo_t *node)
{
apr_status_t rv;
nodeinfo_t *ou = node;
@@ -169,7 +169,7 @@
* @param ids in the node table.
* @return APR_SUCCESS if all went well
*/
-APR_DECLARE(apr_status_t) get_node(mem_t *s, nodeinfo_t **node, int ids)
+apr_status_t get_node(mem_t *s, nodeinfo_t **node, int ids)
{
return(s->storage->ap_slotmem_mem(s->slotmem, ids, (void **) node));
}
@@ -180,7 +180,7 @@
* @param node node to remove from the shared table.
* @return APR_SUCCESS if all went well
*/
-APR_DECLARE(apr_status_t) remove_node(mem_t *s, nodeinfo_t *node)
+apr_status_t remove_node(mem_t *s, nodeinfo_t *node)
{
apr_status_t rv;
nodeinfo_t *ou = node;
@@ -201,7 +201,7 @@
* @param ids array of int to store the used id (must be big enough).
* @return number of node existing or -1 if error.
*/
-APR_DECLARE(int) get_ids_used_node(mem_t *s, int *ids)
+int get_ids_used_node(mem_t *s, int *ids)
{
return (s->storage->ap_slotmem_get_used(s->slotmem, ids));
}
@@ -211,7 +211,7 @@
* @param pointer to the shared table.
* @return number of node existing or -1 if error.
*/
-APR_DECLARE(int) get_max_size_node(mem_t *s)
+int get_max_size_node(mem_t *s)
{
return (s->storage->ap_slotmem_get_max_size(s->slotmem));
}