[pulseaudio-commits] r1423 - /trunk/src/pulsecore/core-util.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Mon Feb  5 11:26:14 2007
New Revision: 1423

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1423&root=3Dpulseaudio&vi=
ew=3Drev
Log:
Don't abort config loading when the user specific cannot be loaded.

Modified:
    trunk/src/pulsecore/core-util.c

Modified: trunk/src/pulsecore/core-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-util.c=
?rev=3D1423&root=3Dpulseaudio&r1=3D1422&r2=3D1423&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/pulsecore/core-util.c (original)
+++ trunk/src/pulsecore/core-util.c Mon Feb  5 11:26:14 2007
@@ -184,7 +184,7 @@
         goto fail;
     }
 #else
-	pa_log_warn("secure directory creation not supported on Win32.");
+    pa_log_warn("secure directory creation not supported on Win32.");
 #endif
 =

     return 0;
@@ -953,13 +953,19 @@
             fn =3D buf;
 #endif
 =

-            if ((f =3D fopen(fn, mode)) || errno !=3D ENOENT) {
+            f =3D fopen(fn, mode);
+            if (f !=3D NULL) {
                 if (result)
                     *result =3D pa_xstrdup(fn);
                 pa_xfree(lfn);
                 return f;
             }
 =

+            if (errno !=3D ENOENT) {
+                pa_log_warn("WARNING: failed to open configuration file '%=
s': %s",
+                    lfn, pa_cstrerror(errno));
+            }
+
             pa_xfree(lfn);
         }
     }