[Debburn-changes] r562 - in cdrkit/trunk: debian wodim

Eduard Bloch blade at alioth.debian.org
Wed Dec 6 10:48:33 CET 2006


Author: blade
Date: 2006-12-06 10:48:33 +0100 (Wed, 06 Dec 2006)
New Revision: 562

Modified:
   cdrkit/trunk/debian/copyright
   cdrkit/trunk/wodim/drv_mmc.c
Log:
More dvd related fixes, adopted from suse

Modified: cdrkit/trunk/debian/copyright
===================================================================
--- cdrkit/trunk/debian/copyright	2006-12-06 09:18:49 UTC (rev 561)
+++ cdrkit/trunk/debian/copyright	2006-12-06 09:48:33 UTC (rev 562)
@@ -62,5 +62,11 @@
   *   02110-1301 USA; either version 2 of the License, or (at your option) any
   *   later version; incorporated herein by reference.
 
+* geteltorito
+  Author: Rainer Krienke
+  Email:  krienke at uni-koblenz.de
+  License: GPL
+  Version: 0.3
+
 The complete text of the GNU General Public License version 2 is
 available in /usr/share/common-licenses/GPL on a Debian system.

Modified: cdrkit/trunk/wodim/drv_mmc.c
===================================================================
--- cdrkit/trunk/wodim/drv_mmc.c	2006-12-06 09:18:49 UTC (rev 561)
+++ cdrkit/trunk/wodim/drv_mmc.c	2006-12-06 09:48:33 UTC (rev 562)
@@ -2690,12 +2690,13 @@
       if(is_packet(trackp) || dp->profile == 0x1B){
 	  scsi_close_tr_session(usalp, CL_TYPE_SESSION, 0, FALSE);
       }
-      ret=fixate_mmc(usalp, dp, trackp);
+      ret = fixate_mmc(usalp, dp, trackp);
       if (dp->profile == 0x2B) {
 	  scsi_close_tr_session(usalp, CL_TYPE_OPEN_SESSION, 0, FALSE);
 	  scsi_close_tr_session(usalp, CL_TYPE_FINALISE_MINRAD, 0, FALSE);
       }
       usal_settimeout(usalp, 200);
+
       return ret;
 }
 
@@ -2756,12 +2757,14 @@
 	char	addr[12];
 	struct disk_info *dip;
 
-	printf("format_mdvd\n");
+	if (debug || lverbose > 2)
+		printf("format_mdvd\n");
 	mmc_check(usalp, NULL, NULL, NULL, NULL, NULL, &dvdwr);
 	if (!dvdwr)
 		return (format_dummy(usalp, dp, formattype));
 
-	printf("format_mdvd: drive is a dvd burner.\n");
+	if (debug || lverbose > 2)
+		printf("format_mdvd: drive is a dvd burner.\n");
 	profile = get_curprofile(usalp);
 	if (profile != 0x1A) {
 		printf("Error: only support DVD+RW formating, ignoring.\n");
@@ -2770,11 +2773,11 @@
 	printf("format_mdvd: media is a DVD+RW.\n");
 	dip = (struct disk_info *)buf;
 	if (get_diskinfo(usalp, dip) < 0)
-		return ret;
+		return -1;
 	
 	if (dip->disk_status & 3 && formattype != FORCE_FORMAT) {
 		printf("Error: disk already formated, ignoring.\n");
-	        return ret;
+	        return -1;
         }
 	addr[0] = 0;           /* "Reserved" */
 	addr[1] = 2;           /* "IMMED" flag */




More information about the Debburn-changes mailing list