Remove trailing whitespaces in *.c.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1905414 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 59 insertions, 59 deletions

diff --git a/shmem/beos/shm.c b/shmem/beos/shm.c
index fcd7c84d1..77d0fd884 100644
--- a/shmem/beos/shm.c
+++ b/shmem/beos/shm.c
@@ -33,20 +33,20 @@ struct apr_shm_t {
     area_id aid;
 };
 
-APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, 
-                                         apr_size_t reqsize, 
-                                         const char *filename, 
+APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
+                                         apr_size_t reqsize,
+                                         const char *filename,
                                          apr_pool_t *p)
 {
     apr_size_t pagesize;
     area_id newid;
     char *addr;
     char shname[B_OS_NAME_LENGTH];
-    
+
     (*m) = (apr_shm_t *)apr_pcalloc(p, sizeof(apr_shm_t));
     /* we MUST allocate in pages, so calculate how big an area we need... */
     pagesize = ((reqsize + B_PAGE_SIZE - 1) / B_PAGE_SIZE) * B_PAGE_SIZE;
-     
+
     if (!filename) {
         int num = 0;
         snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld", find_thread(NULL));
@@ -54,7 +54,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
             snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld_%d",
                      find_thread(NULL), num++);
     }
-    newid = create_area(filename ? filename : shname, 
+    newid = create_area(filename ? filename : shname,
                         (void*)&addr, B_ANY_ADDRESS,
                         pagesize, B_LAZY_LOCK, B_READ_AREA|B_WRITE_AREA);
 
@@ -71,9 +71,9 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m, 
-                                            apr_size_t reqsize, 
-                                            const char *filename, 
+APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
+                                            apr_size_t reqsize,
+                                            const char *filename,
                                             apr_pool_t *p,
                                             apr_int32_t flags)
 {
@@ -92,7 +92,7 @@ APR_DECLARE(apr_status_t) apr_shm_remove(const char *filename,
                                          apr_pool_t *pool)
 {
     area_id deleteme = find_area(filename);
-    
+
     if (deleteme == B_NAME_NOT_FOUND)
         return APR_EINVAL;
 
@@ -108,7 +108,7 @@ APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m)
     else {
         return APR_ENOTIMPL;
     }
-} 
+}
 
 APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
                                          const char *filename,
@@ -132,13 +132,13 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
 
     if (ti.team != ai.team) {
         area_id narea;
-        
+
         narea = clone_area(ai.name, &(ai.address), B_CLONE_ADDRESS,
                            B_READ_AREA|B_WRITE_AREA, ai.area);
 
         if (narea < B_OK)
             return narea;
-            
+
         get_area_info(narea, &ai);
         new_m->aid = narea;
         new_m->memblock = ai.address;
@@ -148,7 +148,7 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
     }
 
     (*m) = new_m;
-    
+
     return APR_SUCCESS;
 }
 
@@ -191,5 +191,5 @@ APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
                                          apr_pool_t *pool)
 {
     return APR_ENOTIMPL;
-}    
+}
 
diff --git a/shmem/os2/shm.c b/shmem/os2/shm.c
index b6ef7811a..958fd321f 100644
--- a/shmem/os2/shm.c
+++ b/shmem/os2/shm.c
@@ -56,9 +56,9 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m, 
-                                            apr_size_t reqsize, 
-                                            const char *filename, 
+APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
+                                            apr_size_t reqsize,
+                                            const char *filename,
                                             apr_pool_t *p,
                                             apr_int32_t flags)
 {
@@ -80,7 +80,7 @@ APR_DECLARE(apr_status_t) apr_shm_remove(const char *filename,
 APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m)
 {
     return APR_ENOTIMPL;
-} 
+}
 
 APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
                                          const char *filename,
@@ -164,5 +164,5 @@ APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
 
     *m = newm;
     return APR_SUCCESS;
-}    
+}
 
diff --git a/shmem/unix/shm.c b/shmem/unix/shm.c
index f93efb5fc..2a42aadee 100644
--- a/shmem/unix/shm.c
+++ b/shmem/unix/shm.c
@@ -24,7 +24,7 @@
 #include "apr_hash.h"
 
 #if APR_USE_SHMEM_MMAP_SHM
-/* 
+/*
  *   For portable use, a shared memory object should be identified by a name of
  *   the form /somename; that is, a null-terminated string of up to NAME_MAX
  *   (i.e., 255) characters consisting of an initial slash, followed by one or
@@ -142,7 +142,7 @@ static apr_status_t shm_cleanup_owner(void *m_)
 }
 
 APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
-                                         apr_size_t reqsize, 
+                                         apr_size_t reqsize,
                                          const char *filename,
                                          apr_pool_t *pool)
 {
@@ -171,12 +171,12 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
         new_m = apr_palloc(pool, sizeof(apr_shm_t));
         new_m->pool = pool;
         new_m->reqsize = reqsize;
-        new_m->realsize = reqsize + 
+        new_m->realsize = reqsize +
             APR_ALIGN_DEFAULT(sizeof(apr_size_t)); /* room for metadata */
         new_m->filename = NULL;
