[xiph-commits] r14892 - trunk/cdparanoia/interface

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2008-05-15 21:16:23 -0700 (Thu, 15 May 2008)
New Revision: 14892

Modified:
   trunk/cdparanoia/interface/scan_devices.c
Log:
KIll a build dependency
Kill a reporting bug (when SG_IO device is inaccessible)


Modified: trunk/cdparanoia/interface/scan_devices.c
===================================================================
--- trunk/cdparanoia/interface/scan_devices.c	2008-05-16 03:55:43 UTC (rev 14891)
+++ trunk/cdparanoia/interface/scan_devices.c	2008-05-16 04:16:23 UTC (rev 14892)
@@ -89,13 +89,9 @@
     }
     i++;
   }
-  {
-    struct passwd *temp;
-    temp=getpwuid(geteuid());
-    idmessage(messagedest,messages,
-	      "\n\nNo cdrom drives accessible to %s found.\n",
-	      temp->pw_name);
-  }
+  idmessage(messagedest,messages,
+	    "\n\nNo cdrom drives accessible to %s found.\n",
+	    cuserid(NULL));
   return(NULL);
 }
 
@@ -449,7 +445,7 @@
   fd = open(device, O_RDWR|O_NONBLOCK);
   if (fd < 0){
     idperror(messagedest,messages,
-	     "\t\tCould not access device %d to test for SG_IO support",device);    
+	     "\t\tCould not access device %s to test for SG_IO support",device);    
     return 0;
   }