diff options
| -rw-r--r-- | usr.sbin/mopd/common/file.c | 5 | ||||
| -rw-r--r-- | usr.sbin/mopd/common/mopdef.c | 16 | ||||
| -rw-r--r-- | usr.sbin/mopd/common/mopdef.h | 14 | ||||
| -rw-r--r-- | usr.sbin/mopd/common/print.c | 6 | ||||
| -rw-r--r-- | usr.sbin/mopd/mopd/process.c | 10 |
5 files changed, 26 insertions, 25 deletions
diff --git a/usr.sbin/mopd/common/file.c b/usr.sbin/mopd/common/file.c index b0e2bb51ec2..808cfd83ad0 100644 --- a/usr.sbin/mopd/common/file.c +++ b/usr.sbin/mopd/common/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.4 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: file.c,v 1.5 2002/09/07 07:58:21 maja Exp $ */ /* * Copyright (c) 1995-96 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: file.c,v 1.4 2001/08/12 12:03:03 heko Exp $"; +static char rcsid[] = "$OpenBSD: file.c,v 1.5 2002/09/07 07:58:21 maja Exp $"; #endif #include "os.h" @@ -578,6 +578,7 @@ GetAOutFileInfo(fd, load, xfr, a_text, a_text_fill, break; #endif default: + break; } printf(") Magic: "); switch (N_GETMAGIC (ex)) { diff --git a/usr.sbin/mopd/common/mopdef.c b/usr.sbin/mopd/common/mopdef.c index 742ad2b4251..988c955b4e1 100644 --- a/usr.sbin/mopd/common/mopdef.c +++ b/usr.sbin/mopd/common/mopdef.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopdef.c,v 1.2 1996/09/21 19:11:40 maja Exp $ */ +/* $OpenBSD: mopdef.c,v 1.3 2002/09/07 07:58:21 maja Exp $ */ /* * Copyright (c) 1995 Mats O Jansson. All rights reserved. @@ -30,17 +30,19 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: mopdef.c,v 1.2 1996/09/21 19:11:40 maja Exp $"; +static char rcsid[] = "$OpenBSD: mopdef.c,v 1.3 2002/09/07 07:58:21 maja Exp $"; #endif +#include <sys/types.h> + #define MOPDEF_SURPESS_EXTERN #include "common/mopdef.h" -char dl_mcst[6] = MOP_DL_MULTICAST; /* Dump/Load Multicast */ -char rc_mcst[6] = MOP_RC_MULTICAST; /* Remote Console Multicast */ -char dl_802_proto[5] = MOP_K_PROTO_802_DL; /* MOP Dump/Load 802.2 */ -char rc_802_proto[5] = MOP_K_PROTO_802_RC; /* MOP Remote Console 802.2 */ -char lp_802_proto[5] = MOP_K_PROTO_802_LP; /* Loopback 802.2 */ +u_char dl_mcst[6] = MOP_DL_MULTICAST; /* Dump/Load Multicast */ +u_char rc_mcst[6] = MOP_RC_MULTICAST; /* Remote Console Multicast */ +u_char dl_802_proto[5] = MOP_K_PROTO_802_DL; /* MOP Dump/Load 802.2 */ +u_char rc_802_proto[5] = MOP_K_PROTO_802_RC; /* MOP Remote Console 802.2 */ +u_char lp_802_proto[5] = MOP_K_PROTO_802_LP; /* Loopback 802.2 */ int mopdef_dummy() diff --git a/usr.sbin/mopd/common/mopdef.h b/usr.sbin/mopd/common/mopdef.h index a18f89d9102..33c34f51937 100644 --- a/usr.sbin/mopd/common/mopdef.h +++ b/usr.sbin/mopd/common/mopdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mopdef.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: mopdef.h,v 1.4 2002/09/07 07:58:21 maja Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $OpenBSD: mopdef.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: mopdef.h,v 1.4 2002/09/07 07:58:21 maja Exp $ * */ @@ -188,11 +188,11 @@ #define L_BBLK 0xf0 /* RSX header block count */ #ifndef MOPDEF_SUPRESS_EXTERN -extern char dl_mcst[]; -extern char rc_mcst[]; -extern char dl_802_proto[]; -extern char rc_802_proto[]; -extern char lp_802_proto[]; +extern u_char dl_mcst[]; +extern u_char rc_mcst[]; +extern u_char dl_802_proto[]; +extern u_char rc_802_proto[]; +extern u_char lp_802_proto[]; #endif /* MOPDEF_SUPRESS_EXTERN */ #endif /* _MOPDEF_H_ */ diff --git a/usr.sbin/mopd/common/print.c b/usr.sbin/mopd/common/print.c index 8404c5b8c72..b8f3cb05e4e 100644 --- a/usr.sbin/mopd/common/print.c +++ b/usr.sbin/mopd/common/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.3 1999/03/27 14:31:21 maja Exp $ */ +/* $OpenBSD: print.c,v 1.4 2002/09/07 07:58:21 maja Exp $ */ /* * Copyright (c) 1993-96 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: print.c,v 1.3 1999/03/27 14:31:21 maja Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.4 2002/09/07 07:58:21 maja Exp $"; #endif #include <sys/types.h> @@ -76,7 +76,7 @@ mopPrintBPTY(fd, bpty) (void)fprintf(fd, "Unknown"); break; }; -}; +} void mopPrintPGTY(fd, pgty) diff --git a/usr.sbin/mopd/mopd/process.c b/usr.sbin/mopd/mopd/process.c index 223879349ed..46da70c919a 100644 --- a/usr.sbin/mopd/mopd/process.c +++ b/usr.sbin/mopd/mopd/process.c @@ -1,4 +1,4 @@ -/* $OpenBSD: process.c,v 1.9 2002/07/13 10:13:27 deraadt Exp $ */ +/* $OpenBSD: process.c,v 1.10 2002/09/07 07:58:21 maja Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: process.c,v 1.9 2002/07/13 10:13:27 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: process.c,v 1.10 2002/09/07 07:58:21 maja Exp $"; #endif #include "os.h" @@ -50,8 +50,6 @@ extern u_char buf[]; extern int DebugFlag; struct dllist dllist[MAXDL]; /* dump/load list */ -extern char dl_mcst[]; /* Dump/Load Multicast */ -extern char rc_mcst[]; /* Remote Console Multicast */ void mopProcessInfo(pkt,index,moplen,dl_rpr,trans) @@ -389,7 +387,7 @@ mopNextLoad(dst, src, new_count, trans) mopPutChar (pkt,&index,dllist[slot].count); mopPutChar (pkt,&index,MOP_K_PLTP_HSN); mopPutChar (pkt,&index,3); - mopPutMulti(pkt,&index,"ipc",3); + mopPutMulti(pkt,&index,(u_char *) "ipc",3); mopPutChar (pkt,&index,MOP_K_PLTP_HSA); mopPutChar (pkt,&index,6); mopPutMulti(pkt,&index,src,6); @@ -502,7 +500,7 @@ mopProcessDL(fd, ii, pkt, index, dst, src, trans, len) /* to ask. My solution is to use the ethernet addr */ /* as filename. Implementing a database would be */ /* overkill. */ - snprintf(pfile,sizeof pfile, + snprintf((char *)pfile,sizeof pfile, "%02x%02x%02x%02x%02x%02x%c", src[0],src[1],src[2],src[3],src[4],src[5],0); } |