Remove support for Solaris pre-8

[openafs.git] / src / afs / afs_error.c

diff --git a/src/afs/afs_error.c b/src/afs/afs_error.c
index 626c1bb..89edbbc 100644 (file)
--- a/src/afs/afs_error.c
+++ b/src/afs/afs_error.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -13,8 +13,6 @@
 #include <afsconfig.h>
 #include "afs/param.h"
 
-RCSID
-    ("$Header$");
 
 #include "afs/stds.h"
 #include "afs/sysincludes.h"   /* Standard vendor system headers */
@@ -28,7 +26,7 @@ RCSID
 #ifdef AFS_SGI62_ENV
 #include "h/hashing.h"
 #endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN_ENV)
 #include <netinet/in_var.h>
 #endif
 #endif /* !UKERNEL */
@@ -38,12 +36,10 @@ RCSID
 #include "afs/afs_util.h"
 #include "afs/unified_afs.h"
 
-#if    defined(AFS_SUN56_ENV)
+#if    defined(AFS_SUN5_ENV)
 #include <inet/led.h>
 #include <inet/common.h>
-#if     defined(AFS_SUN58_ENV)
 #include <netinet/ip6.h>
-#endif
 #include <inet/ip.h>
 #endif
 
@@ -207,14 +203,14 @@ et_to_sys_error(afs_int32 in)
 }
 
 void
-afs_CopyError(register struct vrequest *afrom, register struct vrequest *ato)
+afs_CopyError(struct vrequest *afrom, struct vrequest *ato)
 {
     int i = 0;
     AFS_STATCNT(afs_CopyError);
     if (!afrom->initd)
        return;
     afs_FinalizeReq(ato);
-    while (i < MAXHOSTS) {
+    while (i < AFS_MAXHOSTS) {
        ato->skipserver[i] = afrom->skipserver[i];
        i++;
     }
@@ -234,13 +230,13 @@ afs_CopyError(register struct vrequest *afrom, register struct vrequest *ato)
 }
 
 void
-afs_FinalizeReq(register struct vrequest *areq)
+afs_FinalizeReq(struct vrequest *areq)
 {
     int i = 0;
     AFS_STATCNT(afs_FinalizeReq);
     if (areq->initd)
        return;
-    while (i < MAXHOSTS) {
+    while (i < AFS_MAXHOSTS) {
        areq->skipserver[i] = 0;
        i++;
     }