Data Exchange, STEP - Replace String typedef and global temp buffers in StepData_Step...

- Remove typedef TCollection_HAsciiString String and global statics (txtmes, initstr, subl)
- Use explicit string for message handles and function-local char txtmes buffers, drop constructor initstr logic, and update error/warning formatting.
- Reduce global mutable state and clarify message handling.

diff --git a/src/DataExchange/TKDESTEP/StepData/StepData_StepReaderData.cxx b/src/DataExchange/TKDESTEP/StepData/StepData_StepReaderData.cxx
index d41e97139d771c6aae1f1aef51818f42a6338689..b152b3f5e19d71bf7fcb5fdd2ea3916e75b6454e 100644 (file)
--- a/src/DataExchange/TKDESTEP/StepData/StepData_StepReaderData.cxx
+++ b/src/DataExchange/TKDESTEP/StepData/StepData_StepReaderData.cxx
@@ -59,14 +59,10 @@ IMPLEMENT_STANDARD_RTTIEXT(StepData_StepReaderData, Interface_FileReaderData)
 // separate from the main geometric and semantic data
 //  #########################################################################
 //  ....   Creation and basic access to atomic file data    ....
-typedef TCollection_HAsciiString String;
-static char                      txtmes[200]; // more convenient than redeclaring everywhere
 
-static Standard_Boolean initstr = Standard_False;
 #define Maxlst 64
-// static TCollection_AsciiString subl[Maxlst];          // Maxlst : minimum 10
 
-static Standard_Integer acceptvoid = 0;
+static const Standard_Integer acceptvoid = 0;
 
 // ----------  Fonctions Utilitaires  ----------
 
@@ -373,13 +369,6 @@ StepData_StepReaderData::StepData_StepReaderData(const Standard_Integer    nbhea
   thenbhead = nbheader;
   // themults.Init(0);
   thecheck = new Interface_Check;
-  if (initstr)
-    return;
-  // for (Standard_Integer i = 0; i < Maxlst; i ++) {
-  //   Sprintf(textnum,"$%d",i+1);
-  //   subl[i].AssignCat(textnum);
-  // }
-  initstr = Standard_True;
 }
 
 //=================================================================================================
