openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File abuild.patch of Package esound (Revision 55a709af1ba639f2f5557adf04933180)

Currently displaying revision 55a709af1ba639f2f5557adf04933180 , Show latest

Index: esound-0.2.37/esddsp.c
===================================================================
--- esound-0.2.37.orig/esddsp.c
+++ esound-0.2.37/esddsp.c
@@ -310,36 +310,37 @@ static FILE *
 fopen_wrapper (FILE * (*func) (const char *, const char *),
 	       const char *pathname, const char *mode)
 {
-  dsp_init ();
-
-  if (!strcmp (pathname, "/dev/dsp"))
+    dsp_init ();
+    
+    if (!strcmp (pathname, "/dev/dsp"))
     {
-      if (!getenv ("ESPEAKER") && !mmapemu)
-	{
-          FILE *ret;
-
-	  if ((ret = (*func) (pathname, mode)) != NULL)
-	    return ret;
-	}
-
-      DPRINTF ("hijacking /dev/dsp fopen, and taking it to esd...\n");
-      settings = done = 0;
-      return fdopen((sndfd = esd_open_sound (NULL)), mode);
+        if (!getenv ("ESPEAKER") && !mmapemu)
+        {
+            FILE *ret;
+            
+            if ((ret = (*func) (pathname, mode)) != NULL)
+                return ret;
+        }
+        
+        DPRINTF ("hijacking /dev/dsp fopen, and taking it to esd...\n");
+        settings = done = 0;
+        return fdopen((sndfd = esd_open_sound (NULL)), mode);
     }
-  else if (use_mixer && !strcmp (pathname, "/dev/mixer"))
+    else if (use_mixer && !strcmp (pathname, "/dev/mixer"))
     {
-      FILE *ret;
-      DPRINTF ("hijacking /dev/mixer fopen, and taking it to esd...\n");
-
-      if ((ret = (*func) (pathname, mode)) != NULL)
-	{
-	  mixfd = fileno(ret);
-	  return ret;
-	}
+        FILE *ret;
+        DPRINTF ("hijacking /dev/mixer fopen, and taking it to esd...\n");
+        
+        if ((ret = (*func) (pathname, mode)) != NULL)
+        {
+            mixfd = fileno(ret);
+            return ret;
+        }
     }
-  else
+    
+    /* the else that was here was always executed (if neither of the 'if's
+       above weren't).  So remove it and silence gcc.  */
     return (*func) (pathname, mode);
-  /* FIXME: warning */
 }
 
 FILE *

Places

File abuild.patch of Package esound (Revision 55a709af1ba639f2f5557adf04933180)

Places