-    
+
 #if APR_USE_SHMEM_MMAP_ZERO
-        status = apr_file_open(&file, "/dev/zero", APR_FOPEN_READ | APR_FOPEN_WRITE, 
+        status = apr_file_open(&file, "/dev/zero", APR_FOPEN_READ | APR_FOPEN_WRITE,
                                APR_FPROT_OS_DEFAULT, pool);
         if (status != APR_SUCCESS) {
             return status;
@@ -280,15 +280,15 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
         const char *shm_name = make_shm_open_safe_name(filename, pool);
 #endif
 #if APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM
-        new_m->realsize = reqsize + 
+        new_m->realsize = reqsize +
             APR_ALIGN_DEFAULT(sizeof(apr_size_t)); /* room for metadata */
         /* FIXME: Ignore error for now. *
          * status = apr_file_remove(file, pool);*/
         status = APR_SUCCESS;
-    
+
 #if APR_USE_SHMEM_MMAP_TMP
         /* FIXME: Is APR_FPROT_OS_DEFAULT sufficient? */
-        status = apr_file_open(&file, filename, 
+        status = apr_file_open(&file, filename,
                                APR_FOPEN_READ | APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_EXCL,
                                APR_FPROT_OS_DEFAULT, pool);
         if (status != APR_SUCCESS) {
@@ -327,7 +327,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
 
         status = apr_os_file_put(&file, &tmpfd,
                                  APR_FOPEN_READ | APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_EXCL,
-                                 pool); 
+                                 pool);
         if (status != APR_SUCCESS) {
             return status;
         }
@@ -362,7 +362,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
         new_m->realsize = reqsize;
 
         /* FIXME: APR_FPROT_OS_DEFAULT is too permissive, switch to 600 I think. */
-        status = apr_file_open(&file, filename, 
+        status = apr_file_open(&file, filename,
                                APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_EXCL,
                                APR_FPROT_OS_DEFAULT, pool);
         if (status != APR_SUCCESS) {
@@ -415,7 +415,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
 
         apr_pool_cleanup_register(new_m->pool, new_m, shm_cleanup_owner,
                                   apr_pool_cleanup_null);
-        *m = new_m; 
+        *m = new_m;
         return APR_SUCCESS;
 
 #else
@@ -424,9 +424,9 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
     }
 }
 
-APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m, 
-                                            apr_size_t reqsize, 
-                                            const char *filename, 
+APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
+                                            apr_size_t reqsize,
+                                            const char *filename,
                                             apr_pool_t *p,
                                             apr_int32_t flags)
 {
@@ -438,7 +438,7 @@ APR_DECLARE(apr_status_t) apr_shm_remove(const char *filename,
 {
 #if APR_USE_SHMEM_SHMGET
     apr_status_t status;
-    apr_file_t *file;  
+    apr_file_t *file;
     key_t shmkey;
     int shmid;
 #endif
@@ -452,7 +452,7 @@ APR_DECLARE(apr_status_t) apr_shm_remove(const char *filename,
     }
     return APR_SUCCESS;
 #elif APR_USE_SHMEM_SHMGET
-    /* Presume that the file already exists; just open for writing */    
+    /* Presume that the file already exists; just open for writing */
     status = apr_file_open(&file, filename, APR_FOPEN_WRITE,
                            APR_FPROT_OS_DEFAULT, pool);
     if (status) {
@@ -490,7 +490,7 @@ shm_remove_failed:
     /* No support for anonymous shm */
     return APR_ENOTIMPL;
 #endif
-} 
+}
 
 APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m)
 {
@@ -500,7 +500,7 @@ APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m)
     else {
         return APR_ENOTIMPL;
     }
-} 
+}
 
 APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m)
 {
@@ -563,13 +563,13 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
 
         status = apr_os_file_put(&file, &tmpfd,
                                  APR_READ | APR_WRITE,
-                                 pool); 
+                                 pool);
         if (status != APR_SUCCESS) {
             return status;
         }
 
 #elif APR_USE_SHMEM_MMAP_TMP
