Fixed some struct/class discrepancies and returning refs to a local

variable error.

2 files changed, 8 insertions, 9 deletions

diff --git a/TAO/utils/IorParser/ior-handler.cpp b/TAO/utils/IorParser/ior-handler.cpp
index 56f4756da1c..929980ed9fc 100644
--- a/TAO/utils/IorParser/ior-handler.cpp
+++ b/TAO/utils/IorParser/ior-handler.cpp
@@ -87,7 +87,6 @@ IorHandler::skipNullOctets (char *readPtr, int *hexCharsRead)
 char *
 IorHandler::getString (char *readPtr, int givenLen)
 {
-  char parsedStr[MAX_IOR_FIELD_LEN];
   int j = 0;
 
   // i indexes hexChars while j indexes octet pairs
@@ -117,7 +116,7 @@ IorHandler::getString (char *readPtr, int givenLen)
 }
 
 void
-IorHandler::prettyPrintIOR (struct IOR thisIor)
+IorHandler::prettyPrintIOR (IOR thisIor)
 {
   ACE_DEBUG ((LM_DEBUG,
               "TypeIdLen\t: %lu bytes\n",
@@ -149,7 +148,7 @@ IorHandler::prettyPrintIOR (struct IOR thisIor)
 }
 
 void
-IorHandler::interpretIor (char *thisIor, struct IOR *thisIorInfo)
+IorHandler::interpretIor (char *thisIor, IOR *thisIorInfo)
 {
   int numCharsToSkip;
 
@@ -347,7 +346,6 @@ IorHandler::interpretIor (char *thisIor, struct IOR *thisIorInfo)
 char *
 IorHandler::getIdlInterface (char *typeId)
 {
-  char idlInterface[MAX_TYPE_ID_LEN];
   int lenInterface;
 
   char *readStart = strchr (typeId, ':');
diff --git a/TAO/utils/IorParser/ior-handler.h b/TAO/utils/IorParser/ior-handler.h
index 7fa0f78bdba..beb7fcd203a 100644
--- a/TAO/utils/IorParser/ior-handler.h
+++ b/TAO/utils/IorParser/ior-handler.h
@@ -33,7 +33,7 @@
 #define NUM_TAG_PROFS       "0001"
 #define IIOP_VERSION        "0001"
 
-class IOR
+struct IOR
 {
   // = TITLE
   //     This is the useful information obtained from parsing an IOR.
@@ -42,7 +42,6 @@ class IOR
   //     This structure assumes that the profile_id is
   //     TAG_INTERNET_IOP and that there is only one TaggedProfile in 
   //     the IOR.
-public:
   u_long typeIdLen;
   // The length of the type_id field of the IOR.
 
@@ -87,10 +86,10 @@ public:
   IorHandler (void);
   // Constructor.
 
-  void prettyPrintIOR (struct IOR thisIor);
+  void prettyPrintIOR (IOR thisIor);
   // Prints out additional detailed information in the IOR.
 
-  void interpretIor (char *thisIor, struct IOR *thisIorInfo);
+  void interpretIor (char *thisIor, IOR *thisIorInfo);
   // The main parsing routine.
 
   char *getIdlInterface (char *typeId);
@@ -104,7 +103,9 @@ public:
   // @@ Priya, can you please change this so that it's not a magic
   // number?!
   char stringRealIOR[400];
-  struct IOR parsedRealIOR;
+  IOR parsedRealIOR;
+  char parsedStr[MAX_IOR_FIELD_LEN];
+  char idlInterface[MAX_TYPE_ID_LEN];
 
 private:
   u_long getOctet8Field (char *readPtr, int *hexCharsRead);