ChangeLogTag:Thu Sep 14 11:59:48 2000 Ossama Othman <ossama@uci.edu>

11 files changed, 154 insertions, 93 deletions

diff --git a/ChangeLog b/ChangeLog
index b3b48677040..c4cc86b39f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Thu Sep 14 11:59:48 2000  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Local_Name_Space_T.cpp (resolve_i, unbind_i):
+	* ace/Local_Tokens.cpp (acquire, tryacquire, renew):
+	* ace/Message_Queue_T.cpp (enqueue_prio, enqueue_head,
+	  enqueue_tail, next): 
+	* ace/Stream.cpp (open):
+	* ace/Task.cpp (suspend, resume, activate):
+	* ace/Token_Invariants.cpp (mutex_acquired, reader_acquired,
+	  writer_acquired):
+
+	  Fixed g++ "control reaches end of non-void function" warnings.
+
+	* bin/bootstrap (ACE_HTML_MAN_PAGES):
+
+	  Fixed sed expression so that all man pages ending with `.3' are
+	  substituted with HTML man pages ending with `.html', not just
+	  the last man page in the list.
+
 Wed Sep 13 15:21:34 2000  Ossama Othman  <ossama@uci.edu>
 
 	* ace/Synch_T.cpp (ts_init, ts_object):
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index b3b48677040..c4cc86b39f3 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,22 @@
+Thu Sep 14 11:59:48 2000  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Local_Name_Space_T.cpp (resolve_i, unbind_i):
+	* ace/Local_Tokens.cpp (acquire, tryacquire, renew):
+	* ace/Message_Queue_T.cpp (enqueue_prio, enqueue_head,
+	  enqueue_tail, next): 
+	* ace/Stream.cpp (open):
+	* ace/Task.cpp (suspend, resume, activate):
+	* ace/Token_Invariants.cpp (mutex_acquired, reader_acquired,
+	  writer_acquired):
+
+	  Fixed g++ "control reaches end of non-void function" warnings.
+
+	* bin/bootstrap (ACE_HTML_MAN_PAGES):
+
+	  Fixed sed expression so that all man pages ending with `.3' are
+	  substituted with HTML man pages ending with `.html', not just
+	  the last man page in the list.
+
 Wed Sep 13 15:21:34 2000  Ossama Othman  <ossama@uci.edu>
 
 	* ace/Synch_T.cpp (ts_init, ts_object):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b3b48677040..c4cc86b39f3 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,22 @@
+Thu Sep 14 11:59:48 2000  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Local_Name_Space_T.cpp (resolve_i, unbind_i):
+	* ace/Local_Tokens.cpp (acquire, tryacquire, renew):
+	* ace/Message_Queue_T.cpp (enqueue_prio, enqueue_head,
+	  enqueue_tail, next): 
+	* ace/Stream.cpp (open):
+	* ace/Task.cpp (suspend, resume, activate):
+	* ace/Token_Invariants.cpp (mutex_acquired, reader_acquired,
+	  writer_acquired):
+
+	  Fixed g++ "control reaches end of non-void function" warnings.
+
+	* bin/bootstrap (ACE_HTML_MAN_PAGES):
+
+	  Fixed sed expression so that all man pages ending with `.3' are
+	  substituted with HTML man pages ending with `.html', not just
+	  the last man page in the list.
+
 Wed Sep 13 15:21:34 2000  Ossama Othman  <ossama@uci.edu>
 
 	* ace/Synch_T.cpp (ts_init, ts_object):
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index 9a7f528d00d..0a8f8309811 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -228,17 +228,17 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::unbind_i (const ACE_WString &nam
   ACE_WRITE_GUARD_RETURN (ACE_RW_Process_Mutex, ace_mon, *this->lock_, -1);
   ACE_NS_String ns_name (name);
   ACE_NS_Internal ns_internal;
-  if (this->name_space_map_->unbind (ns_name, ns_internal, this->allocator_) != 0)
+  if (this->name_space_map_->unbind (ns_name,
+                                     ns_internal,
+                                     this->allocator_) != 0)
     return -1;
-  else
-    {
-      // Free up the memory we allocated in shared_bind().  Note that
-      // this assumes that the "value" pointer comes first and that
-      // the value, name and type are contiguously allocated (see
-      // shared_bind() for details)
-      this->allocator_->free ((void *) (ns_internal.value ()).fast_rep ());
-      return 0;
-    }
+
+  // Free up the memory we allocated in shared_bind().  Note that this
+  // assumes that the "value" pointer comes first and that the value,
+  // name and type are contiguously allocated (see shared_bind() for
+  // details)
+  this->allocator_->free ((void *) (ns_internal.value ()).fast_rep ());
+  return 0;
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
@@ -299,31 +299,29 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::resolve_i (const ACE_WString &na
                                    ns_internal,
                                    this->allocator_) != 0)
     return -1;
