From cvs-return-1920-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Mon Aug 13 23:49:05 2001 Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 51513 invoked by uid 500); 13 Aug 2001 23:49:05 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 51502 invoked from network); 13 Aug 2001 23:49:05 -0000 Date: 13 Aug 2001 23:45:48 -0000 Message-ID: <20010813234548.32186.qmail@icarus.apache.org> From: fielding@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/shmem/unix shmem.c X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N fielding 01/08/13 16:45:48 Modified: shmem/unix shmem.c Log: Fix warnings. Revision Changes Path 1.26 +21 -17 apr/shmem/unix/shmem.c Index: shmem.c =================================================================== RCS file: /home/cvs/apr/shmem/unix/shmem.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- shmem.c 2001/08/13 22:46:08 1.25 +++ shmem.c 2001/08/13 23:45:48 1.26 @@ -104,13 +104,16 @@ const char *filename, apr_pool_t *pool) { apr_shmem_t *new_m; - int tmpfd; void *mem; - #if APR_USE_SHMEM_SHMGET struct shmid_ds shmbuf; -#else - apr_status_t stat; +#endif +#if APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM || APR_USE_SHMEM_MMAP_ZERO + apr_status_t status; +#endif +#if APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM || \ + APR_USE_SHMEM_MMAP_ZERO || APR_USE_SHMEM_SHMGET + int tmpfd; #endif new_m = apr_palloc(pool, sizeof(apr_shmem_t)); @@ -120,19 +123,20 @@ /* These implementations are very similar except for opening the file. */ #if APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM || APR_USE_SHMEM_MMAP_ZERO /* FIXME: Ignore error for now. * - *stat = apr_file_remove(filename, pool);*/ + * status = apr_file_remove(filename, pool);*/ + status = APR_SUCCESS; #if APR_USE_SHMEM_MMAP_TMP /* FIXME: Is APR_OS_DEFAULT sufficient? */ - stat = apr_file_open(new_m->file, filename, + status = apr_file_open(new_m->file, filename, APR_READ | APR_WRITE | APR_CREATE, APR_OS_DEFAULT, pool); - if (stat != APR_SUCCESS) + if (status != APR_SUCCESS) return APR_EGENERAL; tmpfd = apr_os_file_get(&tmpfd, new_m->file); - stat = apr_file_trunc(new_m->file, reqsize); - if (stat != APR_SUCCESS) + status = apr_file_trunc(new_m->file, reqsize); + if (status != APR_SUCCESS) return APR_EGENERAL; #elif APR_USE_SHMEM_MMAP_SHM @@ -142,16 +146,16 @@ return errno + APR_OS_START_SYSERR; apr_os_file_put(new_m->file, &tmpfd, pool); - stat = apr_file_trunc(new_m->file, reqsize); - if (stat != APR_SUCCESS) + status = apr_file_trunc(new_m->file, reqsize); + if (status != APR_SUCCESS) { shm_unlink(filename); return APR_EGENERAL; } #elif APR_USE_SHMEM_MMAP_ZERO - stat = apr_file_open(new_m->file, "/dev/zero", APR_READ | APR_WRITE, + status = apr_file_open(new_m->file, "/dev/zero", APR_READ | APR_WRITE, APR_OS_DEFAULT); - if (stat != APR_SUCCESS) + if (status != APR_SUCCESS) return APR_EGENERAL; tmpfd = apr_os_file_get(&tmpfd, new_m->file); #endif @@ -296,16 +300,16 @@ APR_DECLARE(apr_status_t) apr_shm_avail(apr_shmem_t *m, apr_size_t *size) { - apr_status_t stat; + apr_status_t status; - stat = APR_ENOSHMAVAIL; + status = APR_ENOSHMAVAIL; apr_lock_acquire(m->lock); *size = m->length - (m->curmem - m->mem); if (*size) - stat = APR_SUCCESS; + status = APR_SUCCESS; apr_lock_release(m->lock); - return stat; + return status; }