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, 8 insertions, 8 deletions

diff --git a/src/pulsecore/authkey.c b/src/pulsecore/authkey.c
index a5df3ed1..87631ca5 100644
--- a/src/pulsecore/authkey.c
+++ b/src/pulsecore/authkey.c
@@ -54,7 +54,7 @@ static int generate(int fd, void *ret_data, size_t length) {
     ftruncate(fd, 0);
 
     if ((r = pa_loop_write(fd, ret_data, length, NULL)) < 0 || (size_t) r != length) {
-        pa_log(__FILE__": failed to write cookie file: %s", pa_cstrerror(errno));
+        pa_log("failed to write cookie file: %s", pa_cstrerror(errno));
         return -1;
     }
 
@@ -76,7 +76,7 @@ static int load(const char *fn, void *data, size_t length) {
 
     if ((fd = open(fn, O_RDWR|O_CREAT|O_BINARY, S_IRUSR|S_IWUSR)) < 0) {
         if (errno != EACCES || (fd = open(fn, O_RDONLY|O_BINARY)) < 0) {
-            pa_log(__FILE__": failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
+            pa_log("failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
             goto finish;
         } else
             writable = 0;
@@ -85,15 +85,15 @@ static int load(const char *fn, void *data, size_t length) {
     unlock = pa_lock_fd(fd, 1) >= 0;
 
     if ((r = pa_loop_read(fd, data, length, NULL)) < 0) {
-        pa_log(__FILE__": failed to read cookie file '%s': %s", fn, pa_cstrerror(errno));
+        pa_log("failed to read cookie file '%s': %s", fn, pa_cstrerror(errno));
         goto finish;
     }
 
     if ((size_t) r != length) {
-        pa_log_debug(__FILE__": got %d bytes from cookie file '%s', expected %d", (int)r, fn, (int)length);
+        pa_log_debug("got %d bytes from cookie file '%s', expected %d", (int)r, fn, (int)length);
         
         if (!writable) {
-            pa_log(__FILE__": unable to write cookie to read only file");
+            pa_log("unable to write cookie to read only file");
             goto finish;
         }
         
@@ -125,7 +125,7 @@ int pa_authkey_load(const char *path, void *data, size_t length) {
     ret = load(path, data, length);
 
     if (ret < 0)
-        pa_log(__FILE__": Failed to load authorization key '%s': %s", path,
+        pa_log("Failed to load authorization key '%s': %s", path,
                (ret == -1) ? pa_cstrerror(errno) : "file corrupt");
 
     return ret;
@@ -182,14 +182,14 @@ int pa_authkey_save(const char *fn, const void *data, size_t length) {
         return -2;
 
     if ((fd = open(p, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
-        pa_log(__FILE__": failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
+        pa_log("failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
         goto finish;
     }
 
     unlock = pa_lock_fd(fd, 1) >= 0;
 
     if ((r = pa_loop_write(fd, data, length, NULL)) < 0 || (size_t) r != length) {
-        pa_log(__FILE__": failed to read cookie file '%s': %s", fn, pa_cstrerror(errno));
+        pa_log("failed to read cookie file '%s': %s", fn, pa_cstrerror(errno));
         goto finish;
     }