ChangeLogTag: Wed Jun 30 09:26:42 2004 Jeff Parsons <j.parsons@vanderbilt.edu>

1 files changed, 49 insertions, 35 deletions

diff --git a/TAO/CIAO/examples/Hello/Sender/starter.cpp b/TAO/CIAO/examples/Hello/Sender/starter.cpp
index 9f052fa5816..0482d731e6d 100644
--- a/TAO/CIAO/examples/Hello/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/starter.cpp
@@ -9,37 +9,45 @@
 #include "ace/Get_Opt.h"
 
 //IOR file of the Sender
-char * ior = 0;
-char * message = "starters message";
+const char * ior = 0;
+const char * message = "starters message";
+
 int
 parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "k:m");
   int c = 0;
+  
   while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-	break;
-
-      case 'm':
-	message = get_opts.opt_arg ();
-	break;
-
-      case '?':  // display help for use of the server.
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s\n"
-			   "-k <Sender IOR> (default is file://sender.ior)\n",
-			   "-m <Message> (default is starters message)\n"
-			   "\n",
-                           argv [0]),
-                          -1);
-      }
+    {
+      switch (c)
+        {
+        case 'k':
+          ior = get_opts.opt_arg ();
+	        break;
+
+        case 'm':
+	        message = get_opts.opt_arg ();
+	        break;
+
+        case '?':  // display help for use of the server.
+        default:
+          ACE_ERROR_RETURN ((LM_ERROR,
+                            "usage:  %s\n"
+			    "-k <Sender IOR> (default is file://sender.ior)\n",
+			    "-m <Message> (default is starters message)\n"
+			    "\n",
+                            argv [0]),
+                            -1);
+          break;
+        }
+    }
 
   if (ior  == 0)
-    ior = "file://sender.ior";
+    {
+      ior = "file://sender.ior";
+    }
+    
   return 0;
 }
 
@@ -50,27 +58,33 @@ main (int argc, char *argv[])
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-		                            argv,
-					    ""
-					    ACE_ENV_ARG_PARAMETER);
+		                                        argv,
+					                                  ""
+					                                  ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
-        return -1;
+        {
+          return -1;
+        }
 
-      CORBA::Object_var obj
-        = orb->string_to_object (ior
-                                 ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var obj =
+        orb->string_to_object (ior
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Hello::Sender_var sender
-        = Hello::Sender::_narrow (obj.in ()
-			          ACE_ENV_ARG_PARAMETER);
+      Hello::Sender_var sender =
+        Hello::Sender::_narrow (obj.in ()
+			                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (sender.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire Sender's objref\n"), -1);
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             "Unable to acquire Sender's objref\n"),
+                            -1);
+        }
 
       sender->local_message (message);
 
@@ -83,7 +97,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Unknown exception \n");
+			                     "Unknown exception \n");
       return -1;
     }
   ACE_ENDTRY;