ChangeLogTag: Mon Nov 9 14:58:34 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

2 files changed, 44 insertions, 48 deletions

diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 8ef48030e18..4373cf74d7c 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -76,10 +76,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_ctype.h"
 
-ACE_RCSID (driver,
-           drv_args,
-           "$Id$")
-
 extern long DRV_nfiles;
 extern char *DRV_files[];
 
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 337c41b95e3..aae06ad4e98 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -168,58 +168,58 @@ DRV_cpp_expand_output_arg (const char *filename)
 static bool
 DRV_get_line (FILE *f)
 {
-    char *l = ACE_OS::fgets (drv_line,
-                             drv_line_size,
-                             f);
+  char *l = ACE_OS::fgets (drv_line,
+                           drv_line_size,
+                           f);
 
-    if (l == 0)
-      {
-        return false;
-      }
+  if (l == 0)
+    {
+      return false;
+    }
 
-    if (*l == '\0' && feof (f))
-      {
-        return false;
-      }
+  if (*l == '\0' && feof (f))
+    {
+      return false;
+    }
 
-    if (*l == '\0')
-      {
-        return true;
-      }
+  if (*l == '\0')
+    {
+      return true;
+    }
 
-    while (ACE_OS::strchr (drv_line, '\n') == 0)
-      {
-        // Haven't got to a newline yet.
-        // Create a bigger buffer and keep reading.
-        size_t temp_size;
-        temp_size = drv_line_size * 2;
-        char *temp = 0;
-        ACE_NEW_RETURN (temp,
-                        char[temp_size],
-                        false);
-        ACE_OS::strcpy (temp, drv_line);
-        delete [] drv_line;
-        drv_line = temp;
-        drv_line_size = temp_size;
-
-        l = ACE_OS::fgets (drv_line + ACE_OS::strlen (drv_line),
-                           drv_line_size - ACE_OS::strlen(drv_line),
-                           f);
+  while (ACE_OS::strchr (drv_line, '\n') == 0)
+    {
+      // Haven't got to a newline yet.
+      // Create a bigger buffer and keep reading.
+      size_t temp_size;
+      temp_size = drv_line_size * 2;
+      char *temp = 0;
+      ACE_NEW_RETURN (temp,
+                      char[temp_size],
+                      false);
+      ACE_OS::strcpy (temp, drv_line);
+      delete [] drv_line;
+      drv_line = temp;
+      drv_line_size = temp_size;
 
-        if (l == 0 || *l == '\0')
-          {
-            break;
-          }
-      }
+      l = ACE_OS::fgets (drv_line + ACE_OS::strlen (drv_line),
+                         drv_line_size - ACE_OS::strlen(drv_line),
+                         f);
 
-    size_t i = ACE_OS::strlen (drv_line) - 1;
+      if (l == 0 || *l == '\0')
+        {
+          break;
+        }
+    }
 
-    if (drv_line[i] == '\n')
-      {
-        drv_line[i] = '\0';
-      }
+  size_t i = ACE_OS::strlen (drv_line) - 1;
+
+  if (drv_line[i] == '\n')
+    {
+      drv_line[i] = '\0';
+    }
 
-    return true;
+  return true;
 }
 
 // Initialize the cpp argument list.