mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
fix an misdesigned assert()
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1339 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
5ecbd9edee
commit
a633944820
1 changed files with 5 additions and 6 deletions
|
|
@ -156,10 +156,10 @@ void pa_shm_free(pa_shm *m) {
|
||||||
if (m->do_unlink) {
|
if (m->do_unlink) {
|
||||||
char fn[32];
|
char fn[32];
|
||||||
|
|
||||||
segment_name(fn, sizeof(fn), m->id);
|
segment_name(fn, sizeof(fn), m->id);
|
||||||
|
|
||||||
if (shm_unlink(fn) < 0)
|
if (shm_unlink(fn) < 0)
|
||||||
pa_log(__FILE__":shm_unlink(%s) failed: %s", fn, pa_cstrerror(errno));
|
pa_log(" shm_unlink(%s) failed: %s", fn, pa_cstrerror(errno));
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
/* We shouldn't be here without shm support */
|
/* 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);
|
||||||
assert(m->ptr);
|
assert(m->ptr);
|
||||||
assert(m->size > 0);
|
assert(m->size > 0);
|
||||||
assert(offset < m->size);
|
assert(offset+size <= m->size);
|
||||||
assert(offset+size < m->size);
|
|
||||||
|
|
||||||
#ifdef MAP_FAILED
|
#ifdef MAP_FAILED
|
||||||
assert(m->ptr != MAP_FAILED);
|
assert(m->ptr != MAP_FAILED);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue