diff options
author | Lennart Poettering <lennart@poettering.net> | 2006-08-28 19:16:00 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2006-08-28 19:16:00 +0000 |
commit | a6339448202d01a922934dd85d0efa851f81dd3d (patch) | |
tree | 248f9910790630e6e455426bf871bec3deac0139 /src/pulsecore | |
parent | 5ecbd9edeead63b7ac694b728bb8dda5811438f8 (diff) |
fix an misdesigned assert()
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1339 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore')
-rw-r--r-- | src/pulsecore/shm.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c index 806a0320..19731b5f 100644 --- a/src/pulsecore/shm.c +++ b/src/pulsecore/shm.c @@ -156,10 +156,10 @@ void pa_shm_free(pa_shm *m) { if (m->do_unlink) { char fn[32]; - segment_name(fn, sizeof(fn), m->id); - - if (shm_unlink(fn) < 0) - pa_log(__FILE__":shm_unlink(%s) failed: %s", fn, pa_cstrerror(errno)); + 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 */ @@ -176,8 +176,7 @@ void pa_shm_punch(pa_shm *m, size_t offset, size_t size) { assert(m); assert(m->ptr); assert(m->size > 0); - assert(offset < m->size); - assert(offset+size < m->size); + assert(offset+size <= m->size); #ifdef MAP_FAILED assert(m->ptr != MAP_FAILED); |