Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > f9df13f3011d1b32fc98683f022b8c26 > files > 7

cdrdao-1.2.2-8mdv2009.0.src.rpm

--- cdrtools-2.01/scsilib/libscg/scsi-linux-sg.c.silly	2004-05-20 15:42:12.000000000 +0200
+++ cdrtools-2.01/scsilib/libscg/scsi-linux-sg.c	2004-09-08 11:37:47.670038792 +0200
@@ -315,6 +315,10 @@
 	if (device != NULL && *device != '\0') {
 #ifdef	USE_ATA
 		if (strncmp(device, "ATAPI", 5) == 0) {
+			if (scgp->overbose) {
+				js_fprintf((FILE *)scgp->errfile,
+				"Use of ATA is preferred over ATAPI.\n");
+			}
 			scgp->ops = &ata_ops;
 			return (SCGO_OPEN(scgp, device));
 		}
@@ -336,18 +340,6 @@
 			 */
 			use_ata = TRUE;
 			device = NULL;
-			if (scgp->overbose) {
-				/*
-				 * I strongly encourage people who believe that
-				 * they need to patch this message away to read
-				 * the messages in the Solaris USCSI libscg
-				 * layer instead of wetting their tissues while
-				 * being unwilling to look besides their
-				 * own belly button.
-				 */
-				js_fprintf((FILE *)scgp->errfile,
-				"Warning: Using badly designed ATAPI via /dev/hd* interface.\n");
-			}
 		}
 	}
 
@@ -497,20 +489,7 @@
 			if (b < 0 || b > 25)
 				b = -1;
 		}
-		if (scgp->overbose) {
-			/*
-			 * Before you patch this away, are you sure that you
-			 * know what you are going to to?
-			 *
-			 * Note that this is a warning that helps users from
-			 * cdda2wav, mkisofs and other programs (that
-			 * distinguish SCSI addresses from file names) from
-			 * getting unexpected results.
-			 */
-			js_fprintf((FILE *)scgp->errfile,
-			"Warning: Open by 'devname' is unintentional and not supported.\n");
-		}
-					/* O_NONBLOCK is dangerous */
+		/* O_NONBLOCK is dangerous */
 		f = open(device, O_RDWR | O_NONBLOCK);
 /*		if (f < 0 && errno == ENOENT)*/
 /*			goto openpg;*/