Eliminate use of /*PAGE and clean up formatting

3 files changed, 31 insertions, 65 deletions

diff --git a/doc/tools/bmenu/Makefile.am b/doc/tools/bmenu/Makefile.am
index 80b32d2163..53ca36cd35 100644
--- a/doc/tools/bmenu/Makefile.am
+++ b/doc/tools/bmenu/Makefile.am
@@ -5,5 +5,5 @@
 
 noinst_PROGRAMS = bmenu2
 
-bmenu2_SOURCES = address.h chain.c address.inl chain.h bmenu2.c base.h \
+bmenu2_SOURCES = address.h chain.c chain.h bmenu2.c base.h \
     chain.inl system.h
diff --git a/doc/tools/bmenu/address.h b/doc/tools/bmenu/address.h
index d022b82398..9b19615c74 100644
--- a/doc/tools/bmenu/address.h
+++ b/doc/tools/bmenu/address.h
@@ -1,8 +1,9 @@
-/*  address.h
- *
+/*
  *  This include file contains the information required to manipulate
  *  physical addresses.
- *
+ */
+
+/*
  *  COPYRIGHT (c) 1988-2002.
  *  On-Line Applications Research Corporation (OAR).
  *  All rights reserved.
@@ -22,13 +23,13 @@
  *  It returns the resulting address.  This address is typically
  *  converted to an access type before being used further.
  */
-
 STATIC INLINE void *_Addresses_Add_offset (
   void       *base,
   size_t      offset
-);
-
-#include "address.inl"
+)
+{
+  return (base + offset);
+}
 
 #endif
 /* end of include file */
diff --git a/doc/tools/bmenu/chain.inl b/doc/tools/bmenu/chain.inl
index 7269aa6fab..2ea53edebb 100644
--- a/doc/tools/bmenu/chain.inl
+++ b/doc/tools/bmenu/chain.inl
@@ -1,8 +1,9 @@
-/*  inline/chain.inl
- * 
+/*
  *  This include file contains the bodies of the routines which are
  *  associated with doubly linked chains and inlined.
- *
+ */
+
+/*
  *  COPYRIGHT (c) 1988-2002.
  *  On-Line Applications Research Corporation (OAR).
  *  All rights reserved.
@@ -11,11 +12,9 @@
 #ifndef __INLINE_CHAIN_inl
 #define __INLINE_CHAIN_inl
 
-/*PAGE
- *
+/*
  *  _Chain_Is_null
  */
-
 STATIC INLINE boolean _Chain_Is_null(
   Chain_Control *the_chain
 )
@@ -23,11 +22,9 @@ STATIC INLINE boolean _Chain_Is_null(
   return ( the_chain == NULL );
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Is_null_node
  */
-
 STATIC INLINE boolean _Chain_Is_null_node(
   Chain_Node *the_node
 )
@@ -35,11 +32,9 @@ STATIC INLINE boolean _Chain_Is_null_node(
   return ( the_node == NULL );
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Head
  */
-
 STATIC INLINE Chain_Node *_Chain_Head(
   Chain_Control *the_chain
 )
@@ -47,11 +42,9 @@ STATIC INLINE Chain_Node *_Chain_Head(
    return (Chain_Node *) the_chain;
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Tail
  */
-
 STATIC INLINE Chain_Node *_Chain_Tail(
   Chain_Control *the_chain
 )
@@ -59,11 +52,9 @@ STATIC INLINE Chain_Node *_Chain_Tail(
    return (Chain_Node *) &the_chain->permanent_null;
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Is_empty
  */
-
 STATIC INLINE boolean _Chain_Is_empty(
   Chain_Control *the_chain
 )
@@ -71,11 +62,9 @@ STATIC INLINE boolean _Chain_Is_empty(
   return ( the_chain->first == _Chain_Tail( the_chain ) );
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Is_first
  */
-
 STATIC INLINE boolean _Chain_Is_first(
   Chain_Node *the_node
 )
@@ -83,11 +72,9 @@ STATIC INLINE boolean _Chain_Is_first(
   return ( the_node->previous == NULL );
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Is_last
  */
-
 STATIC INLINE boolean _Chain_Is_last(
   Chain_Node *the_node
 )
@@ -95,11 +82,9 @@ STATIC INLINE boolean _Chain_Is_last(
   return ( the_node->next == NULL );
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Has_only_one_node
  */
-
 STATIC INLINE boolean _Chain_Has_only_one_node(
   Chain_Control *the_chain
 )
@@ -107,11 +92,9 @@ STATIC INLINE boolean _Chain_Has_only_one_node(
   return ( the_chain->first == the_chain->last );
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Is_head
  */
-
 STATIC INLINE boolean _Chain_Is_head(
   Chain_Control *the_chain,
   Chain_Node    *the_node
@@ -120,11 +103,9 @@ STATIC INLINE boolean _Chain_Is_head(
    return ( the_node == _Chain_Head( the_chain ) );
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Is_tail
  */
-
 STATIC INLINE boolean _Chain_Is_tail(
   Chain_Control *the_chain,
   Chain_Node    *the_node
@@ -133,11 +114,9 @@ STATIC INLINE boolean _Chain_Is_tail(
    return ( the_node == _Chain_Tail( the_chain ) );
 }
 
-/*PAGE
- *
+/*
  *  Chain_Initialize_empty
  */
-
 STATIC INLINE void _Chain_Initialize_empty(
   Chain_Control *the_chain
 )
@@ -147,11 +126,9 @@ STATIC INLINE void _Chain_Initialize_empty(
   the_chain->last           = _Chain_Head( the_chain );
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Extract_unprotected
  */
-
 STATIC INLINE void _Chain_Extract_unprotected(
   Chain_Node *the_node
 )
@@ -165,11 +142,9 @@ STATIC INLINE void _Chain_Extract_unprotected(
   previous->next = next;
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Get_first_unprotected
  */
-
 STATIC INLINE Chain_Node *_Chain_Get_first_unprotected( 
   Chain_Control *the_chain
 )
@@ -185,11 +160,9 @@ STATIC INLINE Chain_Node *_Chain_Get_first_unprotected(
   return return_node;
 }
 
-/*PAGE
- *
+/*
  *  Chain_Get_unprotected
  */
-
 STATIC INLINE Chain_Node *_Chain_Get_unprotected( 
   Chain_Control *the_chain
 )
@@ -200,11 +173,9 @@ STATIC INLINE Chain_Node *_Chain_Get_unprotected(
     return NULL;
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Insert_unprotected
  */
-
 STATIC INLINE void _Chain_Insert_unprotected(
   Chain_Node *after_node,
   Chain_Node *the_node
@@ -219,11 +190,9 @@ STATIC INLINE void _Chain_Insert_unprotected(
   before_node->previous = the_node; 
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Append_unprotected
  */
-
 STATIC INLINE void _Chain_Append_unprotected(
   Chain_Control *the_chain,
   Chain_Node    *the_node
@@ -238,11 +207,9 @@ STATIC INLINE void _Chain_Append_unprotected(
   the_node->previous  = old_last_node;
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Prepend_unprotected
  */
-
 STATIC INLINE void _Chain_Prepend_unprotected(
   Chain_Control *the_chain,
   Chain_Node    *the_node
@@ -252,11 +219,9 @@ STATIC INLINE void _Chain_Prepend_unprotected(
 
 }
 
-/*PAGE
- *
+/*
  *  _Chain_Prepend
  */
-
 STATIC INLINE void _Chain_Prepend(
   Chain_Control *the_chain,
   Chain_Node    *the_node