-  else
-    {
-      // Calls conversion operator and then calls the ACE_WString
-      // assignment operator to get a fresh copy.  (*#*(@#&!*@!!*@&(
-      // HP compiler causes us to add an extra copy explicitly !! :)
-      nbc_string = ns_internal.value ();
-      value = nbc_string;
-
-      // Gets type and then the actual reprsentation which is a
-      // ACE_USHORT16
-      const char *temp = ns_internal.type ();
-
-      size_t len = ACE_OS::strlen (ns_internal.type ());
-      // Makes a copy here. Caller needs to call delete to free up
-      // memory.
-      char *new_type;
-      ACE_NEW_RETURN (new_type,
-                      char [len + 1],
-                      -1);
 
-      ACE_OS::strncpy (new_type, temp, len);
-      new_type[len] = '\0';  // Null terminate the string
-      type = new_type;
-      return 0;
-    }
+  // Calls conversion operator and then calls the ACE_WString
+  // assignment operator to get a fresh copy.  (*#*(@#&!*@!!*@&( HP
+  // compiler causes us to add an extra copy explicitly !! :)
+  nbc_string = ns_internal.value ();
+  value = nbc_string;
+
+  // Gets type and then the actual reprsentation which is a
+  // ACE_USHORT16
+  const char *temp = ns_internal.type ();
+
+  size_t len = ACE_OS::strlen (ns_internal.type ());
+  // Makes a copy here. Caller needs to call delete to free up
+  // memory.
+  char *new_type;
+  ACE_NEW_RETURN (new_type,
+                  char [len + 1],
+                  -1);
+
+  ACE_OS::strncpy (new_type, temp, len);
+  new_type[len] = '\0';  // Null terminate the string
+  type = new_type;
+  return 0;
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index f2ff85a829f..cdb7313914b 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -495,6 +495,8 @@ ACE_Mutex_Token::acquire (ACE_TPQ_Entry *caller,
 
   errno = EWOULDBLOCK;
   ACE_RETURN (-1);
+
+  ACE_NOTREACHED (return -1);
 }
 
 int
@@ -528,6 +530,8 @@ ACE_Mutex_Token::tryacquire (ACE_TPQ_Entry *caller)
       errno = EWOULDBLOCK;
       ACE_RETURN (-1);
     }
+
+  ACE_NOTREACHED (return -1);
 }
 
 int
@@ -562,6 +566,8 @@ ACE_Mutex_Token::renew (ACE_TPQ_Entry *caller,
   // Tell the caller that the operation would block.
   errno = EWOULDBLOCK;
   ACE_RETURN (-1);
+
+  ACE_NOTREACHED (return -1);
 }
 
 // Release the current holder of the token (which had
@@ -766,6 +772,8 @@ ACE_RW_Token::acquire (ACE_TPQ_Entry *caller,
 
   errno = EWOULDBLOCK;
   ACE_RETURN (-1);
+
+  ACE_NOTREACHED (return -1);
 }
 
 int
