summaryrefslogtreecommitdiffstats
path: root/src/daemon/cmdline.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/daemon/cmdline.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/daemon/cmdline.c')
-rw-r--r--src/daemon/cmdline.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 384dde36..a3f1ff03 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -26,7 +26,6 @@
#endif
#include <string.h>
-#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <getopt.h>
@@ -36,6 +35,7 @@
#include <pulsecore/core-util.h>
#include <pulsecore/strbuf.h>
+#include <pulsecore/macro.h>
#include "cmdline.h"
@@ -100,6 +100,8 @@ static struct option long_options[] = {
void pa_cmdline_help(const char *argv0) {
const char *e;
+ pa_assert(argv0);
+
if ((e = strrchr(argv0, '/')))
e++;
else
@@ -154,7 +156,10 @@ void pa_cmdline_help(const char *argv0) {
int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d) {
pa_strbuf *buf = NULL;
int c;
- assert(conf && argc && argv);
+
+ pa_assert(conf);
+ pa_assert(argc > 0);
+ pa_assert(argv);
buf = pa_strbuf_new();