.

12 files changed, 69 insertions, 41 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index a046f41d484..330b191c59c 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,9 +1,5 @@
 Mon Jun  7 00:11:00 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* ace/Naming_Context.h (ACE_Name_Options): Changed the parameters
- 	  from "char *argv[]" to "const char *argv[]" since this is
- 	  cleaner.
-
 	* tests/Hash_Map_Manager_Test.cpp: Changed the use of ASYS_TCHAR *
  	  to LPCTSTR to ensure const-correctness.
 
diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp
index f9d46d846db..f813277d905 100644
--- a/TAO/TAO_IDL/fe/fe_lookup.cpp
+++ b/TAO/TAO_IDL/fe/fe_lookup.cpp
@@ -2,7 +2,7 @@
 #include	"idl.h"
 #include	"idl_extern.h"
 #include	"fe_private.h"
-/* starting time is 16:32:33 */
+/* starting time is 2:40:07 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: /project/adaptive/ACE_wrappers/build/SunOS5.5/bin/gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$ fe/keywords.dat  */
 unsigned int
@@ -188,4 +188,4 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 16:32:33 */
+/* ending time is 2:40:07 */
diff --git a/TAO/TAO_IDL/fe/keywords.dat b/TAO/TAO_IDL/fe/keywords.dat
index 96940a3f68c..e9c3a8b3be8 100644
--- a/TAO/TAO_IDL/fe/keywords.dat
+++ b/TAO/TAO_IDL/fe/keywords.dat
@@ -1,4 +1,4 @@
-struct TAO_IDL_CPP_Keyword_Entry { const char *keyword_ ; char *mapping_; };
+struct TAO_IDL_CPP_Keyword_Entry { const char *keyword_ ; const char *mapping_; };
 %%
 and, "_cxx_and"
 and_eq, "_cxx_and_eq"
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index a563091d829..b165a601ac9 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -564,7 +564,7 @@ ACE_Name_Options::verbose (void)
 }
 
 void
-ACE_Name_Options::parse_args (int argc, const char *argv[])
+ACE_Name_Options::parse_args (int argc, char *argv[])
 {
   ACE_TRACE ("ACE_Name_Options::parse_args");
   ACE_LOG_MSG->open (argv[0]);
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index a2595fbea2a..078d35356cb 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -255,8 +255,8 @@ public:
   ~ACE_Name_Options (void);
 
   void parse_args (int argc,
-                   const char *argv[]);
-  // Parse arguments
+                   char *argv[]);
+  // Parse arguments.
 
   // = Set/Get port number
   void nameserver_port (int port);
diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h
index 82d1d25abb5..404ffaa9b12 100644
--- a/ace/TTY_IO.h
+++ b/ace/TTY_IO.h
@@ -52,7 +52,7 @@ public:
   {
     int baudrate;
     int parityenb;
-    char *paritymode;
+    const char *paritymode;
     int databits;
     int stopbits;
     int readtimeoutmsec;
@@ -60,7 +60,8 @@ public:
     int rcvenb;
   };
 
-  int control (Control_Mode cmd, Serial_Params * arg) const;
+  int control (Control_Mode cmd,
+               Serial_Params *arg) const;
   // Interface for reading/writing serial device parameters.
 
 #if defined (ACE_NEEDS_DEV_IO_CONVERSION)
diff --git a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp
index 95eb2ea98e9..c6f8801380f 100644
--- a/examples/IPC_SAP/DEV_SAP/reader/reader.cpp
+++ b/examples/IPC_SAP/DEV_SAP/reader/reader.cpp
@@ -12,13 +12,20 @@ int
 main (int argc, char *argv[])
 {
   if (argc < 2)
-    ACE_ERROR_RETURN ((LM_ERROR, "usage: %s device-filename\n", argv[0]), 1);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "usage: %s device-filename\n",
+                       argv[0]),
+                      1);
 
   ACE_TTY_IO read_dev;
   ACE_DEV_Connector con;
 
-  if (con.connect (read_dev, ACE_DEV_Addr (argv[1])) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", argv[1]), 1);
+  if (con.connect (read_dev,
+                   ACE_DEV_Addr (argv[1])) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       argv[1]),
+                      1);
 
   ACE_TTY_IO::Serial_Params myparams;
   myparams.baudrate = 9600;
@@ -30,20 +37,28 @@ main (int argc, char *argv[])
   myparams.ctsenb = 0;
   myparams.rcvenb = 1;
 
-  int ret = read_dev.control (ACE_TTY_IO::SETPARAMS, &myparams);
-
-  if (ret == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p control\n", argv[1]), 1);
+  if (read_dev.control (ACE_TTY_IO::SETPARAMS,
+                        &myparams) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p control\n",
+                       argv[1]),
+                      1);
 
   // Read till character 'q'.
   for (char readback = 'x'; readback != 'q'; )  
     {
-      ssize_t bytes_read = read_dev.recv_n ((void *) &readback, 1);
+      ssize_t bytes_read =
+        read_dev.recv_n ((void *) &readback, 1);
 
       if (bytes_read == 1)
-	ACE_DEBUG ((LM_DEBUG, "read: %c\n", readback));
+	ACE_DEBUG ((LM_DEBUG,
+                    "read: %c\n",
+                    readback));
       else if (bytes_read == -1)
-          ACE_ERROR_RETURN ((LM_ERROR, "%p  recv\n", argv[1]), 1);
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "%p  recv\n",
+
+                             argv[1]), 1);
     }
 
   return 0;
