[jbossnative-commits] JBoss Native SVN: r1680 - in trunk/mod_cluster/native: mod_slotmem and 1 other directory.
Author: jfrederic.clere(a)jboss.com
Date: 2008-06-09 09:18:35 -0400 (Mon, 09 Jun 2008)
New Revision: 1680
Modified:
trunk/mod_cluster/native/include/slotmem.h
trunk/mod_cluster/native/mod_slotmem/mod_sharedmem.c
trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c
Log:
Arrange warnings.
Modified: trunk/mod_cluster/native/include/slotmem.h
===================================================================
--- trunk/mod_cluster/native/include/slotmem.h 2008-06-09 13:15:16 UTC (rev 1679)
+++ trunk/mod_cluster/native/include/slotmem.h 2008-06-09 13:18:35 UTC (rev 1680)
@@ -153,4 +153,6 @@
*/
const slotmem_storage_method *mem_getstorage(apr_pool_t *p, char *type);
+void sharedmem_initialize_cleanup(apr_pool_t *p);
+
#endif /*SLOTMEM_H*/
Modified: trunk/mod_cluster/native/mod_slotmem/mod_sharedmem.c
===================================================================
--- trunk/mod_cluster/native/mod_slotmem/mod_sharedmem.c 2008-06-09 13:15:16 UTC (rev
1679)
+++ trunk/mod_cluster/native/mod_slotmem/mod_sharedmem.c 2008-06-09 13:18:35 UTC (rev
1680)
@@ -37,6 +37,7 @@
#include "httpd.h"
#include "http_config.h"
#include "http_log.h"
+#include "ap_provider.h"
#include "slotmem.h"
#include "sharedmem_util.h"
Modified: trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c
===================================================================
--- trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2008-06-09 13:15:16 UTC (rev
1679)
+++ trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2008-06-09 13:18:35 UTC (rev
1680)
@@ -168,7 +168,6 @@
}
static apr_status_t ap_slotmem_create(ap_slotmem_t **new, const char *name, apr_size_t
item_size, int item_num, apr_pool_t *pool)
{
- void *slotmem = NULL;
char *ptr;
struct sharedslotdesc desc;
ap_slotmem_t *res;
@@ -282,7 +281,6 @@
}
static apr_status_t ap_slotmem_attach(ap_slotmem_t **new, const char *name, apr_size_t
*item_size, int *item_num, apr_pool_t *pool)
{
- void *slotmem = NULL;
char *ptr;
ap_slotmem_t *res;
ap_slotmem_t *next = globallistmem;
@@ -416,7 +414,6 @@
{
int ff;
int *ident;
- apr_status_t rv;
if (item_id > score->num || item_id <=0) {
return APR_EINVAL;
} else {