remove all occurences of

   pa_logXXX(__FILE__":  
   
and replace them by 
  
   pa_logXXX("



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

5 files changed, 55 insertions, 55 deletions

diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
index 5d3f3e27..338d57cf 100644
--- a/src/modules/rtp/module-rtp-recv.c
+++ b/src/modules/rtp/module-rtp-recv.c
@@ -165,7 +165,7 @@ static void rtp_event_cb(pa_mainloop_api *m, pa_io_event *e, int fd, pa_io_event
         s->offset = s->rtp_context.timestamp;
 
         if (s->ssrc == s->userdata->core->cookie)
-            pa_log_warn(__FILE__": WARNING! Detected RTP packet loop!");
+            pa_log_warn("WARNING! Detected RTP packet loop!");
     } else {
         if (s->ssrc != s->rtp_context.ssrc) {
             pa_memblock_unref(chunk.memblock);
@@ -217,13 +217,13 @@ static int mcast_socket(const struct sockaddr* sa, socklen_t salen) {
     
     af = sa->sa_family;
     if ((fd = socket(af, SOCK_DGRAM, 0)) < 0) {
-        pa_log(__FILE__": Failed to create socket: %s", pa_cstrerror(errno));
+        pa_log("Failed to create socket: %s", pa_cstrerror(errno));
         goto fail;
     }
 
     one = 1;
     if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) {
-        pa_log(__FILE__": SO_REUSEADDR failed: %s", pa_cstrerror(errno));
+        pa_log("SO_REUSEADDR failed: %s", pa_cstrerror(errno));
         goto fail;
     }
     
@@ -240,12 +240,12 @@ static int mcast_socket(const struct sockaddr* sa, socklen_t salen) {
     }
 
     if (r < 0) {
-        pa_log_info(__FILE__": Joining mcast group failed: %s", pa_cstrerror(errno));
+        pa_log_info("Joining mcast group failed: %s", pa_cstrerror(errno));
         goto fail;
     }
     
     if (bind(fd, sa, salen) < 0) {
-        pa_log(__FILE__": bind() failed: %s", pa_cstrerror(errno));
+        pa_log("bind() failed: %s", pa_cstrerror(errno));
         goto fail;
     }
 
@@ -268,12 +268,12 @@ static struct session *session_new(struct userdata *u, const pa_sdp_info *sdp_in
     pa_sink_input_new_data data;
 
     if (u->n_sessions >= MAX_SESSIONS) {
-        pa_log(__FILE__": session limit reached.");
+        pa_log("session limit reached.");
         goto fail;
     }
     
     if (!(sink = pa_namereg_get(u->core, u->sink_name, PA_NAMEREG_SINK, 1))) {
-        pa_log(__FILE__": sink does not exist.");
+        pa_log("sink does not exist.");
         goto fail;
     }
 
@@ -301,7 +301,7 @@ static struct session *session_new(struct userdata *u, const pa_sdp_info *sdp_in
     pa_xfree(c);
         
     if (!s->sink_input) {
-        pa_log(__FILE__": failed to create sink input.");
+        pa_log("failed to create sink input.");
         goto fail;
     }
 
@@ -338,7 +338,7 @@ static struct session *session_new(struct userdata *u, const pa_sdp_info *sdp_in
 
     pa_rtp_context_init_recv(&s->rtp_context, fd, pa_frame_size(&s->sdp_info.sample_spec));
 
-    pa_log_info(__FILE__": Found new session '%s'", s->sdp_info.session_name);
+    pa_log_info("Found new session '%s'", s->sdp_info.session_name);
 
     u->n_sessions++;
     
@@ -358,7 +358,7 @@ fail:
 static void session_free(struct session *s, int from_hash) {
     assert(s);
 
-    pa_log_info(__FILE__": Freeing session '%s'", s->sdp_info.session_name);
+    pa_log_info("Freeing session '%s'", s->sdp_info.session_name);
 
     s->userdata->core->mainloop->time_free(s->death_event);
     s->userdata->core->mainloop->io_free(s->rtp_event);
@@ -435,7 +435,7 @@ int pa__init(pa_core *c, pa_module*m) {
     assert(m);
 
     if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-        pa_log(__FILE__": failed to parse module arguments");
+        pa_log("failed to parse module arguments");
         goto fail;
     }
 
@@ -452,7 +452,7 @@ int pa__init(pa_core *c, pa_module*m) {
         sa = (struct sockaddr*) &sa4;
         salen = sizeof(sa4);
     } else {
-        pa_log(__FILE__": invalid SAP address '%s'", sap_address);
+        pa_log("invalid SAP address '%s'", sap_address);
         goto fail;
     }
 
diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index 1b85c840..61dd0047 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -105,7 +105,7 @@ static void source_output_push(pa_source_output *o, const pa_memchunk *chunk) {
     u = o->userdata;
 
     if (pa_memblockq_push(u->memblockq, chunk) < 0) {
-        pa_log(__FILE__": Failed to push chunk into memblockq.");
+        pa_log("Failed to push chunk into memblockq.");
         return;
     }
     
@@ -174,17 +174,17 @@ int pa__init(pa_core *c, pa_module*m) {
     assert(m);
 
     if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-        pa_log(__FILE__": failed to parse module arguments");
+        pa_log("failed to parse module arguments");
         goto fail;
     }
 
     if (!(s = pa_namereg_get(m->core, pa_modargs_get_value(ma, "source", NULL), PA_NAMEREG_SOURCE, 1))) {
-        pa_log(__FILE__": source does not exist.");
+        pa_log("source does not exist.");
         goto fail;
     }
 
     if (pa_modargs_get_value_boolean(ma, "loop", &loop) < 0) {
-        pa_log(__FILE__": failed to parse \"loop\" parameter.");
+        pa_log("failed to parse \"loop\" parameter.");
         goto fail;
     }
 
@@ -192,12 +192,12 @@ int pa__init(pa_core *c, pa_module*m) {
     pa_rtp_sample_spec_fixup(&ss);
     cm = s->channel_map;
     if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
-        pa_log(__FILE__": failed to parse sample specification");
+        pa_log("failed to parse sample specification");
         goto fail;
     }
 
     if (!pa_rtp_sample_spec_valid(&ss)) {
-        pa_log(__FILE__": specified sample type not compatible with RTP");
+        pa_log("specified sample type not compatible with RTP");
         goto fail;
     }
 
@@ -209,18 +209,18 @@ int pa__init(pa_core *c, pa_module*m) {
     mtu = (DEFAULT_MTU/pa_frame_size(&ss))*pa_frame_size(&ss);
     
     if (pa_modargs_get_value_u32(ma, "mtu", &mtu) < 0 || mtu < 1 || mtu % pa_frame_size(&ss) != 0) {
-        pa_log(__FILE__": invalid mtu.");
+        pa_log("invalid mtu.");
         goto fail;
     }
 
     port = DEFAULT_PORT + ((rand() % 512) << 1);
     if (pa_modargs_get_value_u32(ma, "port", &port) < 0 || port < 1 || port > 0xFFFF) {
-        pa_log(__FILE__": port= expects a numerical argument between 1 and 65535.");
+        pa_log("port= expects a numerical argument between 1 and 65535.");
         goto fail;
     }
 
     if (port & 1)
-        pa_log_warn(__FILE__": WARNING: port number not even as suggested in RFC3550!");
+        pa_log_warn("WARNING: port number not even as suggested in RFC3550!");
 
     dest = pa_modargs_get_value(ma, "destination", DEFAULT_DESTINATION);
 
@@ -235,33 +235,33 @@ int pa__init(pa_core *c, pa_module*m) {
         sap_sa4 = sa4;
         sap_sa4.sin_port = htons(SAP_PORT);
     } else {
-        pa_log(__FILE__": invalid destination '%s'", dest);
+        pa_log("invalid destination '%s'", dest);
         goto fail;
     }
     
     if ((fd = socket(af, SOCK_DGRAM, 0)) < 0) {
-        pa_log(__FILE__": socket() failed: %s", pa_cstrerror(errno));
+        pa_log("socket() failed: %s", pa_cstrerror(errno));
         goto fail;
     }
 
     if (connect(fd, af == AF_INET ? (struct sockaddr*) &sa4 : (struct sockaddr*) &sa6, af == AF_INET ? sizeof(sa4) : sizeof(sa6)) < 0) {
-        pa_log(__FILE__": connect() failed: %s", pa_cstrerror(errno));
+        pa_log("connect() failed: %s", pa_cstrerror(errno));
         goto fail;
     }
 
     if ((sap_fd = socket(af, SOCK_DGRAM, 0)) < 0) {
-        pa_log(__FILE__": socket() failed: %s", pa_cstrerror(errno));
+        pa_log("socket() failed: %s", pa_cstrerror(errno));
         goto fail;
     }
 
     if (connect(sap_fd, af == AF_INET ? (struct sockaddr*) &sap_sa4 : (struct sockaddr*) &sap_sa6, af == AF_INET ? sizeof(sap_sa4) : sizeof(sap_sa6)) < 0) {
-        pa_log(__FILE__": connect() failed: %s", pa_cstrerror(errno));
+        pa_log("connect() failed: %s", pa_cstrerror(errno));
         goto fail;
     }
 
     if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop)) < 0 ||
         setsockopt(sap_fd, IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop)) < 0) {
-        pa_log(__FILE__": IP_MULTICAST_LOOP failed: %s", pa_cstrerror(errno));
+        pa_log("IP_MULTICAST_LOOP failed: %s", pa_cstrerror(errno));
         goto fail;
     }
 
@@ -274,7 +274,7 @@ int pa__init(pa_core *c, pa_module*m) {
     pa_source_output_new_data_set_channel_map(&data, &cm);
     
     if (!(o = pa_source_output_new(c, &data, 0))) {
-        pa_log(__FILE__": failed to create source output.");
+        pa_log("failed to create source output.");
         goto fail;
     }
 
@@ -317,8 +317,8 @@ int pa__init(pa_core *c, pa_module*m) {
     pa_rtp_context_init_send(&u->rtp_context, fd, c->cookie, payload, pa_frame_size(&ss));
     pa_sap_context_init_send(&u->sap_context, sap_fd, p);
 
-    pa_log_info(__FILE__": RTP stream initialized with mtu %u on %s:%u, SSRC=0x%08x, payload=%u, initial sequence #%u", mtu, dest, port, u->rtp_context.ssrc, payload, u->rtp_context.sequence);
-    pa_log_info(__FILE__": SDP-Data:\n%s\n"__FILE__": EOF", p);
+    pa_log_info("RTP stream initialized with mtu %u on %s:%u, SSRC=0x%08x, payload=%u, initial sequence #%u", mtu, dest, port, u->rtp_context.ssrc, payload, u->rtp_context.sequence);
+    pa_log_info("SDP-Data:\n%s\n"__FILE__": EOF", p);
 
     pa_sap_send(&u->sap_context, 0);
 
diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
index 8e77c60a..3bb0ea47 100644
--- a/src/modules/rtp/rtp.c
+++ b/src/modules/rtp/rtp.c
@@ -125,7 +125,7 @@ int pa_rtp_send(pa_rtp_context *c, size_t size, pa_memblockq *q) {
             
             if (k < 0) {
                 if (errno != EAGAIN) /* If the queue is full, just ignore it */
-                    pa_log(__FILE__": sendmsg() failed: %s", pa_cstrerror(errno));
+                    pa_log("sendmsg() failed: %s", pa_cstrerror(errno));
                 return -1;
             }
             
@@ -163,7 +163,7 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool) {
     chunk->memblock = NULL;
 
     if (ioctl(c->fd, FIONREAD, &size) < 0) {
-        pa_log(__FILE__": FIONREAD failed: %s", pa_cstrerror(errno));
+        pa_log("FIONREAD failed: %s", pa_cstrerror(errno));
         goto fail;
     }
 
@@ -184,12 +184,12 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool) {
     m.msg_flags = 0;
     
     if ((r = recvmsg(c->fd, &m, 0)) != size) {
-        pa_log(__FILE__": recvmsg() failed: %s", r < 0 ? pa_cstrerror(errno) : "size mismatch");
+        pa_log("recvmsg() failed: %s", r < 0 ? pa_cstrerror(errno) : "size mismatch");
         goto fail;
     }
 
     if (size < 12) {
-        pa_log(__FILE__": RTP packet too short.");
+        pa_log("RTP packet too short.");
         goto fail;
     }
 
@@ -202,17 +202,17 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool) {
     c->ssrc = ntohl(c->ssrc);
 
     if ((header >> 30) != 2) {
-        pa_log(__FILE__": Unsupported RTP version.");
+        pa_log("Unsupported RTP version.");
         goto fail;
     }
 
     if ((header >> 29) & 1) {
-        pa_log(__FILE__": RTP padding not supported.");
+        pa_log("RTP padding not supported.");
         goto fail;
     }
 
     if ((header >> 28) & 1) {
-        pa_log(__FILE__": RTP header extensions not supported.");
+        pa_log("RTP header extensions not supported.");
         goto fail;
     }
 
@@ -221,7 +221,7 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool) {
     c->sequence = header & 0xFFFF;
 
     if (12 + cc*4 > size) {
-        pa_log(__FILE__": RTP packet too short. (CSRC)");
+        pa_log("RTP packet too short. (CSRC)");
         goto fail;
     }
 
@@ -229,7 +229,7 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool) {
     chunk->length = size - chunk->index;
 
     if (chunk->length % c->frame_size != 0) {
-        pa_log(__FILE__": Vad RTP packet size.");
+        pa_log("Vad RTP packet size.");
         goto fail;
     }
     
diff --git a/src/modules/rtp/sap.c b/src/modules/rtp/sap.c
index 615b8e4e..022c7fa3 100644
--- a/src/modules/rtp/sap.c
+++ b/src/modules/rtp/sap.c
@@ -138,7 +138,7 @@ int pa_sap_recv(pa_sap_context *c, int *goodbye) {
     assert(goodbye);
 
     if (ioctl(c->fd, FIONREAD, &size) < 0) {
-        pa_log(__FILE__": FIONREAD failed: %s", pa_cstrerror(errno));
+        pa_log("FIONREAD failed: %s", pa_cstrerror(errno));
         goto fail;
     }
 
@@ -160,12 +160,12 @@ int pa_sap_recv(pa_sap_context *c, int *goodbye) {
     m.msg_flags = 0;
     
     if ((r = recvmsg(c->fd, &m, 0)) != size) {
-        pa_log(__FILE__": recvmsg() failed: %s", r < 0 ? pa_cstrerror(errno) : "size mismatch");
+        pa_log("recvmsg() failed: %s", r < 0 ? pa_cstrerror(errno) : "size mismatch");
         goto fail;
     }
 
     if (size < 4) {
-        pa_log(__FILE__": SAP packet too short.");
+        pa_log("SAP packet too short.");
         goto fail;
     }
 
@@ -173,17 +173,17 @@ int pa_sap_recv(pa_sap_context *c, int *goodbye) {
     header = ntohl(header);
 
     if (header >> 29 != 1) {
-        pa_log(__FILE__": Unsupported SAP version.");
+        pa_log("Unsupported SAP version.");
         goto fail;
     }
 
     if ((header >> 25) & 1) {
-        pa_log(__FILE__": Encrypted SAP not supported.");
+        pa_log("Encrypted SAP not supported.");
         goto fail;
     }
 
     if ((header >> 24) & 1) {
-        pa_log(__FILE__": Compressed SAP not supported.");
+        pa_log("Compressed SAP not supported.");
         goto fail;
     }
 
@@ -192,7 +192,7 @@ int pa_sap_recv(pa_sap_context *c, int *goodbye) {
 
     k = 4 + (six ? 16 : 4) + ac*4;
     if (size < k) {
-        pa_log(__FILE__": SAP packet too short (AD).");
+        pa_log("SAP packet too short (AD).");
         goto fail;
     }
 
@@ -203,7 +203,7 @@ int pa_sap_recv(pa_sap_context *c, int *goodbye) {
         e += sizeof(MIME_TYPE);
         size -= sizeof(MIME_TYPE);
     } else if ((unsigned) size < sizeof(PA_SDP_HEADER)-1 || strncmp(e, PA_SDP_HEADER, sizeof(PA_SDP_HEADER)-1)) {
-        pa_log(__FILE__": Invalid SDP header.");
+        pa_log("Invalid SDP header.");
         goto fail;
     }
 
diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
index e707e4bb..1b71a9a0 100644
--- a/src/modules/rtp/sdp.c
+++ b/src/modules/rtp/sdp.c
@@ -129,7 +129,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
     i->payload = 255;
     
     if (!pa_startswith(t, PA_SDP_HEADER)) {
-        pa_log(__FILE__": Failed to parse SDP data: invalid header.");
+        pa_log("Failed to parse SDP data: invalid header.");
         goto fail;
     }
 
@@ -141,7 +141,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
         l = strcspn(t, "\n");
 
         if (l <= 2) {
-            pa_log(__FILE__": Failed to parse SDP data: line too short: >%s<.", t);
+            pa_log("Failed to parse SDP data: line too short: >%s<.", t);
             goto fail;
         }
 
@@ -159,7 +159,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
             a[strcspn(a, "/")] = 0;
 
             if (inet_pton(AF_INET, a, &((struct sockaddr_in*) &i->sa)->sin_addr) <= 0) {
-                pa_log(__FILE__": Failed to parse SDP data: bad address: >%s<.", a);
+                pa_log("Failed to parse SDP data: bad address: >%s<.", a);
                 goto fail;
             }
 
@@ -176,7 +176,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
             a[strcspn(a, "/")] = 0;
 
             if (inet_pton(AF_INET6, a, &((struct sockaddr_in6*) &i->sa)->sin6_addr) <= 0) {
-                pa_log(__FILE__": Failed to parse SDP data: bad address: >%s<.", a);
+                pa_log("Failed to parse SDP data: bad address: >%s<.", a);
                 goto fail;
             }
 
@@ -191,12 +191,12 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
                 if (sscanf(t+8, "%i RTP/AVP %i", &_port, &_payload) == 2) {
 
                     if (_port <= 0 || _port > 0xFFFF) {
-                        pa_log(__FILE__": Failed to parse SDP data: invalid port %i.", _port);
+                        pa_log("Failed to parse SDP data: invalid port %i.", _port);
                         goto fail;
                     }
 
                     if (_payload < 0 || _payload > 127) {
-                        pa_log(__FILE__": Failed to parse SDP data: invalid payload %i.", _payload);
+                        pa_log("Failed to parse SDP data: invalid payload %i.", _payload);
                         goto fail;
                     }
 
@@ -216,7 +216,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
                 if (sscanf(t+9, "%i %64c", &_payload, c) == 2) {
 
                     if (_payload < 0 || _payload > 127) {
-                        pa_log(__FILE__": Failed to parse SDP data: invalid payload %i.", _payload);
+                        pa_log("Failed to parse SDP data: invalid payload %i.", _payload);
                         goto fail;
                     }
                     if (_payload == i->payload) {
@@ -237,7 +237,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
     }
 
     if (!i->origin || (!is_goodbye && (!i->salen || i->payload > 127 || !ss_valid || port == 0))) {
-        pa_log(__FILE__": Failed to parse SDP data: missing data.");
+        pa_log("Failed to parse SDP data: missing data.");
         goto fail;
     }