pedantically ANSI, i.e., nothing after #else/#endif

SCCS-vsn: sys/hp300/include/pmap.h 7.12
SCCS-vsn: sys/vm/vm_page.h 7.11
SCCS-vsn: sys/vm/vm_kern.c 7.11
SCCS-vsn: sys/vm/vm_fault.c 7.18
SCCS-vsn: sys/vm/vm_object.c 7.14
SCCS-vsn: sys/vm/vm_glue.c 7.24
SCCS-vsn: sys/vm/vm_map.c 7.9
SCCS-vsn: sys/net/if.c 7.26
SCCS-vsn: sys/net/radix.c 7.19
SCCS-vsn: sys/net/if_ethersubr.c 7.25
SCCS-vsn: sys/netinet/tcp_subr.c 7.27
SCCS-vsn: sys/kern/tty_subr.c 7.12

diff --git a/usr/src/sys/hp300/include/pmap.h b/usr/src/sys/hp300/include/pmap.h
index 2b62974..f4347b5 100644 (file)
--- a/usr/src/sys/hp300/include/pmap.h
+++ b/usr/src/sys/hp300/include/pmap.h
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)pmap.h      7.11 (Berkeley) %G%
+ *     @(#)pmap.h      7.12 (Berkeley) %G%

  */
 
 #ifndef        _PMAP_MACHINE_
  */
 
 #ifndef        _PMAP_MACHINE_


@@ -107,6 +107,6 @@ pv_entry_t  pv_table;               /* array of entries, one per page */
 
 extern struct pte *Sysmap;
 extern char *vmmap;                    /* map for mem, dumps, etc. */
 
 extern struct pte *Sysmap;
 extern char *vmmap;                    /* map for mem, dumps, etc. */

-#endif KERNEL
+#endif /* KERNEL */

 
 

-#endif _PMAP_MACHINE_
+#endif /* _PMAP_MACHINE_ */

diff --git a/usr/src/sys/kern/tty_subr.c b/usr/src/sys/kern/tty_subr.c
index c13f013..fef0757 100644 (file)
--- a/usr/src/sys/kern/tty_subr.c
+++ b/usr/src/sys/kern/tty_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.proprietary.c%
  *
  *
  * %sccs.include.proprietary.c%
  *

- *     @(#)tty_subr.c  7.11 (Berkeley) %G%
+ *     @(#)tty_subr.c  7.12 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -560,4 +560,4 @@ putw(c, p)
        splx(s);
        return (0);
 }
        splx(s);
        return (0);
 }

-#endif unneeded
+#endif /* unneeded */

diff --git a/usr/src/sys/net/if.c b/usr/src/sys/net/if.c
index 06c4c18..6217386 100644 (file)
--- a/usr/src/sys/net/if.c
+++ b/usr/src/sys/net/if.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)if.c        7.25 (Berkeley) %G%
+ *     @(#)if.c        7.26 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -339,7 +339,7 @@ if_up(ifp)
        /* this has no effect on IP, and will kill all iso connections XXX */
        for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
                pfctlinput(PRC_IFUP, ifa->ifa_addr);
        /* this has no effect on IP, and will kill all iso connections XXX */
        for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
                pfctlinput(PRC_IFUP, ifa->ifa_addr);

-#endif notyet
+#endif

        rt_ifmsg(ifp);
 }
 
        rt_ifmsg(ifp);
 }
 

diff --git a/usr/src/sys/net/if_ethersubr.c b/usr/src/sys/net/if_ethersubr.c
index c0ed00b..f7e9ce3 100644 (file)
--- a/usr/src/sys/net/if_ethersubr.c
+++ b/usr/src/sys/net/if_ethersubr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)if_ethersubr.c      7.24 (Berkeley) %G%
+ *     @(#)if_ethersubr.c      7.25 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -175,7 +175,7 @@ ether_output(ifp, m0, dst, rt0)
                        printf("\n");
                ENDDEBUG
                } break;
                        printf("\n");
                ENDDEBUG
                } break;

-#endif ISO
+#endif /* ISO */

 #ifdef LLC
 /*     case AF_NSAP: */
        case AF_CCITT: {
 #ifdef LLC
 /*     case AF_NSAP: */
        case AF_CCITT: {


@@ -212,9 +212,9 @@ ether_output(ifp, m0, dst, rt0)
                               l->llc_control & 0xff);
 
                }
                               l->llc_control & 0xff);
 
                }

