split a few assert()s

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1146 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 6 insertions, 4 deletions

diff --git a/src/pulsecore/idxset.c b/src/pulsecore/idxset.c
index d3aec2de..5c79767d 100644
--- a/src/pulsecore/idxset.c
+++ b/src/pulsecore/idxset.c
@@ -151,13 +151,15 @@ static idxset_entry** array_index(pa_idxset*s, uint32_t idx) {
     if (idx < s->start_index)
         return NULL;
     
-    return s->array + (idx - s->start_index);
+    return s->array + idx - s->start_index;
 }
 
 int pa_idxset_put(pa_idxset*s, void *p, uint32_t *idx) {
     unsigned h;
     idxset_entry *e, **a;
-    assert(s && p);
+    
+    assert(s);
+    assert(p);
 
     assert(s->hash_func);
     h = s->hash_func(p) % s->hash_table_size;
@@ -341,7 +343,8 @@ void* pa_idxset_first(pa_idxset *s, uint32_t *idx) {
 
 void *pa_idxset_next(pa_idxset *s, uint32_t *idx) {
     idxset_entry **a, *e = NULL;
-    assert(s && idx);
+    assert(s);
+    assert(idx);
 
     if ((a = array_index(s, *idx)) && *a)
         e = (*a)->iterate_next;
@@ -355,7 +358,6 @@ void *pa_idxset_next(pa_idxset *s, uint32_t *idx) {
     }
 }
 
-
 int pa_idxset_foreach(pa_idxset*s, int (*func)(void *p, uint32_t idx, int *del, void*userdata), void *userdata) {
     idxset_entry *e;
     assert(s && func);