@@ -821,6 +829,8 @@ ACE_RW_Token::tryacquire (ACE_TPQ_Entry *caller)
 
   errno = EWOULDBLOCK;
   ACE_RETURN (-1);
+
+  ACE_NOTREACHED (return -1);
 }
 
 int
@@ -865,6 +875,8 @@ ACE_RW_Token::renew (ACE_TPQ_Entry *caller,
   // Tell the caller that the operation would block.
   errno = EWOULDBLOCK;
   ACE_RETURN (-1);
+
+  ACE_NOTREACHED (return -1);
 }
 
 int
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index b9c23dc1ea5..0aa4cd749b3 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -40,8 +40,8 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&entry)
       entry = this->curr_;
       return 1;
     }
-  else
-    return 0;
+
+  return 0;
 }
 
 template <ACE_SYNCH_DECL> int
@@ -86,8 +86,8 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&ent
       entry = this->curr_;
       return 1;
     }
-  else
-    return 0;
+
+  return 0;
 }
 
 template <ACE_SYNCH_DECL> int
@@ -623,11 +623,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head (ACE_Message_Block *new_item,
 
   if (queue_count == -1)
     return -1;
-  else
-    {
-      this->notify ();
-      return queue_count;
-    }
+
+  this->notify ();
+  return queue_count;
 }
 
 // Enqueue an <ACE_Message_Block *> into the <Message_Queue> in
@@ -654,11 +652,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_prio (ACE_Message_Block *new_item,
 
   if (queue_count == -1)
     return -1;
-  else
-    {
-      this->notify ();
-      return queue_count;
-    }
+
+  this->notify ();
+  return queue_count;
 }
 
 template <ACE_SYNCH_DECL> int
@@ -692,11 +688,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail (ACE_Message_Block *new_item,
 
   if (queue_count == -1)
     return -1;
-  else
-    {
-      this->notify ();
-      return queue_count;
-    }
+
+  this->notify ();
+  return queue_count;
 }
 
 // Remove an item from the front of the queue.  If timeout == 0 block
diff --git a/ace/Stream.cpp b/ace/Stream.cpp
index c647c5b3ffd..cd2c456d76c 100644
--- a/ace/Stream.cpp
+++ b/ace/Stream.cpp
@@ -368,8 +368,8 @@ ACE_Stream<ACE_SYNCH_USE>::open (void *a,
                               this->stream_tail_,
                               this->stream_head_) == -1)
     return -1;
-  else
-    return 0;
+
+  return 0;
 }
 
 template <ACE_SYNCH_DECL> int
diff --git a/ace/Task.cpp b/ace/Task.cpp
index 271498ae1c7..01436fc0620 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -47,8 +47,8 @@ ACE_Task_Base::suspend (void)
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
   if (this->thr_count_ > 0)
     return this->thr_mgr_->suspend_task (this);
-  else
-    return 0;
+
+  return 0;
 }
 
 // Resume a suspended task.
@@ -59,8 +59,8 @@ ACE_Task_Base::resume (void)
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
   if (this->thr_count_ > 0)
     return this->thr_mgr_->resume_task (this);
-  else
-    return 0;
+
+  return 0;
 }
 
 int
@@ -139,12 +139,12 @@ ACE_Task_Base::activate (long flags,
       this->thr_count_ -= n_threads;
       return -1;
     }
-  else
-    {
-      if (this->grp_id_ == -1)
-        this->grp_id_ = grp_spawned;
-      return 0;
-    }
+
+  if (this->grp_id_ == -1)
+    this->grp_id_ = grp_spawned;
+
+  return 0;
+
 #else
   {
     // Keep the compiler from complaining.
diff --git a/ace/Token.cpp b/ace/Token.cpp
index 3519e8aa5e8..3a0f97fa5a3 100644
--- a/ace/Token.cpp
+++ b/ace/Token.cpp
@@ -314,16 +314,14 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *),
       // Return error.
       return -1;
     }