-#endif LLC_DEBUG
+#endif /* LLC_DEBUG */

                } break;
                } break;

-#endif/* LLC */        
+#endif /* LLC */       

 
        case AF_UNSPEC:
                eh = (struct ether_header *)dst->sa_data;
 
        case AF_UNSPEC:
                eh = (struct ether_header *)dst->sa_data;


@@ -405,7 +405,7 @@ ether_input(ifp, eh, m)
                        mtod(m, struct sdl_hdr *)->sdlhdr_len = eh->ether_type;
 #ifdef LLC_DEBUG
                                printf("llc packet\n");
                        mtod(m, struct sdl_hdr *)->sdlhdr_len = eh->ether_type;
 #ifdef LLC_DEBUG
                                printf("llc packet\n");

-#endif LLC_DEBUG
+#endif /* LLC_DEBUG */

                        schednetisr(NETISR_CCITT);
                        inq = &llcintrq;
                        break;
                        schednetisr(NETISR_CCITT);
                        inq = &llcintrq;
                        break;

diff --git a/usr/src/sys/net/radix.c b/usr/src/sys/net/radix.c
index 323f7bb..b0a3bd5 100644 (file)
--- a/usr/src/sys/net/radix.c
+++ b/usr/src/sys/net/radix.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)radix.c     7.18 (Berkeley) %G%
+ *     @(#)radix.c     7.19 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -550,7 +550,7 @@ on1:
        /* Get us out of the creation list */
        for (t = rn_clist; t && t->rn_ybro != tt; t = t->rn_ybro) {}
        if (t) t->rn_ybro = tt->rn_ybro;
        /* Get us out of the creation list */
        for (t = rn_clist; t && t->rn_ybro != tt; t = t->rn_ybro) {}
        if (t) t->rn_ybro = tt->rn_ybro;

-#endif RN_DEBUG
+#endif

        t = tt->rn_p;
        if (dupedkey) {
                if (tt == saved_tt) {
        t = tt->rn_p;
        if (dupedkey) {
                if (tt == saved_tt) {

diff --git a/usr/src/sys/netinet/tcp_subr.c b/usr/src/sys/netinet/tcp_subr.c
index ef1a026..d81a3d6 100644 (file)
--- a/usr/src/sys/netinet/tcp_subr.c
+++ b/usr/src/sys/netinet/tcp_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tcp_subr.c  7.26 (Berkeley) %G%
+ *     @(#)tcp_subr.c  7.27 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -315,7 +315,7 @@ tcp_close(tp)
                                rt->rt_rmx.rmx_ssthresh = i;
                }
        }
                                rt->rt_rmx.rmx_ssthresh = i;
                }
        }

-#endif RTV_RTT
+#endif /* RTV_RTT */

        /* free the reassembly queue, if any */
        t = tp->seg_next;
        while (t != (struct tcpiphdr *)tp) {
        /* free the reassembly queue, if any */
        t = tp->seg_next;
        while (t != (struct tcpiphdr *)tp) {

diff --git a/usr/src/sys/vm/vm_fault.c b/usr/src/sys/vm/vm_fault.c
index fec739a..0fac602 100644 (file)
--- a/usr/src/sys/vm/vm_fault.c
+++ b/usr/src/sys/vm/vm_fault.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_fault.c  7.17 (Berkeley) %G%
+ *     @(#)vm_fault.c  7.18 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -933,7 +933,7 @@ void vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry)
 
 #ifdef lint
        src_map++;
 
 #ifdef lint
        src_map++;

-#endif lint
+#endif

 
        src_object = src_entry->object.vm_object;
        src_offset = src_entry->offset;
 
        src_object = src_entry->object.vm_object;
        src_offset = src_entry->offset;

diff --git a/usr/src/sys/vm/vm_glue.c b/usr/src/sys/vm/vm_glue.c
index 4a19f9c..49d59e4 100644 (file)
--- a/usr/src/sys/vm/vm_glue.c
+++ b/usr/src/sys/vm/vm_glue.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_glue.c   7.23 (Berkeley) %G%
+ *     @(#)vm_glue.c   7.24 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -144,7 +144,7 @@ vsunlock(addr, len, dirtied)
 {
 #ifdef lint
        dirtied++;
 {
 #ifdef lint
        dirtied++;

-#endif lint
+#endif

        vm_map_pageable(&curproc->p_vmspace->vm_map, trunc_page(addr),
                        round_page(addr+len-1), TRUE);
 }
        vm_map_pageable(&curproc->p_vmspace->vm_map, trunc_page(addr),
                        round_page(addr+len-1), TRUE);
 }

diff --git a/usr/src/sys/vm/vm_kern.c b/usr/src/sys/vm/vm_kern.c
index 7339450..c56ccf2 100644 (file)
--- a/usr/src/sys/vm/vm_kern.c
+++ b/usr/src/sys/vm/vm_kern.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_kern.c   7.10 (Berkeley) %G%
+ *     @(#)vm_kern.c   7.11 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -65,7 +65,7 @@ vm_offset_t kmem_alloc_pageable(map, size)
 #if    0
        if (map != kernel_map)
                panic("kmem_alloc_pageable: not called with kernel_map");
 #if    0
        if (map != kernel_map)
                panic("kmem_alloc_pageable: not called with kernel_map");

-#endif 0
+#endif

 
        size = round_page(size);
 
 
        size = round_page(size);
 

diff --git a/usr/src/sys/vm/vm_map.c b/usr/src/sys/vm/vm_map.c
index 4c228cd..5b90af7 100644 (file)
--- a/usr/src/sys/vm/vm_map.c
+++ b/usr/src/sys/vm/vm_map.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_map.c    7.8 (Berkeley) %G%
+ *     @(#)vm_map.c    7.9 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -678,7 +678,7 @@ void vm_map_simplify_entry(map, entry)
 {
 #ifdef lint
        map++;
 {
 #ifdef lint
        map++;

-#endif lint
+#endif

 
        /*
         *      If this entry corresponds to a sharing map, then
 
        /*
         *      If this entry corresponds to a sharing map, then


@@ -707,7 +707,7 @@ void vm_map_simplify_entry(map, entry)
                         * Later.
                         */
                }
                         * Later.
                         */
                }

-#endif 0
+#endif

        }
        else {
                /*
        }
        else {
                /*

diff --git a/usr/src/sys/vm/vm_object.c b/usr/src/sys/vm/vm_object.c
index 1737ebc..a86b8c2 100644 (file)
--- a/usr/src/sys/vm/vm_object.c
+++ b/usr/src/sys/vm/vm_object.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_object.c 7.13 (Berkeley) %G%
+ *     @(#)vm_object.c 7.14 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -854,7 +854,7 @@ void vm_object_setpager(object, pager, paging_offset,
 {
 #ifdef lint
        read_only++;    /* No longer used */
 {
 #ifdef lint
        read_only++;    /* No longer used */

-#endif lint
+#endif

 
        vm_object_lock(object);                 /* XXX ? */
        object->pager = pager;
 
        vm_object_lock(object);                 /* XXX ? */
        object->pager = pager;


@@ -1337,7 +1337,7 @@ boolean_t vm_object_coalesce(prev_object, next_object,
 
 #ifdef lint
        next_offset++;
 
 #ifdef lint
        next_offset++;

-#endif lint
+#endif

 
        if (next_object != NULL) {
                return(FALSE);
 
        if (next_object != NULL) {
                return(FALSE);

diff --git a/usr/src/sys/vm/vm_page.h b/usr/src/sys/vm/vm_page.h
index 595bb2b..193db54 100644 (file)
--- a/usr/src/sys/vm/vm_page.h
+++ b/usr/src/sys/vm/vm_page.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_page.h   7.10 (Berkeley) %G%
+ *     @(#)vm_page.h   7.11 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -112,9 +112,9 @@ struct vm_page {
                (PG_ACTIVE | PG_INACTIVE))) \
                panic("vm_page_check: not valid!"); \
 }
                (PG_ACTIVE | PG_INACTIVE))) \
                panic("vm_page_check: not valid!"); \
 }

-#else  VM_PAGE_DEBUG
+#else /* VM_PAGE_DEBUG */

 #define        VM_PAGE_CHECK(mem)
 #define        VM_PAGE_CHECK(mem)

-#endif VM_PAGE_DEBUG
+#endif /* VM_PAGE_DEBUG */

 
 #ifdef KERNEL
 /*
 
 #ifdef KERNEL
 /*