From mike@coffee.q9media.com  Sun Jul  8 11:57:35 2001
Return-Path: <mike@coffee.q9media.com>
Received: from coffee.q9media.com (coffee.q9media.com [216.94.229.19])
	by hub.freebsd.org (Postfix) with ESMTP
	id 57DE737B401; Sun,  8 Jul 2001 11:57:35 -0700 (PDT)
	(envelope-from mike@coffee.q9media.com)
Received: (from mike@localhost)
	by coffee.q9media.com (8.11.2/8.11.2) id f68JCgP17359;
	Sun, 8 Jul 2001 15:12:42 -0400 (EDT)
	(envelope-from mike)
Message-Id: <200107081912.f68JCgP17359@coffee.q9media.com>
Date: Sun, 8 Jul 2001 15:12:42 -0400 (EDT)
From: Mike Barcroft <mike@q9media.com>
Reply-To: Mike Barcroft <mike@q9media.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: sos@freebsd.org
Subject: [patch] src/usr.sbin/burncd warning clean up
X-Send-Pr-Version: 3.2

>Number:         28824
>Category:       bin
>Synopsis:       [patch] src/usr.sbin/burncd warning clean up
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sos
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 08 12:00:05 PDT 2001
>Closed-Date:    Mon Jan 7 11:23:51 PST 2002
>Last-Modified:  Mon Jan 07 11:24:51 PST 2002
>Originator:     Mike Barcroft
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Q9 Media
>Environment:

$FreeBSD: src/usr.sbin/burncd/Makefile,v 1.4 2001/03/26 14:39:38 ru Exp $
$FreeBSD: src/usr.sbin/burncd/burncd.c,v 1.13 2001/05/30 08:13:39 sos Exp $

>Description:

[An earlier version of this patch was sent directly to sos@FreeBSD.org,
 but I received no reply.]

o Clean up compile-time warnings.
o Set WARNS?=2
o Tested on i386 and alpha.

>How-To-Repeat:

N/A

>Fix:

Index: burncd/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/burncd/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- burncd/Makefile	2001/03/26 14:39:38	1.4
+++ burncd/Makefile	2001/07/08 18:25:49
@@ -1,6 +1,7 @@
 # $FreeBSD: src/usr.sbin/burncd/Makefile,v 1.4 2001/03/26 14:39:38 ru Exp $
 
 PROG=	burncd
+WARNS?=	2
 MAN=	burncd.8
 
 .include <bsd.prog.mk>