@@ -595,23 +584,24 @@ Standard_Boolean StepData_StepReaderData::NamedForComplex(const Standard_CString
   if (n == 0)                            /*stat =*/
     NamedForComplex(name, num0, n, ach); // on a rembobine
                                          //  Not in alphabetical order: loop
-  Handle(String) errmess = new String("Parameter n0.%d (%s) not a LIST");
-  Sprintf(txtmes, errmess->ToCString(), num0, name);
+  char             txtmes[200];
+  Standard_CString errmess = "Parameter n0.%d (%s) not a LIST";
+  Sprintf(txtmes, errmess, num0, name);
   for (n = num0; n > 0; n = NextForComplex(n))
   {
     if (!strcmp(RecordType(n).ToCString(), name))
     {
       num     = n;
-      errmess = new String("Complex Record n0.%d, member type %s not in alphabetic order");
-      Sprintf(txtmes, errmess->ToCString(), num0, name);
-      ach->AddWarning(txtmes, errmess->ToCString());
+      errmess = "Complex Record n0.%d, member type %s not in alphabetic order";
+      Sprintf(txtmes, errmess, num0, name);
+      ach->AddWarning(txtmes, errmess);
       return Standard_False;
     }
   }
   num     = 0;
-  errmess = new String("Complex Record n0.%d, member type %s not found");
-  Sprintf(txtmes, errmess->ToCString(), num0, name);
-  ach->AddFail(txtmes, errmess->ToCString());
+  errmess = "Complex Record n0.%d, member type %s not found";
+  Sprintf(txtmes, errmess, num0, name);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -634,24 +624,25 @@ Standard_Boolean StepData_StepReaderData::NamedForComplex(const Standard_CString
   }
 
   // entities are not in alphabetical order
-  Handle(String) errmess = new String("Parameter n0.%d (%s) not a LIST");
-  Sprintf(txtmes, errmess->ToCString(), num0, theName);
+  char             txtmes[200];
+  Standard_CString errmess = "Parameter n0.%d (%s) not a LIST";
+  Sprintf(txtmes, errmess, num0, theName);
   for (n = num0; n > 0; n = NextForComplex(n))
   {
     if (!strcmp(RecordType(n).ToCString(), theName)
         || !strcmp(RecordType(n).ToCString(), theShortName))
     {
       num     = n;
-      errmess = new String("Complex Record n0.%d, member type %s not in alphabetic order");
-      Sprintf(txtmes, errmess->ToCString(), num0, theName);
-      ach->AddWarning(txtmes, errmess->ToCString());
+      errmess = "Complex Record n0.%d, member type %s not in alphabetic order";
+      Sprintf(txtmes, errmess, num0, theName);
+      ach->AddWarning(txtmes, errmess);
       return Standard_False;
     }
   }
   num     = 0;
-  errmess = new String("Complex Record n0.%d, member type %s not found");
-  Sprintf(txtmes, errmess->ToCString(), num0, theName);
-  ach->AddFail(txtmes, errmess->ToCString());
+  errmess = "Complex Record n0.%d, member type %s not found";
+  Sprintf(txtmes, errmess, num0, theName);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -666,13 +657,14 @@ Standard_Boolean StepData_StepReaderData::CheckNbParams(const Standard_Integer
 {
   if (NbParams(num) == nbreq)
     return Standard_True;
-  Handle(String) errmess;
+  char             txtmes[200];
+  Standard_CString errmess;
   if (mess[0] == '\0')
-    errmess = new String("Count of Parameters is not %d");
+    errmess = "Count of Parameters is not %d";
   else
-    errmess = new String("Count of Parameters is not %d for %s");
-  Sprintf(txtmes, errmess->ToCString(), nbreq, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+    errmess = "Count of Parameters is not %d for %s";
+  Sprintf(txtmes, errmess, nbreq, mess);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -687,15 +679,16 @@ Standard_Boolean StepData_StepReaderData::ReadSubList(const Standard_Integer   n
                                                       const Standard_Integer /* lenmin */,
                                                       const Standard_Integer /* lenmax */) const
 {
+  char txtmes[200];
   numsub = SubListNumber(num, nump, Standard_False);
   if (numsub > 0)
   {
     const Standard_Integer aNbParams = NbParams(numsub);
     if (aNbParams == 0)
     {
-      Handle(String) anErrMess = new String("Parameter n0.%d (%s) is an empty LIST");
-      Sprintf(txtmes, anErrMess->ToCString(), nump, mess);
-      ach->AddWarning(txtmes, anErrMess->ToCString());
+      Standard_CString anErrMess = "Parameter n0.%d (%s) is an empty LIST";
+      Sprintf(txtmes, anErrMess, nump, mess);
+      ach->AddWarning(txtmes, anErrMess);
     }
     return Standard_True;
   }
@@ -705,13 +698,13 @@ Standard_Boolean StepData_StepReaderData::ReadSubList(const Standard_Integer   n
   if (isvoid && optional)
     return Standard_False;
 
-  Handle(String) errmess = new String("Parameter n0.%d (%s) not a LIST");
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
+  Standard_CString errmess = "Parameter n0.%d (%s) not a LIST";
+  Sprintf(txtmes, errmess, nump, mess);
   if (acceptvoid && isvoid)
-    ach->AddWarning(txtmes, errmess->ToCString());
+    ach->AddWarning(txtmes, errmess);
   else
   {
-    ach->AddFail(txtmes, errmess->ToCString());
+    ach->AddFail(txtmes, errmess);
     return Standard_False;
   }
   return Standard_True;
@@ -1032,9 +1025,10 @@ Standard_Boolean StepData_StepReaderData::ReadMember(const Standard_Integer
   if (v == val)
     return res;
   //   changement -> refus
-  Handle(String) errmess = new String("Parameter n0.%d (%s) : does not match SELECT clause");
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+  char             txtmes[200];
+  Standard_CString errmess = "Parameter n0.%d (%s) : does not match SELECT clause";
+  Sprintf(txtmes, errmess, nump, mess);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1047,13 +1041,12 @@ Standard_Boolean StepData_StepReaderData::ReadField(const Standard_Integer
                                                     const Handle(StepData_PDescr)& descr,
                                                     StepData_Field&                fild) const
 {
-  const Interface_FileParameter&   FP  = Param(num, nump);
-  Standard_CString                 str = FP.CValue();
-  Standard_Boolean                 OK  = Standard_True;
-  Standard_Integer                 nent, kind;
-  Handle(TCollection_HAsciiString) txt;
-  Handle(Standard_Transient)       sub;
-  Interface_ParamType              FT = FP.ParamType();
+  const Interface_FileParameter& FP  = Param(num, nump);
+  Standard_CString               str = FP.CValue();
+  Standard_Boolean               OK  = Standard_True;
+  Standard_Integer               nent, kind;
+  Handle(Standard_Transient)     sub;
+  Interface_ParamType            FT = FP.ParamType();
   switch (FT)
   {
     case Interface_ParamMisc:
@@ -1072,11 +1065,12 @@ Standard_Boolean StepData_StepReaderData::ReadField(const Standard_Integer
       break;
     case Interface_ParamVoid:
       break;
-    case Interface_ParamText:
-      txt = new TCollection_HAsciiString(str);
+    case Interface_ParamText: {
+      Handle(TCollection_HAsciiString) txt = new TCollection_HAsciiString(str);
       cleanText(txt);
       fild.Set(txt);
       break;
+    }
     case Interface_ParamEnum:
       if (!strcmp(str, ".T."))
         fild.SetLogical(StepData_LTrue);
@@ -1328,8 +1322,9 @@ Standard_Boolean StepData_StepReaderData::ReadXY(const Standard_Integer   num,
                                                  Standard_Real&           X,
                                                  Standard_Real&           Y) const
 {
-  Handle(String)   errmess; // Null if no error
-  Standard_Integer numsub = SubListNumber(num, nump, Standard_False);
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null if no error
+  Standard_Integer numsub  = SubListNumber(num, nump, Standard_False);
   if (numsub != 0)
   {
     if (NbParams(numsub) == 2)
@@ -1338,24 +1333,25 @@ Standard_Boolean StepData_StepReaderData::ReadXY(const Standard_Integer   num,
       if (FPX.ParamType() == Interface_ParamReal)
         X = Interface_FileReaderData::Fastof(FPX.CValue());
       else
-        errmess = new String("Parameter n0.%d (%s) : (X,Y) X not a Real");
+        errmess = "Parameter n0.%d (%s) : (X,Y) X not a Real";
 
       const Interface_FileParameter& FPY = Param(numsub, 2);
       if (FPY.ParamType() == Interface_ParamReal)
         Y = Interface_FileReaderData::Fastof(FPY.CValue());
       else
-        errmess = new String("Parameter n0.%d (%s) : (X,Y) Y not a Real");
+        errmess = "Parameter n0.%d (%s) : (X,Y) Y not a Real";
     }
     else
-      errmess = new String("Parameter n0.%d (%s) : (X,Y) has not 2 params");
+      errmess = "Parameter n0.%d (%s) : (X,Y) has not 2 params";
   }
   else
-    errmess = new String("Parameter n0.%d (%s) : (X,Y) not a SubList");
+    errmess = "Parameter n0.%d (%s) : (X,Y) not a SubList";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+
+  Sprintf(txtmes, errmess, nump, mess);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1369,8 +1365,9 @@ Standard_Boolean StepData_StepReaderData::ReadXYZ(const Standard_Integer   num,
                                                   Standard_Real&           Y,
                                                   Standard_Real&           Z) const
 {
-  Handle(String)   errmess; // Null if no error
-  Standard_Integer numsub = SubListNumber(num, nump, Standard_False);
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null if no error
+  Standard_Integer numsub  = SubListNumber(num, nump, Standard_False);
   if (numsub != 0)
   {
     if (NbParams(numsub) == 3)
@@ -1379,30 +1376,31 @@ Standard_Boolean StepData_StepReaderData::ReadXYZ(const Standard_Integer   num,
       if (FPX.ParamType() == Interface_ParamReal)
         X = Interface_FileReaderData::Fastof(FPX.CValue());
       else
-        errmess = new String("Parameter n0.%d (%s) : (X,Y,Z) X not a Real");
+        errmess = "Parameter n0.%d (%s) : (X,Y,Z) X not a Real";
 
       const Interface_FileParameter& FPY = Param(numsub, 2);
       if (FPY.ParamType() == Interface_ParamReal)
         Y = Interface_FileReaderData::Fastof(FPY.CValue());
       else
-        errmess = new String("Parameter n0.%d (%s) : (X,Y,Z) Y not a Real");
+        errmess = "Parameter n0.%d (%s) : (X,Y,Z) Y not a Real";
 
       const Interface_FileParameter& FPZ = Param(numsub, 3);
       if (FPZ.ParamType() == Interface_ParamReal)
         Z = Interface_FileReaderData::Fastof(FPZ.CValue());
       else
-        errmess = new String("Parameter n0.%d (%s) : (X,Y,Z) Z not a Real");
+        errmess = "Parameter n0.%d (%s) : (X,Y,Z) Z not a Real";
     }
     else
-      errmess = new String("Parameter n0.%d (%s) : (X,Y,Z) has not 3 params");
+      errmess = "Parameter n0.%d (%s) : (X,Y,Z) has not 3 params";
   }
   else
-    errmess = new String("Parameter n0.%d (%s) : (X,Y,Z) not a SubList");
+    errmess = "Parameter n0.%d (%s) : (X,Y,Z) not a SubList";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+
+  Sprintf(txtmes, errmess, nump, mess);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1414,22 +1412,24 @@ Standard_Boolean StepData_StepReaderData::ReadReal(const Standard_Integer   num,
                                                    Handle(Interface_Check)& ach,
                                                    Standard_Real&           val) const
 {
-  Handle(String) errmess; // Null si pas d erreur
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null si pas d erreur
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP = Param(num, nump);
     if (FP.ParamType() == Interface_ParamReal || FP.ParamType() == Interface_ParamInteger)
       val = Interface_FileReaderData::Fastof(FP.CValue());
     else
-      errmess = new String("Parameter n0.%d (%s) not a Real");
+      errmess = "Parameter n0.%d (%s) not a Real";
   }
   else
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+
+  Sprintf(txtmes, errmess, nump, mess);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1444,8 +1444,9 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer
                                                      const Handle(Standard_Type)& atype,
                                                      Handle(Standard_Transient)&  ent) const
 {
-  Handle(String)   errmess; // Null if no error
-  Standard_Boolean warn = Standard_False;
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null if no error
+  Standard_Boolean warn    = Standard_False;
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP   = Param(num, nump);
@@ -1458,7 +1459,7 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer
         Handle(Standard_Transient) entent = BoundEntity(nent);
         if (entent.IsNull() || !entent->IsKind(atype))
         {
-          errmess = new String("Parameter n0.%d (%s) : Entity has illegal type");
+          errmess = "Parameter n0.%d (%s) : Entity has illegal type";
           if (!entent.IsNull() && entent->IsKind(STANDARD_TYPE(StepData_UndefinedEntity)))
             ent = entent;
         }
@@ -1466,28 +1467,29 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer
           ent = entent;
       }
       else
-        errmess = new String("Parameter n0.%d (%s) : Unresolved reference");
+        errmess = "Parameter n0.%d (%s) : Unresolved reference";
     }
     else
     {
       if (acceptvoid && FP.ParamType() == Interface_ParamVoid)
         warn = Standard_True;
-      errmess = new String("Parameter n0.%d (%s) not an Entity");
+      errmess = "Parameter n0.%d (%s) not an Entity";
     }
   }
   else
   {
     warn    = (acceptvoid > 0);
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
   }
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
+
+  Sprintf(txtmes, errmess, nump, mess);
   if (warn)
-    ach->AddWarning(txtmes, errmess->ToCString());
+    ach->AddWarning(txtmes, errmess);
   else
-    ach->AddFail(txtmes, errmess->ToCString());
+    ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1499,8 +1501,9 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer   nu
                                                      Handle(Interface_Check)& ach,
                                                      StepData_SelectType&     sel) const
 {
-  Handle(String)   errmess; // Null if no error
-  Standard_Boolean warn = Standard_False;
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null if no error
+  Standard_Boolean warn    = Standard_False;
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP   = Param(num, nump);
@@ -1513,7 +1516,7 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer   nu
         Handle(Standard_Transient) entent = BoundEntity(nent);
         if (!sel.Matches(entent))
         {
-          errmess = new String("Parameter n0.%d (%s) : Entity has illegal type");
+          errmess = "Parameter n0.%d (%s) : Entity has illegal type";
           // fot not supported STEP entity
           if (!entent.IsNull() && entent->IsKind(STANDARD_TYPE(StepData_UndefinedEntity)))
             sel.SetValue(entent);
@@ -1522,13 +1525,13 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer   nu
           sel.SetValue(entent);
       }
       else
-        errmess = new String("Parameter n0.%d (%s) : Unresolved reference");
+        errmess = "Parameter n0.%d (%s) : Unresolved reference";
     }
     else if (FP.ParamType() == Interface_ParamVoid)
     {
       if (acceptvoid)
         warn = Standard_True;
-      errmess = new String("Parameter n0.%d (%s) not an Entity");
+      errmess = "Parameter n0.%d (%s) not an Entity";
     }
     else
     {
@@ -1536,9 +1539,9 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer   nu
       Handle(Standard_Transient) sm = sel.NewMember();
       // SelectMember which performs this role. Can be specialized
       if (!ReadAny(num, nump, mess, ach, sel.Description(), sm))
-        errmess = new String("Parameter n0.%d (%s) : could not be read");
+        errmess = "Parameter n0.%d (%s) : could not be read";
       if (!sel.Matches(sm))
-        errmess = new String("Parameter n0.%d (%s) : illegal parameter type");
+        errmess = "Parameter n0.%d (%s) : illegal parameter type";
       else
         sel.SetValue(sm);
     }
@@ -1546,16 +1549,17 @@ Standard_Boolean StepData_StepReaderData::ReadEntity(const Standard_Integer   nu
   else
   {
     warn    = (acceptvoid > 0);
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
   }
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
+
+  Sprintf(txtmes, errmess, nump, mess);
   if (warn)
-    ach->AddWarning(txtmes, errmess->ToCString());
+    ach->AddWarning(txtmes, errmess);
   else
-    ach->AddFail(txtmes, errmess->ToCString());
+    ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1569,8 +1573,9 @@ Standard_Boolean StepData_StepReaderData::ReadInteger(const Standard_Integer   n
                                                       Handle(Interface_Check)& ach,
                                                       Standard_Integer&        val) const
 {
-  Handle(String)   errmess; // Null if no error
-  Standard_Boolean warn = Standard_False;
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null if no error
+  Standard_Boolean warn    = Standard_False;
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP = Param(num, nump);
@@ -1582,21 +1587,22 @@ Standard_Boolean StepData_StepReaderData::ReadInteger(const Standard_Integer   n
         static_cast<Standard_Integer>(std::round(Interface_FileReaderData::Fastof(FP.CValue())));
       if (acceptvoid)
         warn = Standard_True;
-      errmess = new String("Parameter n0.%d (%s) was rounded");
+      errmess = "Parameter n0.%d (%s) was rounded";
     }
     if (FP.ParamType() != Interface_ParamInteger && FP.ParamType() != Interface_ParamReal)
-      errmess = new String("Parameter n0.%d (%s) not an Integer");
+      errmess = "Parameter n0.%d (%s) not an Integer";
   }
   else
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
+
+  Sprintf(txtmes, errmess, nump, mess);
   if (warn)
-    ach->AddWarning(txtmes, errmess->ToCString());
+    ach->AddWarning(txtmes, errmess);
   else
-    ach->AddFail(txtmes, errmess->ToCString());
+    ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1608,8 +1614,9 @@ Standard_Boolean StepData_StepReaderData::ReadBoolean(const Standard_Integer   n
                                                       Handle(Interface_Check)& ach,
                                                       Standard_Boolean&        flag) const
 {
-  flag = Standard_True;
-  Handle(String) errmess; // Null si pas d erreur
+  char txtmes[200];
+  flag                     = Standard_True;
+  Standard_CString errmess = nullptr; // Null si pas d erreur
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP = Param(num, nump);
@@ -1621,18 +1628,19 @@ Standard_Boolean StepData_StepReaderData::ReadBoolean(const Standard_Integer   n
       else if (!strcmp(txt, ".F."))
         flag = Standard_False;
       else
-        errmess = new String("Parameter n0.%d (%s) : Incorrect Boolean Value. It was set to true");
+        errmess = "Parameter n0.%d (%s) : Incorrect Boolean Value. It was set to true";
     }
     else
-      errmess = new String("Parameter n0.%d (%s) not a Boolean. It was set to true");
+      errmess = "Parameter n0.%d (%s) not a Boolean. It was set to true";
   }
   else
-    errmess = new String("Parameter n0.%d (%s) absent.It was set to true");
+    errmess = "Parameter n0.%d (%s) absent.It was set to true";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+
+  Sprintf(txtmes, errmess, nump, mess);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1644,7 +1652,8 @@ Standard_Boolean StepData_StepReaderData::ReadLogical(const Standard_Integer   n
                                                       Handle(Interface_Check)& ach,
                                                       StepData_Logical&        flag) const
 {
-  Handle(String) errmess; // Null si pas d erreur
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null si pas d erreur
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP = Param(num, nump);
@@ -1658,18 +1667,19 @@ Standard_Boolean StepData_StepReaderData::ReadLogical(const Standard_Integer   n
       else if (!strcmp(txt, ".U."))
         flag = StepData_LUnknown;
       else
-        errmess = new String("Parameter n0.%d (%s) : Incorrect Logical Value");
+        errmess = "Parameter n0.%d (%s) : Incorrect Logical Value";
     }
     else
-      errmess = new String("Parameter n0.%d (%s) not a Logical");
+      errmess = "Parameter n0.%d (%s) not a Logical";
   }
   else
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+
+  Sprintf(txtmes, errmess, nump, mess);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1681,8 +1691,9 @@ Standard_Boolean StepData_StepReaderData::ReadString(const Standard_Integer
                                                      Handle(Interface_Check)&          ach,
                                                      Handle(TCollection_HAsciiString)& val) const
 {
-  Handle(String)   errmess; // Null if no error
-  Standard_Boolean warn = Standard_False;
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null if no error
+  Standard_Boolean warn    = Standard_False;
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP = Param(num, nump);
@@ -1690,9 +1701,9 @@ Standard_Boolean StepData_StepReaderData::ReadString(const Standard_Integer
     {
       /*Standard_CString anStr = FP.CValue();
       if(strlen(anStr) < 3)
-        val = new TCollection_HAsciiString("");
+        val = TCollection_AsciiString("");
       else {
-        val = new TCollection_HAsciiString(FP.CValue());
+        val = TCollection_AsciiString(FP.CValue());
         CleanText (val);
       }*/
       val = new TCollection_HAsciiString(FP.CValue());
@@ -1702,19 +1713,20 @@ Standard_Boolean StepData_StepReaderData::ReadString(const Standard_Integer
     {
       if (acceptvoid && FP.ParamType() == Interface_ParamVoid)
         warn = Standard_True;
-      errmess = new String("Parameter n0.%d (%s) not a quoted String");
+      errmess = "Parameter n0.%d (%s) not a quoted String";
     }
   }
   else
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
+
+  Sprintf(txtmes, errmess, nump, mess);
   if (warn)
-    ach->AddWarning(txtmes, errmess->ToCString());
+    ach->AddWarning(txtmes, errmess);
   else
-    ach->AddFail(txtmes, errmess->ToCString());
+    ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1726,8 +1738,9 @@ Standard_Boolean StepData_StepReaderData::ReadEnumParam(const Standard_Integer
                                                         Handle(Interface_Check)& ach,
                                                         Standard_CString&        text) const
 {
-  Handle(String)   errmess; // Null if no error
-  Standard_Boolean warn = Standard_False;
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null if no error
+  Standard_Boolean warn    = Standard_False;
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP = Param(num, nump);
@@ -1738,22 +1751,23 @@ Standard_Boolean StepData_StepReaderData::ReadEnumParam(const Standard_Integer
     }
     else if (FP.ParamType() == Interface_ParamVoid)
     {
-      errmess = new String("Parameter n0.%d (%s) : Undefined Enumeration not allowed");
+      errmess = "Parameter n0.%d (%s) : Undefined Enumeration not allowed";
       warn    = (acceptvoid > 0);
     }
     else
-      errmess = new String("Parameter n0.%d (%s) not an Enumeration");
+      errmess = "Parameter n0.%d (%s) not an Enumeration";
   }
   else
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
+
+  Sprintf(txtmes, errmess, nump, mess);
   if (warn)
-    ach->AddWarning(txtmes, errmess->ToCString());
+    ach->AddWarning(txtmes, errmess);
   else
-    ach->AddFail(txtmes, errmess->ToCString());
+    ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1764,9 +1778,10 @@ void StepData_StepReaderData::FailEnumValue(const Standard_Integer /* num */,
                                             const Standard_CString   mess,
                                             Handle(Interface_Check)& ach) const
 {
-  Handle(String) errmess = new String("Parameter n0.%d (%s) : Incorrect Enumeration Value");
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+  char             txtmes[200];
+  Standard_CString errmess = "Parameter n0.%d (%s) : Incorrect Enumeration Value";
+  Sprintf(txtmes, errmess, nump, mess);
+  ach->AddFail(txtmes, errmess);
 }
 
 //=================================================================================================
@@ -1779,8 +1794,9 @@ Standard_Boolean StepData_StepReaderData::ReadEnum(const Standard_Integer   num,
                                                    Standard_Integer&        val) const
 {
   //  resume with ReadEnumParam?
-  Handle(String)   errmess; // Null if no error
-  Standard_Boolean warn = Standard_False;
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null if no error
+  Standard_Boolean warn    = Standard_False;
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP = Param(num, nump);
@@ -1790,29 +1806,30 @@ Standard_Boolean StepData_StepReaderData::ReadEnum(const Standard_Integer   num,
       if (val >= 0)
         return Standard_True;
       else
-        errmess = new String("Parameter n0.%d (%s) : Incorrect Enumeration Value");
+        errmess = "Parameter n0.%d (%s) : Incorrect Enumeration Value";
       warn = (acceptvoid > 0);
     }
     else if (FP.ParamType() == Interface_ParamVoid)
     {
       val = enumtool.NullValue();
       if (val < 0)
-        errmess = new String("Parameter n0.%d (%s) : Undefined Enumeration not allowed");
+        errmess = "Parameter n0.%d (%s) : Undefined Enumeration not allowed";
       warn = (acceptvoid > 0);
     }
     else
-      errmess = new String("Parameter n0.%d (%s) not an Enumeration");
+      errmess = "Parameter n0.%d (%s) not an Enumeration";
   }
   else
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
+
+  Sprintf(txtmes, errmess, nump, mess);
   if (warn)
-    ach->AddWarning(txtmes, errmess->ToCString());
+    ach->AddWarning(txtmes, errmess);
   else
-    ach->AddFail(txtmes, errmess->ToCString());
+    ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1827,7 +1844,8 @@ Standard_Boolean StepData_StepReaderData::ReadTypedParam(const Standard_Integer
                                                          Standard_Integer&        numrp,
                                                          TCollection_AsciiString& typ) const
 {
-  Handle(String) errmess; // Null si pas d erreur
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null si pas d erreur
   if (nump > 0 && nump <= NbParams(num))
   {
     const Interface_FileParameter& FP = Param(num, nump);
@@ -1839,9 +1857,9 @@ Standard_Boolean StepData_StepReaderData::ReadTypedParam(const Standard_Integer
       typ.Clear();
       if (mustbetyped)
       {
-        errmess = new String("Parameter n0.%d (%s) : single, not typed");
-        Sprintf(txtmes, errmess->ToCString(), nump, mess);
-        ach->AddFail(txtmes, errmess->ToCString());
+        errmess = "Parameter n0.%d (%s) : single, not typed";
+        Sprintf(txtmes, errmess, nump, mess);
+        ach->AddFail(txtmes, errmess);
         return Standard_False;
       }
       return Standard_True;
@@ -1849,16 +1867,16 @@ Standard_Boolean StepData_StepReaderData::ReadTypedParam(const Standard_Integer
     numr  = FP.EntityNumber();
     numrp = 1;
     if (NbParams(numr) != 1)
-      errmess = new String("Parameter n0.%d (%s) : SubList, not typed");
+      errmess = "Parameter n0.%d (%s) : SubList, not typed";
     typ = RecordType(numr);
   }
   else
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
-  ach->AddFail(txtmes, errmess->ToCString());
+  Sprintf(txtmes, errmess, nump, mess);
+  ach->AddFail(txtmes, errmess);
   return Standard_False;
 }
 
@@ -1870,27 +1888,29 @@ Standard_Boolean StepData_StepReaderData::CheckDerived(const Standard_Integer
                                                        Handle(Interface_Check)& ach,
                                                        const Standard_Boolean   errstat) const
 {
-  Handle(String)   errmess; // Null if no error
-  Standard_Boolean warn = !errstat;
+  char             txtmes[200];
+  Standard_CString errmess = nullptr; // Null if no error
+  Standard_Boolean warn    = !errstat;
   if (nump > 0 && nump <= NbParams(num))
   {
     if (!strcmp(Param(num, nump).CValue(), "*"))
       return Standard_True;
     else
-      errmess = new String("Parameter n0.%d (%s) not Derived");
+      errmess = "Parameter n0.%d (%s) not Derived";
     if (acceptvoid)
       warn = Standard_True;
   }
   else
-    errmess = new String("Parameter n0.%d (%s) absent");
+    errmess = "Parameter n0.%d (%s) absent";
 
-  if (errmess.IsNull())
+  if (errmess == nullptr)
     return Standard_True;
-  Sprintf(txtmes, errmess->ToCString(), nump, mess);
+
+  Sprintf(txtmes, errmess, nump, mess);
   if (warn)
-    ach->AddWarning(txtmes, errmess->ToCString());
+    ach->AddWarning(txtmes, errmess);
   else
-    ach->AddFail(txtmes, errmess->ToCString());
+    ach->AddFail(txtmes, errmess);
   return Standard_False;
 }