-  else
-    {
-      // If this is a normal wakeup, this thread should be runnable.
-      ACE_ASSERT (my_entry.runable_);
 
-      if (this->signal_all_threads_ != 0)
-        return 2;
-      else
-        return ret;
-    }
+  // If this is a normal wakeup, this thread should be runnable.
+  ACE_ASSERT (my_entry.runable_);
+
+  if (this->signal_all_threads_ != 0)
+    return 2;
+
+  return ret;
 }
 
 // By default this is a no-op.
@@ -468,19 +466,17 @@ ACE_Token::renew (int requeue_position,
       // Return error.
       return -1;
     }
-  else
-    {
-      // If this is a normal wakeup, this thread should be runnable.
-      ACE_ASSERT (my_entry.runable_);
 
-      // Reinstate nesting level.
-      this->nesting_level_ = save_nesting_level_;
+  // If this is a normal wakeup, this thread should be runnable.
+  ACE_ASSERT (my_entry.runable_);
 
-      if (this->signal_all_threads_ != 0)
-        return 2;
-      else
-        return 0;
-    }
+  // Reinstate nesting level.
+  this->nesting_level_ = save_nesting_level_;
+
+  if (this->signal_all_threads_ != 0)
+    return 2;
+
+  return 0;
 }
 
 // Release the current holder of the token (which had
diff --git a/ace/Token_Invariants.cpp b/ace/Token_Invariants.cpp
index 6c7c9d421bd..547d64e287e 100644
--- a/ace/Token_Invariants.cpp
+++ b/ace/Token_Invariants.cpp
@@ -49,8 +49,8 @@ ACE_Token_Invariant_Manager::mutex_acquired (const ACE_TCHAR *token_name)
   ACE_Mutex_Invariants *inv = 0;
   if (this->get_mutex (token_name, inv) == -1)
     return -1;
-  else
-    return inv->acquired ();
+
+  return inv->acquired ();
 }
 
 int
@@ -102,8 +102,8 @@ ACE_Token_Invariant_Manager::reader_acquired (const ACE_TCHAR *token_name)
   ACE_RWLock_Invariants *inv = 0;
   if (this->get_rwlock (token_name, inv) == -1)
     return -1;
-  else
-    return inv->reader_acquired ();
+
+  return inv->reader_acquired ();
 }
 
 int
@@ -116,8 +116,8 @@ ACE_Token_Invariant_Manager::writer_acquired (const ACE_TCHAR *token_name)
   ACE_RWLock_Invariants *inv = 0;
   if (this->get_rwlock (token_name, inv) == -1)
     return -1;
-  else
-   return inv->writer_acquired ();
+
+  return inv->writer_acquired ();
 }
 
 void
diff --git a/bin/bootstrap b/bin/bootstrap
index 2c7da6225c6..96711a4e6bc 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -104,7 +104,11 @@ if test -d m4; then
   fi
 
   # Provide some "useful" information.
-  echo Bootstrapping...
+  if test $bootstrap_release = yes; then
+    echo Bootstrapping release...
+  else
+    echo Bootstrapping workspace...
+  fi
 
   # Update the NEWS file
   # For now just copy the contents of the `VERSION' file to make automake
@@ -160,7 +164,7 @@ if test -d m4; then
     if test $bootstrap_release = yes; then
       echo 'Inserting ACE man page lists into appropriate Makefile.am files.'
       ACE_MAN_PAGES=`(cd man/man3 && echo *.3)`
-      ACE_HTML_MAN_PAGES=`echo $ACE_MAN_PAGES | sed -e 's/.3$/.html/g'`
+      ACE_HTML_MAN_PAGES=`echo $ACE_MAN_PAGES | sed -e 's/.3 /.html /g' -e 's/.3$/.html/g'`
     else
       ACE_MAN_PAGES=
       ACE_HTML_MAN_PAGES=