Two patches from the HARP people:

Various Makefile related fixes.

-Wformat fixes.

Submitted by:	Mike Spengler <mks@networkcs.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 088503a..977ed9b 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni.c,v 1.4 1998/06/29 19:39:10 jpt Exp $
+ *	@(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef	lint
-static char *RCSid = "@(#) $Id: eni.c,v 1.4 1998/06/29 19:39:10 jpt Exp $";
+static char *RCSid = "@(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $";
 #endif
 
 #include <netatm/kern_include.h>
@@ -496,7 +496,7 @@ eni_pci_attach ( pcici_t config_id, int unit )
 	 * Make a hw version number from the ID register values.
 	 * Format: {Midway ID}.{Mother board ID}.{Daughter board ID}
 	 */
-	sprintf ( eup->eu_config.ac_hard_vers, "%d/%d/%d",
+	sprintf ( eup->eu_config.ac_hard_vers, "%ld/%ld/%ld",
 	    (val >> ID_SHIFT) & ID_MASK,
 		(val >> MID_SHIFT) & MID_MASK,
 			(val >> DID_SHIFT) & DID_MASK );
@@ -504,7 +504,7 @@ eni_pci_attach ( pcici_t config_id, int unit )
 	/*
 	 * There is no software version number
 	 */
-	sprintf ( eup->eu_config.ac_firm_vers, "\0" );
+	eup->eu_config.ac_firm_vers[0] = '\0';
 
 	/*
 	 * Save device ram info for user-level programs
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index e0a5642..44a6790 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_intr.c,v 1.4 1998/08/26 23:28:54 mks Exp $
+ *	@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $Id: eni_intr.c,v 1.4 1998/08/26 23:28:54 mks Exp $";
+static char *RCSid = "@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
 #endif
 
 #include <netatm/kern_include.h>
@@ -174,7 +174,7 @@ eni_intr ( arg )
 	 * Handle miscelaneous interrupts
 	 */
 	if ( mask & ENI_INT_STAT ) {			/* STAT_OVFL */
-		log ( LOG_INFO, "eni_intr: stat_ovfl: 0x%x\n", sval );
+		log ( LOG_INFO, "eni_intr: stat_ovfl: 0x%lx\n", sval );
 	}
 	if ( mask & ENI_INT_SUNI ) {			/* SUNI_INTR */
 		eni_suni_intr ( eup );
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 097f297..94ce8c4 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_receive.c,v 1.13 1998/08/07 22:14:13 mks Exp $
+ *	@(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $Id: eni_receive.c,v 1.13 1998/08/07 22:14:13 mks Exp $";
+static char *RCSid = "@(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
 #endif
 
 #include <netatm/kern_include.h>
@@ -852,7 +852,7 @@ eni_recv_stack ( tok, m )
 	if ( !m ) {
 #ifdef	DO_LOG
 		log ( LOG_ERR,
-			"eni_recv_stack: NULL buffer, tok = 0x%x\n", tok );
+			"eni_recv_stack: NULL buffer, tok = %p\n", tok );
 #endif
 		return;
 	}