Index: burncd/burncd.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/burncd/burncd.c,v
retrieving revision 1.13
diff -u -r1.13 burncd.c
--- burncd/burncd.c	2001/05/30 08:13:39	1.13
+++ burncd/burncd.c	2001/07/08 18:25:50
@@ -56,7 +56,7 @@
 {
 	int ch, arg, addr;
 	int eject=0, list=0, multi=0, preemp=0, speed=1, test_write=0;
-	char *devname = "/dev/acd0c", *prog_name;
+	const char *dev_name = "/dev/acd0c", *prog_name;
 	int block_size = 0;
 
 	prog_name = argv[0];
@@ -67,7 +67,7 @@
 			break;
 
 		case 'f':
-			devname = optarg;
+			dev_name = optarg;
 			break;
 
 		case 'l':
@@ -106,8 +106,8 @@
 	if (argc == 0)
 		usage(prog_name);
 
-	if ((fd = open(devname, O_RDWR, 0)) < 0)
-		err(EX_NOINPUT, "open(%s)", devname);
+	if ((fd = open(dev_name, O_RDWR, 0)) < 0)
+		err(EX_NOINPUT, "open(%s)", dev_name);
 
 	if (ioctl(fd, CDRIOCWRITESPEED, &speed) < 0) 
        		err(EX_IOERR, "ioctl(CDRIOCWRITESPEED)");
@@ -134,7 +134,7 @@
 				err(EX_IOERR, "ioctl(CDIOREADTOCENTRY)");
 			if (ioctl(fd, CDRIOCNEXTWRITEABLEADDR, &addr) < 0) 
 				err(EX_IOERR, "ioctl(CDRIOCNEXTWRITEABLEADDR)");
-			fprintf(stderr, "%d, %d\n", 
+			fprintf(stderr, "%ul, %d\n", 
 				ntohl(entry.entry.addr.lba), addr);
 
 			break;
@@ -207,7 +207,7 @@
 			while (fgets(file_buf, sizeof(file_buf), fp) != NULL) {
 				if (*file_buf == '#' || *file_buf == '\n')
 					continue;
-				if (eol = strchr(file_buf, '\n'))
+				if ((eol = strchr(file_buf, '\n')) != NULL)
 					*eol = NULL;
 				write_file(file_buf, block_size);
 			}
@@ -233,7 +233,7 @@
 }
 
 void
-cleanup(int dummy)
+cleanup(int dummy __unused)
 {
 	if (ioctl(fd, CDRIOCSETBLOCKSIZE, &saved_block_size) < 0) 
 		err(EX_IOERR, "ioctl(CDRIOCSETBLOCKSIZE)");
@@ -252,7 +252,7 @@
 {
 	int addr, count, file, filesize, size;
 	char buf[2352*BLOCKS];
-	struct stat stat;
+	struct stat filestat;
 	static int cdopen, done_stdin, tot_size = 0;
 
 	if (!strcmp(name, "-")) {
@@ -278,9 +278,9 @@
 	if (ioctl(fd, CDRIOCNEXTWRITEABLEADDR, &addr) < 0) 
        		err(EX_IOERR, "ioctl(CDRIOCNEXTWRITEABLEADDR)");
 
-	if (fstat(file, &stat) < 0)
+	if (fstat(file, &filestat) < 0)
 		err(EX_IOERR, "fstat(%s)", name);
-	filesize = stat.st_size / 1024;
+	filesize = filestat.st_size / 1024;
 
 	if (!quiet) {
 		fprintf(stderr, "next writeable LBA %d\n", addr);
>Release-Note:
>Audit-Trail:

From: Bruce Evans <bde@zeta.org.au>
To: Mike Barcroft <mike@q9media.com>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG, sos@FreeBSD.ORG
Subject: Re: bin/28824: [patch] src/usr.sbin/burncd warning clean up
Date: Mon, 9 Jul 2001 20:08:41 +1000 (EST)

 > Index: burncd/burncd.c
 > ===================================================================
 > RCS file: /home/ncvs/src/usr.sbin/burncd/burncd.c,v
 > retrieving revision 1.13
 > diff -u -r1.13 burncd.c
 > --- burncd/burncd.c	2001/05/30 08:13:39	1.13
 > +++ burncd/burncd.c	2001/07/08 18:25:50
 > ...
 > @@ -134,7 +134,7 @@
 >  				err(EX_IOERR, "ioctl(CDIOREADTOCENTRY)");
 >  			if (ioctl(fd, CDRIOCNEXTWRITEABLEADDR, &addr) < 0) 
 >  				err(EX_IOERR, "ioctl(CDRIOCNEXTWRITEABLEADDR)");
 > -			fprintf(stderr, "%d, %d\n", 
 > +			fprintf(stderr, "%ul, %d\n", 
 >  				ntohl(entry.entry.addr.lba), addr);
 
 This breaks alphas.  ntohl() should return uint32_t (POSIX.1-200x-draft),
 but ntohl() actually returns unsigned long on i386's and in_addr_t on
 alphas, and both uint32_t and in_addr_t may be almost any unsigned integer
 type, so ntohl() should always be cast to unsigned long (possibly spelled
 as u_long) for printing.
 
 Bruce
 

From: Mike Barcroft <mike@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc: Bruce Evans <bde@zeta.org.au>
Subject: Re: bin/28824: [patch] src/usr.sbin/burncd warning clean up
Date: Thu, 19 Jul 2001 01:46:43 -0400

 This is an updated patch which addresses bde's concern regarding my
 previous patch.  The warning was masked on alpha by a typo ('%ul'
 instead of '%lu') in the fprintf(3) statement.
 
 ----------------------------------------------------------------------
 
 burncd.20010719.patch
  
 Index: burncd/Makefile
 ===================================================================
 RCS file: /home/ncvs/src/usr.sbin/burncd/Makefile,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile
 --- burncd/Makefile	2001/03/26 14:39:38	1.4
 +++ burncd/Makefile	2001/07/19 05:15:08
 @@ -1,6 +1,7 @@
  # $FreeBSD: src/usr.sbin/burncd/Makefile,v 1.4 2001/03/26 14:39:38 ru Exp $
  
  PROG=	burncd
 +WARNS?=	2
  MAN=	burncd.8
  
  .include <bsd.prog.mk>
 Index: burncd/burncd.c
 ===================================================================
 RCS file: /home/ncvs/src/usr.sbin/burncd/burncd.c,v
 retrieving revision 1.13
 diff -u -r1.13 burncd.c
 --- burncd/burncd.c	2001/05/30 08:13:39	1.13
 +++ burncd/burncd.c	2001/07/19 05:15:09
 @@ -56,7 +56,7 @@
  {
  	int ch, arg, addr;
  	int eject=0, list=0, multi=0, preemp=0, speed=1, test_write=0;
 -	char *devname = "/dev/acd0c", *prog_name;
 +	const char *dev_name = "/dev/acd0c", *prog_name;
  	int block_size = 0;
  
  	prog_name = argv[0];
 @@ -67,7 +67,7 @@
  			break;
  
  		case 'f':
 -			devname = optarg;
 +			dev_name = optarg;
  			break;
  
  		case 'l':
 @@ -106,8 +106,8 @@
  	if (argc == 0)
  		usage(prog_name);
  
 -	if ((fd = open(devname, O_RDWR, 0)) < 0)
 -		err(EX_NOINPUT, "open(%s)", devname);
 +	if ((fd = open(dev_name, O_RDWR, 0)) < 0)
 +		err(EX_NOINPUT, "open(%s)", dev_name);
  
  	if (ioctl(fd, CDRIOCWRITESPEED, &speed) < 0) 
         		err(EX_IOERR, "ioctl(CDRIOCWRITESPEED)");
 @@ -134,8 +134,8 @@
  				err(EX_IOERR, "ioctl(CDIOREADTOCENTRY)");
  			if (ioctl(fd, CDRIOCNEXTWRITEABLEADDR, &addr) < 0) 
  				err(EX_IOERR, "ioctl(CDRIOCNEXTWRITEABLEADDR)");
 -			fprintf(stderr, "%d, %d\n", 
 -				ntohl(entry.entry.addr.lba), addr);
 +			fprintf(stderr, "%lu, %d\n", 
 +				(u_long)ntohl(entry.entry.addr.lba), addr);
  
  			break;
  		}
 @@ -207,7 +207,7 @@
  			while (fgets(file_buf, sizeof(file_buf), fp) != NULL) {
  				if (*file_buf == '#' || *file_buf == '\n')
  					continue;
 -				if (eol = strchr(file_buf, '\n'))
 +				if ((eol = strchr(file_buf, '\n')) != NULL)
  					*eol = NULL;
  				write_file(file_buf, block_size);
  			}
 @@ -233,7 +233,7 @@
  }
  
  void
 -cleanup(int dummy)
 +cleanup(int dummy __unused)
  {
  	if (ioctl(fd, CDRIOCSETBLOCKSIZE, &saved_block_size) < 0) 
  		err(EX_IOERR, "ioctl(CDRIOCSETBLOCKSIZE)");
 @@ -252,7 +252,7 @@
  {
  	int addr, count, file, filesize, size;
  	char buf[2352*BLOCKS];
 -	struct stat stat;
 +	struct stat filestat;
  	static int cdopen, done_stdin, tot_size = 0;
  
  	if (!strcmp(name, "-")) {
 @@ -278,9 +278,9 @@
  	if (ioctl(fd, CDRIOCNEXTWRITEABLEADDR, &addr) < 0) 
         		err(EX_IOERR, "ioctl(CDRIOCNEXTWRITEABLEADDR)");
  
 -	if (fstat(file, &stat) < 0)
 +	if (fstat(file, &filestat) < 0)
  		err(EX_IOERR, "fstat(%s)", name);
 -	filesize = stat.st_size / 1024;
 +	filesize = filestat.st_size / 1024;
  
  	if (!quiet) {
  		fprintf(stderr, "next writeable LBA %d\n", addr);
Responsible-Changed-From-To: freebsd-bugs->sos 
Responsible-Changed-By: mike 
Responsible-Changed-When: Wed Jul 18 22:31:18 PDT 2001 
Responsible-Changed-Why:  

sos is the author of burncd(8). 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=28824 
State-Changed-From-To: open->analyzed 
State-Changed-By: sos 
State-Changed-When: Wed Dec 12 06:03:46 PST 2001 
State-Changed-Why:  
Well, hmm, the changes might be right, I'll consider this 
for a future version of burncd. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=28824 
State-Changed-From-To: analyzed->closed 
State-Changed-By: sos 
State-Changed-When: Mon Jan 7 11:23:51 PST 2002 
State-Changed-Why:  
Somebody committed semilar fixes without getting the 
maintainer review :( 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=28824 
>Unformatted:
