diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-09-11 14:04:38 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-09-11 14:04:38 +0000 |
| commit | 038e560152b7765d85cc399bcf26fe982b395dab (patch) | |
| tree | aafc4bee94d186f365f89beb36d5b63c2b83673a /src/pulse/subscribe.c | |
| parent | 391d09cd6e8d47ad8255736be5cb512b04843ed1 (diff) | |
More s/assert/pa_assert/ modernizations
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1804 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulse/subscribe.c')
| -rw-r--r-- | src/pulse/subscribe.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/pulse/subscribe.c b/src/pulse/subscribe.c index 76b93759..31b76369 100644 --- a/src/pulse/subscribe.c +++ b/src/pulse/subscribe.c @@ -29,6 +29,7 @@ #include <stdio.h> #include <pulsecore/gccmacro.h> +#include <pulsecore/macro.h> #include <pulsecore/pstream-util.h> #include "internal.h" @@ -40,10 +41,11 @@ void pa_command_subscribe_event(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSE pa_subscription_event_type_t e; uint32_t idx; - assert(pd); - assert(command == PA_COMMAND_SUBSCRIBE_EVENT); - assert(t); - assert(c); + pa_assert(pd); + pa_assert(command == PA_COMMAND_SUBSCRIBE_EVENT); + pa_assert(t); + pa_assert(c); + pa_assert(PA_REFCNT_VALUE(c) >= 1); pa_context_ref(c); @@ -67,8 +69,8 @@ pa_operation* pa_context_subscribe(pa_context *c, pa_subscription_mask_t m, pa_c pa_tagstruct *t; uint32_t tag; - assert(c); - assert(PA_REFCNT_VALUE(c) >= 1); + pa_assert(c); + pa_assert(PA_REFCNT_VALUE(c) >= 1); PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE); @@ -83,8 +85,8 @@ pa_operation* pa_context_subscribe(pa_context *c, pa_subscription_mask_t m, pa_c } void pa_context_set_subscribe_callback(pa_context *c, pa_context_subscribe_cb_t cb, void *userdata) { - assert(c); - assert(PA_REFCNT_VALUE(c) >= 1); + pa_assert(c); + pa_assert(PA_REFCNT_VALUE(c) >= 1); c->subscribe_callback = cb; c->subscribe_userdata = userdata; |