include file for per-architecture Makefiles

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

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

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


@@ -37,10 +46,6 @@ SOFTWARE.
  * from the tracing when the kernel got too big to boot.
  */
 
  * from the tracing when the kernel got too big to boot.
  */
 

-#ifndef lint
-static char *rcsid = "$Header: tp_trace.c,v 5.3 88/11/18 17:29:14 nhall Exp $";
-#endif lint
-

 #define TP_TRACEFILE
 
 #include "param.h"
 #define TP_TRACEFILE
 
 #include "param.h"


@@ -50,15 +55,15 @@ static char *rcsid = "$Header: tp_trace.c,v 5.3 88/11/18 17:29:14 nhall Exp $";
 #include "types.h"
 #include "time.h"
 
 #include "types.h"
 #include "time.h"
 

-#include "../netiso/tp_param.h"
-#include "../netiso/tp_timer.h"
-#include "../netiso/tp_stat.h"
-#include "../netiso/tp_param.h"
-#include "../netiso/tp_ip.h"
-#include "../netiso/tp_pcb.h"
-#include "../netiso/tp_tpdu.h"
-#include "../netiso/argo_debug.h"
-#include "../netiso/tp_trace.h"
+#include "tp_param.h"
+#include "tp_timer.h"
+#include "tp_stat.h"
+#include "tp_param.h"
+#include "tp_ip.h"
+#include "tp_pcb.h"
+#include "tp_tpdu.h"
+#include "argo_debug.h"
+#include "tp_trace.h"

 
 #ifdef TPPT
 static tp_seq = 0;
 
 #ifdef TPPT
 static tp_seq = 0;


@@ -98,7 +103,7 @@ tpTrace(tpcb, event, arg, src, len, arg4, arg5)
 
        case TPPTertpdu:
                bcopy((caddr_t)src, (caddr_t)&tp->tpt_ertpdu,
 
        case TPPTertpdu:
                bcopy((caddr_t)src, (caddr_t)&tp->tpt_ertpdu,

-                       MIN((int)len, sizeof(struct tp_Trace)));
+                       (unsigned)MIN((int)len, sizeof(struct tp_Trace)));

                break;
 
        case TPPTusrreq:
                break;
 
        case TPPTusrreq:


@@ -106,7 +111,7 @@ tpTrace(tpcb, event, arg, src, len, arg4, arg5)
 
                /* arg is a string */
                bcopy((caddr_t)arg, (caddr_t)tp->tpt_str, 
 
                /* arg is a string */
                bcopy((caddr_t)arg, (caddr_t)tp->tpt_str, 

-                       MIN(1+strlen((caddr_t) arg), TPTRACE_STRLEN));
+                       (unsigned)MIN(1+strlen((caddr_t) arg), TPTRACE_STRLEN));

                tp->tpt_m2 = src; 
                tp->tpt_m3 = len;
                tp->tpt_m4 = arg4;
                tp->tpt_m2 = src; 
                tp->tpt_m3 = len;
                tp->tpt_m4 = arg4;


@@ -137,8 +142,8 @@ tpTrace(tpcb, event, arg, src, len, arg4, arg5)
        case TPPTtpduin:
        case TPPTtpduout:
                tp->tpt_arg2 = arg4;
        case TPPTtpduin:
        case TPPTtpduout:
                tp->tpt_arg2 = arg4;

-               bcopy((caddr_t)src, (caddr_t)&tp->tpt_tpdu, MIN((int)len, 
-                       sizeof(struct tp_Trace)));
+               bcopy((caddr_t)src, (caddr_t)&tp->tpt_tpdu,
+                     (unsigned)MIN((int)len, sizeof(struct tp_Trace)));

                break;
        }
 }
                break;
        }
 }