summaryrefslogtreecommitdiff
path: root/shmem
diff options
context:
space:
mode:
authordreid <dreid@13f79535-47bb-0310-9956-ffa450edef68>2001-06-06 21:52:42 +0000
committerdreid <dreid@13f79535-47bb-0310-9956-ffa450edef68>2001-06-06 21:52:42 +0000
commit238862ecbf74b036883d5663d793d46022a5fb91 (patch)
tree56e82a1cfbd43ab13718dab3e8a637a78efbec98 /shmem
parent99aa385f7a5fe96078c016f27bc6dd1fffcce393 (diff)
downloadlibapr-238862ecbf74b036883d5663d793d46022a5fb91.tar.gz
Stop some compiler warnings on beos...
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61726 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
-rw-r--r--shmem/beos/shmem.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/shmem/beos/shmem.c b/shmem/beos/shmem.c
index 428300aa5..9eb4061bc 100644
--- a/shmem/beos/shmem.c
+++ b/shmem/beos/shmem.c
@@ -57,6 +57,7 @@
#include "apr_errno.h"
#include "apr_lib.h"
#include "apr_strings.h"
+#include <stdio.h>
#include <stdlib.h>
#include <kernel/OS.h>
@@ -80,7 +81,9 @@ struct shmem_t {
#define MIN_BLK_SIZE 128
+/*
#define DEBUG_ 1
+*/
void add_block(struct block_t **list, struct block_t *blk);
void split_block(struct block_t **list, struct block_t *blk, apr_size_t size);
@@ -204,7 +207,7 @@ static void remove_block(struct block_t **list, struct block_t *blk)
static void free_block(struct shmem_t *m, void *entity)
{
struct block_t *b;
- if (b = find_block_by_addr(m->uselist, entity)){
+ if ((b = find_block_by_addr(m->uselist, entity))){
remove_block(&(m->uselist), b);
add_block(&(m->freelist), b);
m->avail += b->size;
@@ -236,11 +239,8 @@ static struct block_t *alloc_block(struct shmem_t *m, apr_size_t size)
apr_status_t apr_shm_init(struct shmem_t **m, apr_size_t reqsize, const char *file,
apr_pool_t *p)
{
- int rc;
- int pages;
apr_size_t pagesize;
area_id newid;
- char *name = NULL;
char *addr;
(*m) = (struct shmem_t *)apr_pcalloc(p, sizeof(struct shmem_t));
@@ -278,7 +278,7 @@ apr_status_t apr_shm_destroy(struct shmem_t *m)
void *apr_shm_malloc(struct shmem_t *m, apr_size_t reqsize)
{
struct block_t *b;
- if (b = alloc_block(m, reqsize))
+ if ((b = alloc_block(m, reqsize)))
return b->addr;
return NULL;
}
@@ -286,7 +286,7 @@ void *apr_shm_malloc(struct shmem_t *m, apr_size_t reqsize)
void *apr_shm_calloc(struct shmem_t *m, apr_size_t reqsize)
{
struct block_t *b;
- if (b = alloc_block(m, reqsize)){
+ if ((b = alloc_block(m, reqsize))){
memset(b->addr, 0, reqsize);
return b->addr;
}