checkpoint further progress, still doesn't connect tho.

[unix-history] / usr / src / sys / netiso / clnp_debug.c

diff --git a/usr/src/sys/netiso/clnp_debug.c b/usr/src/sys/netiso/clnp_debug.c
index c0772b0..1dd56f6 100644 (file)
--- a/usr/src/sys/netiso/clnp_debug.c
+++ b/usr/src/sys/netiso/clnp_debug.c
@@ -1,3 +1,12 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)clnp_debug.c        7.10 (Berkeley) %G%
+ */
+

 /***********************************************************
                Copyright IBM Corporation 1987
 
 /***********************************************************
                Copyright IBM Corporation 1987
 


@@ -26,28 +35,22 @@ SOFTWARE.
  */
 /* $Header: clnp_debug.c,v 4.2 88/06/29 14:58:34 hagens Exp $ */
 /* $Source: /usr/argo/sys/netargo/RCS/clnp_debug.c,v $ */
  */
 /* $Header: clnp_debug.c,v 4.2 88/06/29 14:58:34 hagens Exp $ */
 /* $Source: /usr/argo/sys/netargo/RCS/clnp_debug.c,v $ */

-/*     @(#)clnp_debug.c        7.4 (Berkeley) %G% */
-
-#ifndef lint
-static char *rcsid = "$Header: clnp_debug.c,v 4.2 88/06/29 14:58:34 hagens Exp $";
-#endif lint

 
 

-#include "types.h"
-#include "param.h"
-#include "mbuf.h"
-#include "domain.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "errno.h"
+#include <sys/param.h>
+#include <sys/mbuf.h>
+#include <sys/domain.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/errno.h>

 
 

-#include "../net/if.h"
-#include "../net/route.h"
+#include <net/if.h>
+#include <net/route.h>

 
 

-#include "iso.h"
-#include "clnp.h"
-#include "clnp_stat.h"
-#include "argo_debug.h"
+#include <netiso/iso.h>
+#include <netiso/clnp.h>
+#include <netiso/clnp_stat.h>
+#include <netiso/argo_debug.h>

 
 #ifdef ARGO_DEBUG
 
 
 #ifdef ARGO_DEBUG
 


@@ -112,14 +115,15 @@ static char letters[] = "0123456789abcdef";
 char *
 clnp_hexp(src, len, where)
 char   *src;           /* src of data to print */
 char *
 clnp_hexp(src, len, where)
 char   *src;           /* src of data to print */

-int            len;            /* lengthof src */
+int            len;                            /* lengthof src */

 char   *where;         /* where to put data */
 {
        int i;
 
        for (i=0; i<len; i++) {
 char   *where;         /* where to put data */
 {
        int i;
 
        for (i=0; i<len; i++) {

-               *where++ = letters[src[i] >> 4];
-               *where++ = letters[src[i] & 0x0f];
+               register int j = ((u_char *)src)[i];
+               *where++ = letters[j >> 4];
+               *where++ = letters[j & 0x0f];

        }
        return where;
 }
        }
        return where;
 }


@@ -137,7 +141,7 @@ struct iso_addr *isoa;
        char    *cp;
 
        /* print length */
        char    *cp;
 
        /* print length */

-       clnp_sprintf(iso_addr_b, "[%d] ", isoa->isoa_len);
+       sprintf(iso_addr_b, "[%d] ", isoa->isoa_len);

 
        /* set cp to end of what we have */
        cp = iso_addr_b;
 
        /* set cp to end of what we have */
        cp = iso_addr_b;


@@ -181,7 +185,7 @@ struct iso_addr *isoa;
                                cp = clnp_hexp(&o986->o986_vers, 1, cp);
                                *cp++ = DELIM;
 #ifdef  vax
                                cp = clnp_hexp(&o986->o986_vers, 1, cp);
                                *cp++ = DELIM;
 #ifdef  vax

-                               clnp_sprintf(cp, "%d.%d.%d.%d.%d", 
+                               sprintf(cp, "%d.%d.%d.%d.%d", 

                                o986->o986_inetaddr[0] & 0xff,
                                o986->o986_inetaddr[1] & 0xff,
                                o986->o986_inetaddr[2] & 0xff,
                                o986->o986_inetaddr[0] & 0xff,
                                o986->o986_inetaddr[1] & 0xff,
                                o986->o986_inetaddr[2] & 0xff,


@@ -227,95 +231,4 @@ register struct sockaddr_iso *s;
        return (iso_addr_b);
 }
 
        return (iso_addr_b);
 }
 

-
-/*
- *             The following hacks are a trimmed down version of sprintf.
- */
-/*VARARGS1*/
-/*ARGSUSED*/
-clnp_sprintf(buf, fmt, x1, x2)
-       register char *buf, *fmt;
-       unsigned x1, x2;
-{
-       clnp_prf(buf, fmt, (unsigned int *)&x1);
-}
-
-clnp_prf(buf, fmt, adx)
-       register char   *buf;
-       register char *fmt;
-       register unsigned int *adx;
-{
-       register int b, c, i;
-       char *s;
-       char *clnp_printn();
-
-loop:
-       while ((c = *fmt++) != '%') {
-               if(c == '\0') {
-                       *buf++ = (char)0;
-                       return;
-               }
-               *buf++ = c;
-       }
-again:
-       c = *fmt++;
-       switch (c) {
-       case 'l':
-               goto again;
-       case 'x': case 'X':
-               b = 16;
-               goto number;
-       case 'd': case 'D':
-       case 'u':               /* what a joke */
-               b = 10;
-               goto number;
-       case 'o': case 'O':
-               b = 8;
-number:
-               buf = clnp_printn((unsigned long)*adx, b, buf);
-               break;
-       case 'c':
-               b = *adx;
-               for (i = 24; i >= 0; i -= 8)
-                       if (c = (b >> i) & 0x7f)
-                               *buf++ = c;
-               break;
-
-       case 's':
-               s = (char *)*adx;
-               while (*s)
-                       *buf++ = *s++;
-               break;
-
-       case '%':
-               *buf++ = '%';
-               break;
-       }
-       adx++;
-       goto loop;
-}
-
-char *
-clnp_printn(n, b, where)
-unsigned long  n;
-int            b;
-char   *where;
-{
-       char prbuf[11];
-       register char *cp;
-
-       if (b == 10 && (int)n < 0) {
-               *where++ = '-';
-               n = (unsigned)(-(int)n);
-       }
-       cp = prbuf;
-       do {
-               *cp++ = "0123456789abcdef"[n%b];
-               n /= b;
-       } while (n);
-       do {
-               *where++ = *--cp;
-       } while (cp > prbuf);
-       return(where);
-}

 #endif ARGO_DEBUG
 #endif ARGO_DEBUG