From 02824f2ad90badfccd8ca483c483615d1526ce95 Mon Sep 17 00:00:00 2001 From: eivind Date: Thu, 6 Aug 1998 21:19:11 +0000 Subject: Don't mess around in OBJDIR for includes, and remove some warnings. --- usr.sbin/dpt/dpt_ctlinfo/Makefile | 4 ++-- usr.sbin/dpt/dpt_ctls/Makefile | 4 ++-- usr.sbin/dpt/dpt_dm/Makefile | 4 ++-- usr.sbin/dpt/dpt_led/Makefile | 4 ++-- usr.sbin/dpt/dpt_led/dpt_led.c | 9 +++++---- usr.sbin/dpt/dpt_sig/Makefile | 4 ++-- usr.sbin/dpt/dpt_sig/dpt_sig.c | 14 ++++++++------ usr.sbin/dpt/dpt_softc/Makefile | 4 ++-- usr.sbin/dpt/dpt_softc/dpt_softc.c | 4 ++-- usr.sbin/dpt/dpt_sysinfo/Makefile | 4 ++-- usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c | 4 ++-- 11 files changed, 31 insertions(+), 28 deletions(-) diff --git a/usr.sbin/dpt/dpt_ctlinfo/Makefile b/usr.sbin/dpt/dpt_ctlinfo/Makefile index 690ed8e..d3e94c7 100644 --- a/usr.sbin/dpt/dpt_ctlinfo/Makefile +++ b/usr.sbin/dpt/dpt_ctlinfo/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.1 1998/01/22 23:32:27 ShimonR Exp ShimonR $ +# $Id: Makefile,v 1.1 1998/01/26 06:20:36 julian Exp $ PROG= dpt_ctlinfo SRCS= dpt_ctlinfo.c -CFLAGS+=-Wall -I../../../sys -I/usr/src/sys +CFLAGS+=-Wall -I${.CURDIR}/../../../sys BINMODE=500 BINOWN= root MAN8= dpt_ctlinfo.8 diff --git a/usr.sbin/dpt/dpt_ctls/Makefile b/usr.sbin/dpt/dpt_ctls/Makefile index 7c2d150..c1357fc 100644 --- a/usr.sbin/dpt/dpt_ctls/Makefile +++ b/usr.sbin/dpt/dpt_ctls/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.1 1998/01/22 22:07:22 ShimonR Exp ShimonR $ +# $Id: Makefile,v 1.1 1998/01/26 06:20:38 julian Exp $ PROG= dpt_ctls SRCS= dpt_ctls.c -CFLAGS+=-Wall -I../../../sys -I/usr/src/sys +CFLAGS+=-Wall -I${.CURDIR}/../../../sys BINMODE=500 BINOWN= root MAN8= dpt_ctls.8 diff --git a/usr.sbin/dpt/dpt_dm/Makefile b/usr.sbin/dpt/dpt_dm/Makefile index bc7b53f..8c37370 100644 --- a/usr.sbin/dpt/dpt_dm/Makefile +++ b/usr.sbin/dpt/dpt_dm/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.4 1998/01/21 17:38:32 ShimonR Exp ShimonR $ +# $Id: Makefile,v 1.1 1998/01/26 06:20:40 julian Exp $ PROG= dpt_dm SRCS= dpt_dm.c -CFLAGS+=-Wall -I../../../sys -I/usr/src/sys +CFLAGS+=-Wall -I${.CURDIR}/../../../sys BINMODE=500 BINOWN= root MAN8= dpt_dm.8 diff --git a/usr.sbin/dpt/dpt_led/Makefile b/usr.sbin/dpt/dpt_led/Makefile index 43a2c2a..484fcbd 100644 --- a/usr.sbin/dpt/dpt_led/Makefile +++ b/usr.sbin/dpt/dpt_led/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.1 1998/01/23 02:45:53 ShimonR Exp ShimonR $ +# $Id: Makefile,v 1.1 1998/01/26 06:26:40 julian Exp $ PROG= dpt_led SRCS= dpt_led.c -CFLAGS+=-Wall -I../../../sys -I/usr/src/sys +CFLAGS+=-Wall -I${.CURDIR}/../../../sys BINMODE=500 BINOWN= root MAN8= dpt_led.8 diff --git a/usr.sbin/dpt/dpt_led/dpt_led.c b/usr.sbin/dpt/dpt_led/dpt_led.c index 70480e4..9304950 100644 --- a/usr.sbin/dpt/dpt_led/dpt_led.c +++ b/usr.sbin/dpt/dpt_led/dpt_led.c @@ -30,7 +30,7 @@ /* dpt_led.c: Show the blinking LED array status of a DPT HBAs */ -#ident "$Id: dpt_led.c,v 1.1 1998/01/23 02:45:53 ShimonR Exp ShimonR $" +#ident "$Id: dpt_led.c,v 1.1 1998/01/26 06:26:41 julian Exp $" #include #include @@ -69,9 +69,10 @@ main(int argc, char **argv, char **argp) pass_thru.command_buffer = (u_int8_t *)&led; if ( (result = ioctl(fd, DPT_IOCTL_SEND, &pass_thru)) != 0 ) { - (void)fprintf(stderr, "%s ERROR: Failed to send IOCTL %x - %s\n", - argv[0], DPT_IOCTL_SEND, - strerror(errno)); + (void)fprintf(stderr, "%s ERROR: Failed to send IOCTL %lx " + "- %s\n", + argv[0], DPT_IOCTL_SEND, + strerror(errno)); exit(1); } diff --git a/usr.sbin/dpt/dpt_sig/Makefile b/usr.sbin/dpt/dpt_sig/Makefile index 3f50486..33bc6da 100644 --- a/usr.sbin/dpt/dpt_sig/Makefile +++ b/usr.sbin/dpt/dpt_sig/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.4 1998/01/21 17:41:39 ShimonR Exp $ +# $Id: Makefile,v 1.1 1998/01/26 06:20:44 julian Exp $ PROG= dpt_sig SRCS= dpt_sig.c -CFLAGS+=-Wall -I../../../sys -I/usr/src/sys +CFLAGS+=-Wall -I${.CURDIR}/../../../sys BINMODE=500 BINOWN= root MAN8= dpt_sig.8 diff --git a/usr.sbin/dpt/dpt_sig/dpt_sig.c b/usr.sbin/dpt/dpt_sig/dpt_sig.c index 340b924..76e648b 100644 --- a/usr.sbin/dpt/dpt_sig/dpt_sig.c +++ b/usr.sbin/dpt/dpt_sig/dpt_sig.c @@ -30,7 +30,7 @@ /* dpt_sig.c: Dunp a DPT Signature */ -#ident "$Id: dpt_sig.c,v 1.6 1998/01/22 22:06:30 ShimonR Exp ShimonR $" +#ident "$Id: dpt_sig.c,v 1.1 1998/01/26 06:20:45 julian Exp $" #include #include @@ -164,8 +164,9 @@ main(int argc, char **argv, char **argp) sp2 = "Unknown"; if ( (fd = open(argv[1], O_RDWR, S_IRUSR | S_IWUSR)) == -1 ) { - (void)fprintf(stderr, "%s ERROR: Failed to open \"%s\" - %s\n", - argv[0], argv[1], strerror(errno)); + (void)fprintf(stderr, "%s ERROR: Failed to open \"%s\" " + "- %s\n", + argv[0], argv[1], strerror(errno)); exit(1); } @@ -177,9 +178,10 @@ main(int argc, char **argv, char **argp) pass_thru.command_buffer = (u_int8_t *)&signature; if ( (result = ioctl(fd, DPT_IOCTL_SEND, &pass_thru)) != 0 ) { - (void)fprintf(stderr, "%s ERROR: Failed to send IOCTL %x - %s\n", - argv[0], DPT_IOCTL_SEND, - strerror(errno)); + (void)fprintf(stderr, "%s ERROR: Failed to send IOCTL " + "%lx - %s\n", + argv[0], DPT_IOCTL_SEND, + strerror(errno)); exit(1); } diff --git a/usr.sbin/dpt/dpt_softc/Makefile b/usr.sbin/dpt/dpt_softc/Makefile index 9977e47..4adddcd 100644 --- a/usr.sbin/dpt/dpt_softc/Makefile +++ b/usr.sbin/dpt/dpt_softc/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.3 1998/01/21 07:50:38 ShimonR Exp ShimonR $ +# $Id: Makefile,v 1.1 1998/01/26 06:20:46 julian Exp $ PROG= dpt_softc SRCS= dpt_softc.c -CFLAGS+=-Wall -I../../../sys -I/usr/src/sys +CFLAGS+=-Wall -I${.CURDIR}/../../../sys BINMODE=500 BINOWN= root MAN8= dpt_softc.8 diff --git a/usr.sbin/dpt/dpt_softc/dpt_softc.c b/usr.sbin/dpt/dpt_softc/dpt_softc.c index 6f1726f..4564791 100644 --- a/usr.sbin/dpt/dpt_softc/dpt_softc.c +++ b/usr.sbin/dpt/dpt_softc/dpt_softc.c @@ -30,7 +30,7 @@ /* dpt_softc.c: Dunp a DPT control structure */ -#ident "$Id: dpt_softc.c,v 1.7 1998/01/22 21:37:40 ShimonR Exp $" +#ident "$Id: dpt_softc.c,v 1.1 1998/01/26 06:20:46 julian Exp $" #include #include @@ -108,7 +108,7 @@ main(int argc, char **argv, char **argp) } if ( (result = ioctl(fd, DPT_IOCTL_SOFTC, &udpt)) != 0 ) { - (void)fprintf(stderr, "%s ERROR: Failed to send IOCTL %x - %s\n", + (void)fprintf(stderr, "%s ERROR: Failed to send IOCTL %lx - %s\n", argv[0], DPT_IOCTL_SOFTC, strerror(errno)); exit(2); diff --git a/usr.sbin/dpt/dpt_sysinfo/Makefile b/usr.sbin/dpt/dpt_sysinfo/Makefile index f5d570a..03c3578 100644 --- a/usr.sbin/dpt/dpt_sysinfo/Makefile +++ b/usr.sbin/dpt/dpt_sysinfo/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $Id: Makefile,v 1.1 1998/01/22 23:32:27 ShimonR Exp ShimonR $ +# $Id: Makefile,v 1.1 1998/01/26 06:20:47 julian Exp $ PROG= dpt_sysinfo SRCS= dpt_sysinfo.c -CFLAGS+=-Wall -I../../../sys -I/usr/src/sys +CFLAGS+=-Wall -I${.CURDIR}/../../../sys BINMODE=500 BINOWN= root MAN8= dpt_sysinfo.8 diff --git a/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c b/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c index 13cfef7..1e6ab14 100644 --- a/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c +++ b/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c @@ -30,7 +30,7 @@ /* dpt_ctlinfo.c: Dunp a DPT HBA Information Block */ -#ident "$Id: dpt_ctlinfo.c,v 1.1 1998/01/22 23:32:27 ShimonR Exp ShimonR $" +#ident "$Id: dpt_sysinfo.c,v 1.1 1998/01/26 06:20:48 julian Exp $" #include #include @@ -73,7 +73,7 @@ main(int argc, char **argv, char **argp) pass_thru.command_buffer = (u_int8_t *)&sysinfo; if ( (result = ioctl(fd, DPT_IOCTL_SEND, &pass_thru)) != 0 ) { - (void)fprintf(stderr, "%s ERROR: Failed to send IOCTL %x - %s\n", + (void)fprintf(stderr, "%s ERROR: Failed to send IOCTL %lx - %s\n", argv[0], DPT_IOCTL_SEND, strerror(errno)); exit(1); -- cgit v1.1