system_cmds-336.6.tar.gz

[apple/system_cmds.git] / ktrace.tproj / subr.c

diff --git a/ktrace.tproj/subr.c b/ktrace.tproj/subr.c
index e5186dd92b41fd411e3bb915c14c08bdbd2a2b19..be7da6840d075bf5ec27d7620faa379107618db0 100644 (file)
--- a/ktrace.tproj/subr.c
+++ b/ktrace.tproj/subr.c
@@ -3,22 +3,21 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * "Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
+ * Reserved.  This file contains Original Code and/or Modifications of
+ * Original Code as defined in and that are subject to the Apple Public
+ * Source License Version 1.0 (the 'License').  You may not use this file
+ * except in compliance with the License.  Please obtain a copy of the
+ * License at http://www.apple.com/publicsource and read it before using
+ * this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License."
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -74,8 +73,8 @@ static const char rcsid[] =
 
 #include "ktrace.h"
 
-getpoints(s)
-       char *s;
+int
+getpoints(char *s)
 {
        int facs = 0;
 
@@ -110,24 +109,24 @@ getpoints(s)
        return (facs);
 }
 
-timevaladd(t1, t2)
-       struct timeval *t1, *t2;
+void 
+timevaladd(struct timeval *t1, struct timeval *t2)
 {
        t1->tv_sec += t2->tv_sec;
        t1->tv_usec += t2->tv_usec;
        timevalfix(t1);
 }
 
-timevalsub(t1, t2)
-       struct timeval *t1, *t2;
+void
+timevalsub(struct timeval *t1, struct timeval *t2)
 {
        t1->tv_sec -= t2->tv_sec;
        t1->tv_usec -= t2->tv_usec;
        timevalfix(t1);
 }
 
-timevalfix(t1)
-       struct timeval *t1;
+void
+timevalfix(struct timeval *t1)
 {
        if (t1->tv_usec < 0) {
                t1->tv_sec--;