[Debburn-changes] r366 - in nonameyet/trunk: cdda2wav cdrecord

[Peter Samuelson]

Author: peters-guest
Date: 2006-10-04 03:42:49 +0000 (Wed, 04 Oct 2006)
New Revision: 366

Modified:
   nonameyet/trunk/cdda2wav/interface.c
   nonameyet/trunk/cdda2wav/toc.c
   nonameyet/trunk/cdrecord/cdrecord.c
   nonameyet/trunk/cdrecord/drv_mmc.c
Log:
[PATCH] misc gcc -Wall fixes
From: Lorenz Minder  (slightly tweaked)


Modified: nonameyet/trunk/cdda2wav/interface.c
===================================================================
--- nonameyet/trunk/cdda2wav/interface.c	2006-10-03 21:37:06 UTC (rev 365)
+++ nonameyet/trunk/cdda2wav/interface.c	2006-10-04 03:42:49 UTC (rev 366)
@@ -451,8 +451,9 @@
 	struct stat *statstruct;
 	char *pdev_name;
 {
+#if defined(__linux__)
     int is_scsi = 1;
-
+#endif
 #if !defined (STAT_MACROS_BROKEN) || (STAT_MACROS_BROKEN != 1)
     if (!S_ISCHR(statstruct->st_mode) &&
 	!S_ISBLK(statstruct->st_mode)) {

Modified: nonameyet/trunk/cdda2wav/toc.c
===================================================================
--- nonameyet/trunk/cdda2wav/toc.c	2006-10-03 21:37:06 UTC (rev 365)
+++ nonameyet/trunk/cdda2wav/toc.c	2006-10-04 03:42:49 UTC (rev 366)
@@ -206,7 +206,6 @@
 }
 
 unsigned cdtracks = 0;
-static int have_hiddenAudioTrack = 0;
 
 int no_disguised_audiotracks()
 {

Modified: nonameyet/trunk/cdrecord/cdrecord.c
===================================================================
--- nonameyet/trunk/cdrecord/cdrecord.c	2006-10-03 21:37:06 UTC (rev 365)
+++ nonameyet/trunk/cdrecord/cdrecord.c	2006-10-04 03:42:49 UTC (rev 366)
@@ -4773,7 +4773,6 @@
 	int	tflags;
 {
 	dstat_t	*dsp = dp->cdr_dstat;
-	int	profile;
 
 	if ((tflags & TI_PACKET) != 0) {
 		dsp->ds_wrmode = WM_PACKET;

Modified: nonameyet/trunk/cdrecord/drv_mmc.c
===================================================================
--- nonameyet/trunk/cdrecord/drv_mmc.c	2006-10-03 21:37:06 UTC (rev 365)
+++ nonameyet/trunk/cdrecord/drv_mmc.c	2006-10-04 03:42:49 UTC (rev 366)
@@ -201,7 +201,7 @@
 	scsi_load,
 	scsi_unload,
 	read_buff_cap,
-	cmd_dummy,					/* recovery_needed */
+	cmd_dummy,					/* check_recovery */
 	(int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy,	/* recover	*/
 	speed_select_mmc,
 	select_secsize,
@@ -242,14 +242,14 @@
          scsi_load,
          scsi_unload,
          read_buff_cap,
-         cmd_dummy,                              /* recovery_needed      */
-         (int(*)__PR((SCSI *, struct cdr_cmd*,int)))cmd_dummy,   /* recover              */
+         cmd_dummy,                                       /* check_recovery */
+         (int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy,   /* recover     */
          speed_select_mdvd,
          select_secsize,
          next_wr_addr_mdvd,
          (int(*)__PR((SCSI *, Ulong)))cmd_ill,   /* reserve_track        */
          scsi_cdr_write,
-         (int(*)__PR((struct track*,void*,int)))cmd_dummy, /* gen_cue */
+         (int(*)__PR((track_t *, void *, BOOL)))cmd_dummy, /* gen_cue */
 	 (int(*)__PR((SCSI *scgp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */
  	 write_leadin_mmc,
          open_track_mdvd,
@@ -287,7 +287,7 @@
 	scsi_load,
 	scsi_unload,
 	read_buff_cap,
-	cmd_dummy,					/* recovery_needed */
+	cmd_dummy,					/* check_recovery */
 	(int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy,	/* recover	*/
 	speed_select_mmc,
 	select_secsize,
@@ -331,7 +331,7 @@
 	scsi_load,
 	scsi_unload,
 	read_buff_cap,
-	cmd_dummy,					/* recovery_needed */
+	cmd_dummy,					/* check_recovery */
 	(int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy,	/* recover	*/
 	speed_select_mmc,
 	select_secsize,
@@ -375,7 +375,7 @@
 	scsi_load,
 	scsi_unload,
 	buf_dummy,
-	cmd_dummy,					/* recovery_needed */
+	cmd_dummy,					/* check_recovery */
 	(int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy,	/* recover	*/
 	speed_select_mmc,
 	select_secsize,
@@ -420,7 +420,7 @@
 	scsi_load,
 	scsi_unload,
 	read_buff_cap,
-	cmd_dummy,					/* recovery_needed */
+	cmd_dummy,					/* check_recovery */
 	(int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy,	/* recover	*/
 	speed_select_mmc,
 	select_secsize,
@@ -635,7 +635,7 @@
 	if (profile >= 0) {
 		if (lverbose)
 			print_profiles(scgp);
-		if (profile == 0 || profile >= 0x10 && profile <= 0x15 || profile > 0x19) {
+		if (profile == 0 || (profile >= 0x10 && profile <= 0x15) || profile > 0x19) {
 		    /*
 		     * 10h DVD-ROM
 		     * 11h DVD-R
@@ -2059,10 +2059,8 @@
 	int	*speedp;
 {
   int retcode;
-  unsigned char perf_desc[28];
+  char perf_desc[28];
   int write_speed = *speedp * 1385;
-  int val = 0, val2 = 0;
-  int i;
    
   /* For the moment we just divide the CD speed by 7*/
 
@@ -2106,7 +2104,7 @@
   perf_desc[27] = 1000 & 0xFF;  
   
   /* retcode = scsi_set_streaming(scgp, NULL, 0); */
-  retcode = scsi_set_streaming(scgp, &perf_desc, sizeof(perf_desc));
+  retcode = scsi_set_streaming(scgp, perf_desc, sizeof(perf_desc));
   if (retcode == -1) return retcode;
   retcode = speed_select_mmc(scgp, dp, speedp);
   if(speedp!=NULL)
@@ -2557,7 +2555,6 @@
 	struct	cd_mode_page_05 *mp;
 	Ulong totalsize;
 	int i;
-	struct	track_info	track_info;
 	int profile;
 
 	fillbytes((caddr_t)mode, sizeof(mode), '\0');
@@ -2809,7 +2806,6 @@
 	BOOL	cdrrw	 = FALSE;	/* Read CD-RW	*/
 	BOOL	cdwrw	 = FALSE;	/* Write CD-RW	*/
 	int	ret;
-	int 	profile;
 
 	mmc_check(scgp, &cdrr, &cdwr, &cdrrw, &cdwrw, NULL, NULL);
 	if (!cdwrw)
@@ -4444,7 +4440,6 @@
 	long 	tsize;
 {
     unsigned char	xb[12];
-    int		i;
     long 	l0_size;
     
     /* Get the Layer 0 defined data zone*/
@@ -4462,10 +4457,10 @@
 	    fprintf(stderr, "track size smaller than one layer, use --force to force burning.");
 	    return 0;
 	}
-	printf("L0 size: %l (track size %l)\n", l0_size, tsize);
+	printf("L0 size: %ld (track size %ld)\n", l0_size, tsize);
 	l0_size = tsize / 2;
 	l0_size = l0_size - 1 + 16 - (l0_size - 1) % 16;
-	printf("New L0 size: %l\n", l0_size);
+	printf("New L0 size: %ld\n", l0_size);
 
 	memset (xb, 0, sizeof(xb));
 	xb[1]  = sizeof(xb) - 2;