From 7e670eeaa0b70f51154d7804c09139be31943ea2 Mon Sep 17 00:00:00 2001 From: obrien Date: Mon, 30 Dec 2002 10:57:41 +0000 Subject: Make fully WARNS=5 clean. Tested on: sparc64, x86 --- usr.sbin/burncd/Makefile | 4 ++-- usr.sbin/burncd/burncd.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'usr.sbin/burncd') diff --git a/usr.sbin/burncd/Makefile b/usr.sbin/burncd/Makefile index 22423e4..6f03273 100644 --- a/usr.sbin/burncd/Makefile +++ b/usr.sbin/burncd/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= burncd -WARNS?= 5 -NO_WERROR= yes MAN= burncd.8 +WARNS?= 5 + .include diff --git a/usr.sbin/burncd/burncd.c b/usr.sbin/burncd/burncd.c index 3bd37fa..5598b6f 100644 --- a/usr.sbin/burncd/burncd.c +++ b/usr.sbin/burncd/burncd.c @@ -501,13 +501,13 @@ do_TAO(int fd, int test_write, int preemp, int dvdrw) #define NTOH3B(x) ((x&0x0000ff)<<16) | (x&0x00ff00) | ((x&0xff0000)>>16) void -do_format(int fd, int force, char *type) +do_format(int the_fd, int force, char *type) { struct cdr_format_capacities capacities; struct cdr_format_params format_params; int count, i, pct, last = 0; - if (ioctl(fd, CDRIOCREADFORMATCAPS, &capacities) == -1) + if (ioctl(the_fd, CDRIOCREADFORMATCAPS, &capacities) == -1) err(EX_IOERR, "ioctl(CDRIOCREADFORMATCAPS)"); if (verbose) { @@ -559,12 +559,12 @@ do_format(int fd, int force, char *type) memcpy(&format_params.format, &capacities.format[i], sizeof(struct cdr_format_capacity)); - if(ioctl(fd, CDRIOCFORMAT, &format_params) == -1) + if(ioctl(the_fd, CDRIOCFORMAT, &format_params) == -1) err(EX_IOERR, "ioctl(CDRIOCFORMAT)"); while (1) { sleep(1); - if (ioctl(fd, CDRIOCGETPROGRESS, &pct) == -1) + if (ioctl(the_fd, CDRIOCGETPROGRESS, &pct) == -1) err(EX_IOERR, "ioctl(CDRIOGETPROGRESS)"); if (pct > 0 && !quiet) fprintf(stderr, "formatting DVD - %d %% done \r", -- cgit v1.1