-        status = apr_file_open(&file, filename, 
+        status = apr_file_open(&file, filename,
                                APR_FOPEN_READ | APR_FOPEN_WRITE,
                                APR_FPROT_OS_DEFAULT, pool);
         if (status != APR_SUCCESS) {
@@ -602,7 +602,7 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
         new_m->base = mmap(NULL, new_m->realsize, PROT_READ | PROT_WRITE,
                            MAP_SHARED, tmpfd, 0);
         /* FIXME: check for errors */
-        
+
         status = apr_file_close(file);
         if (status != APR_SUCCESS) {
             return status;
@@ -624,7 +624,7 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
 
         new_m = apr_palloc(pool, sizeof(apr_shm_t));
 
-        status = apr_file_open(&file, filename, 
+        status = apr_file_open(&file, filename,
                                APR_FOPEN_READ, APR_FPROT_OS_DEFAULT, pool);
         if (status != APR_SUCCESS) {
             return status;
@@ -727,5 +727,5 @@ APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
                                          apr_pool_t *pool)
 {
     return APR_ENOTIMPL;
-}    
+}
 
diff --git a/shmem/win32/shm.c b/shmem/win32/shm.c
index b873942ce..9486f0f1f 100644
--- a/shmem/win32/shm.c
+++ b/shmem/win32/shm.c
@@ -41,7 +41,7 @@ static apr_status_t shm_cleanup(void* shm)
 {
     apr_status_t rv = APR_SUCCESS;
     apr_shm_t *m = shm;
-    
+
     if (!UnmapViewOfFile(m->memblk)) {
         rv = apr_get_os_error();
     }
@@ -140,7 +140,7 @@ APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
         SYSTEM_INFO si;
         GetSystemInfo(&si);
         memblock = si.dwAllocationGranularity;
-    }   
+    }
 
     /* Compute the granualar multiple of the pagesize */
     size = memblock * (1 + (reqsize - 1) / memblock);
@@ -159,7 +159,7 @@ APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
     else {
         int global;
 
-        /* Do file backed, which is not an inherited handle 
+        /* Do file backed, which is not an inherited handle
          * While we could open APR_FOPEN_EXCL, it doesn't seem that Unix
          * ever did.  Ignore that error here, but fail later when
          * we discover we aren't the creator of the file map object.
@@ -189,7 +189,7 @@ APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
         mapkey = res_name_from_filename(file, global, pool);
     }
 
-	hMap = CreateFileMappingW(hFile, NULL, PAGE_READWRITE, 
+	hMap = CreateFileMappingW(hFile, NULL, PAGE_READWRITE,
 							  sizehi, sizelo, mapkey);
     err = apr_get_os_error();
 
@@ -204,14 +204,14 @@ APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
     if (!hMap) {
         return err;
     }
-    
+
     base = MapViewOfFile(hMap, FILE_MAP_READ | FILE_MAP_WRITE,
                          0, 0, size);
     if (!base) {
         CloseHandle(hMap);
         return apr_get_os_error();
     }
-    
+
     *m = (apr_shm_t *) apr_palloc(pool, sizeof(apr_shm_t));
     (*m)->pool = pool;
     (*m)->hMap = hMap;
@@ -220,12 +220,12 @@ APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
 
     (*m)->usrmem = (char*)base + sizeof(memblock_t);
     (*m)->length = reqsize - sizeof(memblock_t);;
-    
+
     (*m)->memblk->length = (*m)->length;
     (*m)->memblk->size = (*m)->size;
     (*m)->filename = file ? apr_pstrdup(pool, file) : NULL;
 
-    apr_pool_cleanup_register((*m)->pool, *m, 
+    apr_pool_cleanup_register((*m)->pool, *m,
                               shm_cleanup, apr_pool_cleanup_null);
     return APR_SUCCESS;
 }
@@ -238,7 +238,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
     return apr_shm_create_ex(m, reqsize, file, pool, 0);
 }
 
-APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m) 
+APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m)
 {
     apr_status_t rv = shm_cleanup(m);
     apr_pool_cleanup_kill(m->pool, m, shm_cleanup);
@@ -259,7 +259,7 @@ APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m)
     else {
         return APR_ENOTIMPL;
     }
-} 
+}
 
 static apr_status_t shm_attach_internal(apr_shm_t **m,
                                         const char *file,
@@ -280,13 +280,13 @@ static apr_status_t shm_attach_internal(apr_shm_t **m,
     if (!hMap) {
         return apr_get_os_error();
     }
-    
+
     base = MapViewOfFile(hMap, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
     if (!base) {
         CloseHandle(hMap);
         return apr_get_os_error();
     }
-    
+
     *m = (apr_shm_t *) apr_palloc(pool, sizeof(apr_shm_t));
     (*m)->pool = pool;
     (*m)->memblk = base;
@@ -297,7 +297,7 @@ static apr_status_t shm_attach_internal(apr_shm_t **m,
     (*m)->usrmem = (char*)base + sizeof(memblock_t);
     (*m)->filename = NULL;
 
-    apr_pool_cleanup_register((*m)->pool, *m, 
+    apr_pool_cleanup_register((*m)->pool, *m,
                               shm_cleanup, apr_pool_cleanup_null);
     return APR_SUCCESS;
 }
@@ -388,7 +388,7 @@ APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
     if (!base) {
         return apr_get_os_error();
     }
-    
+
     *m = (apr_shm_t *) apr_palloc(pool, sizeof(apr_shm_t));
     (*m)->pool = pool;
     (*m)->hMap = *osshm;
@@ -399,8 +399,8 @@ APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
     (*m)->length = (*m)->memblk->length;
     (*m)->filename = NULL;
 
-    apr_pool_cleanup_register((*m)->pool, *m, 
+    apr_pool_cleanup_register((*m)->pool, *m,
                               shm_cleanup, apr_pool_cleanup_null);
     return APR_SUCCESS;
-}    
+}