summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/source.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-11 20:48:33 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-11 20:48:33 +0000
commitd5bedbcd98c10ef187f1daa326b32c6f3ba8d3af (patch)
treeb7ad2d06169bad49cb4d86d4c2c94473a189a91a /src/pulsecore/source.c
parent2988c3d9fbe52ba0429b4962446273bceda391f6 (diff)
remaining s/assert/pa_assert/ and refcnt.h modernizations
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1809 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/source.c')
-rw-r--r--src/pulsecore/source.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index f33240ec..2f1a5a5f 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -27,7 +27,6 @@
#endif
#include <stdio.h>
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
@@ -56,12 +55,11 @@ pa_source* pa_source_new(
pa_source *s;
char st[256];
- int r;
pa_channel_map tmap;
- assert(core);
- assert(name);
- assert(spec);
+ pa_assert(core);
+ pa_assert(name);
+ pa_assert(spec);
pa_return_null_if_fail(pa_sample_spec_valid(spec));
@@ -112,8 +110,7 @@ pa_source* pa_source_new(
s->asyncmsgq = NULL;
s->rtpoll = NULL;
- r = pa_idxset_put(core->sources, s, &s->index);
- assert(s->index != PA_IDXSET_INVALID && r >= 0);
+ pa_assert_se(pa_idxset_put(core->sources, s, &s->index) >= 0);
pa_sample_spec_snprint(st, sizeof(st), spec);
pa_log_info("Created source %u \"%s\" with sample spec \"%s\"", s->index, s->name, st);