.

7 files changed, 13 insertions, 7 deletions

diff --git a/apps/drwho/CM_Client.cpp b/apps/drwho/CM_Client.cpp
index cc1aba7d7de..4c553b04dae 100644
--- a/apps/drwho/CM_Client.cpp
+++ b/apps/drwho/CM_Client.cpp
@@ -79,7 +79,7 @@ CM_Client::receive (int timeout)
 	}
     }
 
-  for (char *host_name;
+  for (const char *host_name;
        Multicast_Manager::get_next_non_responding_host (host_name); 
        )
     ACE_DEBUG ((LM_DEBUG, 
diff --git a/apps/drwho/ChangeLog b/apps/drwho/ChangeLog
index 920e85a9c65..114661947ba 100644
--- a/apps/drwho/ChangeLog
+++ b/apps/drwho/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 30 13:00:52 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* Fixed a bunch of warnings related to char * and const char *.
+  	  Thanks to Sandro Doro <doros@aureus.sublink.org> for reporting
+ 	  this.
+
 Sat Sep 12 21:21:01 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* Made zillions of changes to "ACE"ify all of the code.  Drwho is
diff --git a/apps/drwho/Multicast_Manager.cpp b/apps/drwho/Multicast_Manager.cpp
index 445eac58b03..c3385b633d3 100644
--- a/apps/drwho/Multicast_Manager.cpp
+++ b/apps/drwho/Multicast_Manager.cpp
@@ -67,7 +67,7 @@ Multicast_Manager::get_next_host_addr (in_addr &host_addr)
        Multicast_Manager::current_ptr != 0;
        Multicast_Manager::current_ptr = Multicast_Manager::current_ptr->next)
     {
-      char *host_name = Multicast_Manager::current_ptr->host_name;
+      const char *host_name = Multicast_Manager::current_ptr->host_name;
       hostent *hp = Multicast_Manager::get_host_entry (host_name);
 
       if (hp == 0)
@@ -147,7 +147,7 @@ Multicast_Manager::checkoff_host (in_addr host_addr)
 }
 
 int 
-Multicast_Manager::get_next_non_responding_host (char *&host_name)
+Multicast_Manager::get_next_non_responding_host (const char *&host_name)
 {
   for (Multicast_Manager::current_ptr = Multicast_Manager::current_ptr == 0 ? Multicast_Manager::drwho_list : Multicast_Manager::current_ptr->next;
        Multicast_Manager::current_ptr != 0;
diff --git a/apps/drwho/Multicast_Manager.h b/apps/drwho/Multicast_Manager.h
index c54e1b8f822..33e815fe8b6 100644
--- a/apps/drwho/Multicast_Manager.h
+++ b/apps/drwho/Multicast_Manager.h
@@ -40,7 +40,7 @@ public:
   static void checkoff_host (in_addr host_addr);
   static int get_next_host_addr (in_addr &host_addr);
   static int outstanding_hosts_remain (void);
-  static int get_next_non_responding_host (char *&host_name);
+  static int get_next_non_responding_host (const char *&host_name);
   static int insert_hosts_from_file (const char *filename);
   static void insert_default_hosts (void);
 
diff --git a/apps/drwho/PMC_Ruser.cpp b/apps/drwho/PMC_Ruser.cpp
index 734431f283c..0cd26d102e4 100644
--- a/apps/drwho/PMC_Ruser.cpp
+++ b/apps/drwho/PMC_Ruser.cpp
@@ -114,7 +114,7 @@ PMC_Ruser::handle_protocol_entries (const char *cp,
 void
 PMC_Ruser::process (void)
 {
-  char *(Drwho_Node::*get_name)(void);
+  const char *(Drwho_Node::*get_name)(void);
 
   if (Options::get_opt (Options::PRINT_LOGIN_NAME))
     get_name = &Drwho_Node::get_login_name;
diff --git a/apps/drwho/Rwho_DB_Manager.cpp b/apps/drwho/Rwho_DB_Manager.cpp
index 800bb316c79..902e4cb4ade 100644
--- a/apps/drwho/Rwho_DB_Manager.cpp
+++ b/apps/drwho/Rwho_DB_Manager.cpp
@@ -63,7 +63,7 @@ RWho_DB_Manager::~RWho_DB_Manager (void)
 int 
 RWho_DB_Manager::get_next_host (void)
 {
-  long current_time;
+  time_t current_time;
 
   ACE_OS::time (&current_time);
 
diff --git a/apps/drwho/server.cpp b/apps/drwho/server.cpp
index ab5c868b7ee..15ffb574012 100644
--- a/apps/drwho/server.cpp
+++ b/apps/drwho/server.cpp
@@ -25,7 +25,7 @@
 static char *
 tstamp (void)
 {
-  long time_now;
+  time_t time_now;
   char *temp;
 
   time_now = ACE_OS::time (0);