diff options
author | Lennart Poettering <lennart@poettering.net> | 2007-06-11 13:53:31 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2007-06-11 13:53:31 +0000 |
commit | 69115687ad1604ddfa9fa7cd86eb286e6bb5ea9a (patch) | |
tree | 12b61ea697d920df64e116b51f0198de64db9d1c /src/pulsecore/shm.c | |
parent | 590ae20d4de57d94ff276b62a0c726ec7b2f8154 (diff) |
make untabify
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1472 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/shm.c')
-rw-r--r-- | src/pulsecore/shm.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c index 444d4010..8c7fb4db 100644 --- a/src/pulsecore/shm.c +++ b/src/pulsecore/shm.c @@ -113,7 +113,7 @@ int pa_shm_create_rw(pa_shm *m, size_t size, int shared, mode_t mode) { close(fd); m->do_unlink = 1; #else - return -1; + return -1; #endif } @@ -139,36 +139,36 @@ void pa_shm_free(pa_shm *m) { assert(m->size > 0); #ifdef MAP_FAILED - assert(m->ptr != MAP_FAILED); + assert(m->ptr != MAP_FAILED); #endif - if (!m->shared) { + if (!m->shared) { #ifdef MAP_ANONYMOUS - if (munmap(m->ptr, m->size) < 0) - pa_log("munmap() failed: %s", pa_cstrerror(errno)); + if (munmap(m->ptr, m->size) < 0) + pa_log("munmap() failed: %s", pa_cstrerror(errno)); #elif defined(HAVE_POSIX_MEMALIGN) free(m->ptr); #else pa_xfree(m->ptr); #endif - } else { + } else { #ifdef HAVE_SHM_OPEN - if (munmap(m->ptr, m->size) < 0) - pa_log("munmap() failed: %s", pa_cstrerror(errno)); + if (munmap(m->ptr, m->size) < 0) + pa_log("munmap() failed: %s", pa_cstrerror(errno)); - if (m->do_unlink) { - char fn[32]; + if (m->do_unlink) { + char fn[32]; segment_name(fn, sizeof(fn), m->id); if (shm_unlink(fn) < 0) pa_log(" shm_unlink(%s) failed: %s", fn, pa_cstrerror(errno)); - } + } #else - /* We shouldn't be here without shm support */ - assert(0); + /* We shouldn't be here without shm support */ + assert(0); #endif - } + } memset(m, 0, sizeof(*m)); } @@ -182,7 +182,7 @@ void pa_shm_punch(pa_shm *m, size_t offset, size_t size) { assert(offset+size <= m->size); #ifdef MAP_FAILED - assert(m->ptr != MAP_FAILED); + assert(m->ptr != MAP_FAILED); #endif /* You're welcome to implement this as NOOP on systems that don't @@ -270,7 +270,7 @@ fail: #else /* HAVE_SHM_OPEN */ int pa_shm_attach_ro(pa_shm *m, unsigned id) { - return -1; + return -1; } #endif /* HAVE_SHM_OPEN */ |