don't allow --start in system mode

[pulseaudio] / src / pulsecore / parseaddr.c

diff --git a/src/pulsecore/parseaddr.c b/src/pulsecore/parseaddr.c
index 0df37f4eb944d68ed28bcde080eb42b05ccdb034..f2b6b2cfe9087e661f16d217d395bed69d01aa90 100644 (file)
--- a/src/pulsecore/parseaddr.c
+++ b/src/pulsecore/parseaddr.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
@@ -47,7 +45,7 @@
 static char *parse_host(const char *s, uint16_t *ret_port) {
     pa_assert(s);
     pa_assert(ret_port);
-    
+
     if (*s == '[') {
         char *e;
         if (!(e = strchr(s+1, ']')))
@@ -72,10 +70,10 @@ static char *parse_host(const char *s, uint16_t *ret_port) {
 
 int pa_parse_address(const char *name, pa_parsed_address *ret_p) {
     const char *p;
-    
+
     pa_assert(name);
     pa_assert(ret_p);
-    
+
     memset(ret_p, 0, sizeof(pa_parsed_address));
     ret_p->type = PA_PARSED_ADDRESS_TCP_AUTO;
 
@@ -103,9 +101,12 @@ int pa_parse_address(const char *name, pa_parsed_address *ret_p) {
     else if (pa_startswith(p, "unix:")) {
         ret_p->type = PA_PARSED_ADDRESS_UNIX;
         p += sizeof("unix:")-1;
-    } else if (pa_startswith(p, "tcp:") || pa_startswith(p, "tcp4:")) {
+    } else if (pa_startswith(p, "tcp:")) {
         ret_p->type = PA_PARSED_ADDRESS_TCP4;
         p += sizeof("tcp:")-1;
+    } else if (pa_startswith(p, "tcp4:")) {
+        ret_p->type = PA_PARSED_ADDRESS_TCP4;
+        p += sizeof("tcp4:")-1;
     } else if (pa_startswith(p, "tcp6:")) {
         ret_p->type = PA_PARSED_ADDRESS_TCP6;
         p += sizeof("tcp6:")-1;