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

1 files changed, 9 insertions, 9 deletions

diff --git a/src/pulsecore/protocol-simple.c b/src/pulsecore/protocol-simple.c
index 924ee29ec..6bfba875e 100644
--- a/src/pulsecore/protocol-simple.c
+++ b/src/pulsecore/protocol-simple.c
@@ -134,7 +134,7 @@ static int do_read(struct connection *c) {
     }
     
     if ((r = pa_iochannel_read(c->io, (uint8_t*) c->playback.current_memblock->data+c->playback.memblock_index, l)) <= 0) {
-        pa_log_debug(__FILE__": read(): %s", r == 0 ? "EOF" : pa_cstrerror(errno));
+        pa_log_debug("read(): %s", r == 0 ? "EOF" : pa_cstrerror(errno));
         return -1;
     }
 
@@ -168,7 +168,7 @@ static int do_write(struct connection *c) {
     
     if ((r = pa_iochannel_write(c->io, (uint8_t*) chunk.memblock->data+chunk.index, chunk.length)) < 0) {
         pa_memblock_unref(chunk.memblock);
-        pa_log(__FILE__": write(): %s", pa_cstrerror(errno));
+        pa_log("write(): %s", pa_cstrerror(errno));
         return -1;
     }
     
@@ -315,7 +315,7 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata)
     assert(s && io && p);
 
     if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) {
-        pa_log(__FILE__": Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS);
+        pa_log("Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS);
         pa_iochannel_free(io);
         return;
     }
@@ -351,7 +351,7 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata)
         data.client = c->client;
 
         if (!(c->sink_input = pa_sink_input_new(p->core, &data, 0))) {
-            pa_log(__FILE__": Failed to create sink input.");
+            pa_log("Failed to create sink input.");
             goto fail;
         }
         
@@ -389,7 +389,7 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata)
         data.client = c->client;
 
         if (!(c->source_output = pa_source_output_new(p->core, &data, 0))) {
-            pa_log(__FILE__": Failed to create source output.");
+            pa_log("Failed to create source output.");
             goto fail;
         }
         c->source_output->push = source_output_push_cb;
@@ -437,7 +437,7 @@ pa_protocol_simple* pa_protocol_simple_new(pa_core *core, pa_socket_server *serv
 
     p->sample_spec = core->default_sample_spec;
     if (pa_modargs_get_sample_spec(ma, &p->sample_spec) < 0) {
-        pa_log(__FILE__": Failed to parse sample type specification.");
+        pa_log("Failed to parse sample type specification.");
         goto fail;
     }
 
@@ -446,20 +446,20 @@ pa_protocol_simple* pa_protocol_simple_new(pa_core *core, pa_socket_server *serv
     
     enable = 0;
     if (pa_modargs_get_value_boolean(ma, "record", &enable) < 0) {
-        pa_log(__FILE__": record= expects a numeric argument.");
+        pa_log("record= expects a numeric argument.");
         goto fail;
     }
     p->mode = enable ? RECORD : 0;
 
     enable = 1;
     if (pa_modargs_get_value_boolean(ma, "playback", &enable) < 0) {
-        pa_log(__FILE__": playback= expects a numeric argument.");
+        pa_log("playback= expects a numeric argument.");
         goto fail;
     }
     p->mode |= enable ? PLAYBACK : 0;
 
     if ((p->mode & (RECORD|PLAYBACK)) == 0) {
-        pa_log(__FILE__": neither playback nor recording enabled for protocol.");
+        pa_log("neither playback nor recording enabled for protocol.");
         goto fail;
     }