diff --git a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
index fa119dc0ee0..a1629d58bb8 100644
--- a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
+++ b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
@@ -9,14 +9,21 @@ int
 main (int argc, char *argv[])
 {
   if (argc < 2)
-    ACE_ERROR_RETURN ((LM_ERROR, "usage: %s device-filename\n", argv[0]), 1);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "usage: %s device-filename\n",
 
-  ACE_TTY_IO write_dev;
+                       argv[0]), 1);
 
+  ACE_TTY_IO write_dev;
   ACE_DEV_Connector con;
 
-  if (con.connect (write_dev, ACE_DEV_Addr (argv[1])) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", argv[1]), 1);
+  if (con.connect (write_dev,
+                   ACE_DEV_Addr (argv[1])) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+
+,                       "%p\n",
+                       argv[1]),
+                      1);
 
   ACE_TTY_IO::Serial_Params myparams;
   myparams.baudrate = 9600;
@@ -28,28 +35,37 @@ main (int argc, char *argv[])
   myparams.ctsenb = 0;
   myparams.rcvenb = 1;
 
-  int ret = write_dev.control (ACE_TTY_IO::SETPARAMS, &myparams);
+  if (write_dev.control (ACE_TTY_IO::SETPARAMS,
+                         &myparams) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "control"),
+                      1);
 
-  if (ret == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "control"), 1);
+  ACE_DEBUG ((LM_DEBUG,
+              "enter character to send, q terminates :\n"));
 
-  ACE_DEBUG ((LM_DEBUG, "enter character to send, q terminates :\n"));
-
-  for (char writeto = 'x'; 
+  for (char writeto;
        ACE_OS::read (ACE_STDIN, &writeto, 1) != -1;
        )
     {
-      ssize_t bytes_written = write_dev.send_n ((void *)&writeto, 1);
+      ssize_t bytes_written =
+        write_dev.send_n ((void *) &writeto,
+                          1);
 
       if (bytes_written != 1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send"), 1);
-
+	ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "send"),
+                          1);
       if (writeto == 'q')
 	break;
     }
 
   if (write_dev.close () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "close"), 1);
-
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "close"),
+                      1);
   return 0;
 }
diff --git a/examples/Naming/test_multiple_contexts.cpp b/examples/Naming/test_multiple_contexts.cpp
index 081ea12e03f..8665343a7e0 100644
--- a/examples/Naming/test_multiple_contexts.cpp
+++ b/examples/Naming/test_multiple_contexts.cpp
@@ -56,7 +56,7 @@ int main (int, char *[])
     sizeof (n_argv) / sizeof (char *) -1;
 
   name_options->parse_args (m_argc,
-                            m_argv);
+                            (char **) m_argv);
   i = ns_ptr->open (ACE_Naming_Context::NODE_LOCAL);
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/examples/Naming/test_non_existent.cpp b/examples/Naming/test_non_existent.cpp
index c2ffb5cd0b6..f8785ad0f81 100644
--- a/examples/Naming/test_non_existent.cpp
+++ b/examples/Naming/test_non_existent.cpp
@@ -31,7 +31,7 @@ int main (int, char *[])
     sizeof (m_argv) / sizeof (char *) -1;
 
   name_options->parse_args (m_argc,
-                            m_argv);
+                            (char **) m_argv);
 
   i = ns_ptr->open (ACE_Naming_Context::NODE_LOCAL);
   ACE_DEBUG ((LM_DEBUG,
diff --git a/examples/Naming/test_open.cpp b/examples/Naming/test_open.cpp
index 6e9a01c42a1..e4c7e59ae98 100644
--- a/examples/Naming/test_open.cpp
+++ b/examples/Naming/test_open.cpp
@@ -25,7 +25,7 @@ main (int argc, char **argv)
     sizeof (m_argv) / sizeof (char *) -1; 
 
   name_options->parse_args (m_argc,
-                            m_argv);
+                            (char **) m_argv);
 
   int result = ns.open (ACE_Naming_Context::NET_LOCAL); 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/examples/Naming/test_writers.cpp b/examples/Naming/test_writers.cpp
index 7da15473547..fae9b918160 100644
--- a/examples/Naming/test_writers.cpp
+++ b/examples/Naming/test_writers.cpp
@@ -25,7 +25,7 @@ int main (int, char *[])
   int m_argc = sizeof (m_argv) / sizeof (char *) -1;
 
   name_options->parse_args (m_argc,
-                            m_argv);
+                            (char **) m_argv);
   i = ns_ptr->open (ACE_Naming_Context::NODE_LOCAL);
   ACE_DEBUG ((LM_DEBUG,
               "(%P) opened with %d\n",