0026922: Huge performance issue writing data to the output stream

Test case for issue CR26922

Correction of literal (char to string)

src/DDataStd/DDataStd_BasicCommands.cxx

@@ -116,7 +116,7 @@ static Standard_Integer DDataStd_SetInteger (Draw_Interpretor& di,
     TDataStd_Integer::Set(L,Draw::Atoi(arg[3]));  
     return 0;
   }
-  di << "DDataStd_SetInteger : Error" << "\n";
+  di << "DDataStd_SetInteger : Error\n";
   return 1;
 }
 
@@ -137,7 +137,7 @@ static Standard_Integer DDataStd_SetReal (Draw_Interpretor& di,
     TDataStd_Real::Set(L,Draw::Atof(arg[3]));  
     return 0;
   } 
-  di << "DDataStd_SetReal : Error" << "\n";
+  di << "DDataStd_SetReal : Error\n";
   return 1;
 }
 
@@ -162,7 +162,7 @@ static Standard_Integer DDataStd_SetReference (Draw_Interpretor& di,
     TDF_Reference::Set(L,LREF);  
     return 0;
   } 
-  di << "DDataStd_SetReference : Error" << "\n";
+  di << "DDataStd_SetReference : Error\n";
   return 1;
 }
 
@@ -184,7 +184,7 @@ static Standard_Integer DDataStd_SetComment (Draw_Interpretor& di,
     TDataStd_Comment::Set(L,TCollection_ExtendedString(arg[3],Standard_True));  
     return 0;
   }
-  di << "DDataStd_SetComment : Error" << "\n";
+  di << "DDataStd_SetComment : Error\n";
   return 1;
 }
 
@@ -209,7 +209,7 @@ static Standard_Integer DDataStd_GetInteger (Draw_Interpretor& di,
     di << A->Get();
     return 0;
   }
-  di << "DDataStd_GetInteger : Error" << "\n";
+  di << "DDataStd_GetInteger : Error\n";
   return 1;
 }
 
@@ -232,7 +232,7 @@ static Standard_Integer DDataStd_GetReal (Draw_Interpretor& di,
     di << A->Get();
     return 0;
   }
-  di << "DDataStd_GetReal : Error" << "\n";
+  di << "DDataStd_GetReal : Error\n";
   return 1;
 }
 
@@ -255,7 +255,7 @@ static Standard_Integer DDataStd_GetReference (Draw_Interpretor& di,
     di << entry.ToCString();
     return 0;
   }
-  di << "DDataStd_GetReference : Error" << "\n";
+  di << "DDataStd_GetReference : Error\n";
   return 1;
 }
 
@@ -277,7 +277,7 @@ static Standard_Integer DDataStd_GetComment (Draw_Interpretor& di,
     di << A->Get().ToExtString();
     return 0;
   }
-  di << "DDataStd_GetComment : Error" << "\n";
+  di << "DDataStd_GetComment : Error\n";
   return 1;
 }
 
@@ -306,7 +306,7 @@ static Standard_Integer DDataStd_Self (Draw_Interpretor& di,
 //    }
     return 0;
   } 
-  di << "Self : Error" << "\n";
+  di << "Self : Error\n";
   return 0;
 }
 
@@ -543,7 +543,7 @@ static Standard_Integer DDataStd_GetIntArrayValue (Draw_Interpretor& di,
   
   Standard_Integer index = Draw::Atoi(arg[3]);
   if (index < A->Lower() || index > A->Upper()) {
-    di << "Index is out of range" << "\n";
+    di << "Index is out of range\n";
     return 1;
   } else {
     di << A->Value(index) << "\n";
@@ -605,7 +605,7 @@ static Standard_Integer DDataStd_ChangeIntArray (Draw_Interpretor& di,
     }
     return 0;
   }
-  di << "DDataStd_ChangeIntArray: Error" << "\n";
+  di << "DDataStd_ChangeIntArray: Error\n";
   return 0; 
 } 
 
@@ -758,7 +758,7 @@ static Standard_Integer DDataStd_GetRealArrayValue (Draw_Interpretor& di,
   
   Standard_Integer index = Draw::Atoi(arg[3]);
   if (index < A->Lower() || index > A->Upper()) {
-    di << "Index is out of range" << "\n";
+    di << "Index is out of range\n";
     return 1;
   } else {
     di << A->Value(index) << "\n";
@@ -820,7 +820,7 @@ static Standard_Integer DDataStd_ChangeRealArray (Draw_Interpretor& di,
     }
     return 0;
   }
-  di << "DDataStd_ChangeRealArray: Error" << "\n";
+  di << "DDataStd_ChangeRealArray: Error\n";
   return 0; 
 } 
 
@@ -847,7 +847,7 @@ static Standard_Integer DDataStd_SetVariable (Draw_Interpretor& di,
     return 0; 
   }
 
-  di << "Wrong arguments" << "\n";  
+  di << "Wrong arguments\n";  
   return 1; 
 } 
 
@@ -868,7 +868,7 @@ static Standard_Integer DDataStd_GetVariable (Draw_Interpretor& di,
     Handle(TDataStd_Variable) aV;
     if (!label.FindAttribute(TDataStd_Variable::GetID(), aV))
     {
-      di << "TDataStd_Variable: no such attribute" << "\n";
+      di << "TDataStd_Variable: no such attribute\n";
     }
 
     Draw::Set(arg[3],TCollection_AsciiString(Standard_Integer(aV->IsConstant())).ToCString());
@@ -876,7 +876,7 @@ static Standard_Integer DDataStd_GetVariable (Draw_Interpretor& di,
     return 0; 
   }
 
-  di << "Wrong arguments" << "\n";  
+  di << "Wrong arguments\n";  
   return 1; 
 } 
 
@@ -909,14 +909,14 @@ static Standard_Integer DDataStd_SetRelation (Draw_Interpretor& di,
       }
       if (!label.FindAttribute(TDataStd_Variable::GetID(), aV))
       {
-        di << "No TDataStd_Variable Attribute on label" << "\n";
+        di << "No TDataStd_Variable Attribute on label\n";
         return 1;
       }
       aR->GetVariables().Append(aV);
     }
     return 0;
   }
-  di << "Usage: SetRelation (DF, entry, expression, var1[, var2, ...])" << "\n";
+  di << "Usage: SetRelation (DF, entry, expression, var1[, var2, ...])\n";
   return 1;
 }
 
@@ -964,7 +964,7 @@ static Standard_Integer DDataStd_DumpRelation (Draw_Interpretor& di,
     di << ")";
     return 0;
   }
-  di << "Usage: DumpRelation (DF, entry)" << "\n";
+  di << "Usage: DumpRelation (DF, entry)\n";
   return 1;
 }
 
@@ -1015,7 +1015,7 @@ static Standard_Integer DDataStd_GetFunction (Draw_Interpretor& di,
     Handle(TFunction_Function) aF;    
     if (!label.FindAttribute(TFunction_Function::GetID(), aF))
     {
-      di << "No TFunction_Function Attribute on label" << "\n";
+      di << "No TFunction_Function Attribute on label\n";
     }
     else
     {
@@ -1149,7 +1149,7 @@ static Standard_Integer DDataStd_GetExtStringArrayValue (Draw_Interpretor& di,
   
   Standard_Integer index = Draw::Atoi(arg[3]);
   if (index < A->Lower() || index > A->Upper()) {
-    di << "Index is out of range" << "\n";
+    di << "Index is out of range\n";
     return 1;
   } else {
     const TCollection_ExtendedString& value = A->Value(index);
@@ -1212,7 +1212,7 @@ static Standard_Integer DDataStd_ChangeExtStrArray (Draw_Interpretor& di,
     }    
     return 0;
   }
-  di << "DDataStd_ChangeExtStringArray: Error" << "\n";
+  di << "DDataStd_ChangeExtStringArray: Error\n";
   return 0; 
 } 
 
@@ -1259,7 +1259,7 @@ static Standard_Integer DDataStd_KeepUTF (Draw_Interpretor& di,
     }
     return 0;
   }
-  di << "SetUTFName : String is not kept in DF" << "\n";
+  di << "SetUTFName : String is not kept in DF\n";
   return 1;
 }
 
@@ -1324,7 +1324,7 @@ static Standard_Integer DDataStd_GetUTFtoFile (Draw_Interpretor& di,
     anOS.close();
     return 0;
   }
-  di << "GetUTF : Data is not extracted to the specified file " <<"\n";
+  di << "GetUTF : Data is not extracted to the specified file \n";
   return 1;
 }
 
@@ -1359,7 +1359,7 @@ static Standard_Integer DDataStd_SetByteArray (Draw_Interpretor& di,
     }
     return 0; 
   }
-  di << "DDataStd_SetByteArray: Error" << "\n";
+  di << "DDataStd_SetByteArray: Error\n";
   return 1; 
 } 
 
@@ -1436,7 +1436,7 @@ static Standard_Integer DDataStd_SetBooleanArray (Draw_Interpretor& di,
     }
     return 0; 
   }
-  di << "DDataStd_SetBooleanArray: Error" << "\n";
+  di << "DDataStd_SetBooleanArray: Error\n";
   return 1; 
 } 
 
@@ -1463,7 +1463,7 @@ static Standard_Integer DDataStd_SetBooleanArrayValue (Draw_Interpretor& di,
 
   // Check the value.
   if (value != 0 && value != 1) {
-    di << "DDataStd_SetBooleanArrayValue: Error! The value should be either 0 or 1." << "\n";
+    di << "DDataStd_SetBooleanArrayValue: Error! The value should be either 0 or 1.\n";
     return 1;
   }
 
@@ -1501,7 +1501,7 @@ static Standard_Integer DDataStd_SetExtStringList (Draw_Interpretor& di,
     }
     return 0; 
   }
-  di << "DDataStd_SetExtStringList: Error" << "\n";
+  di << "DDataStd_SetExtStringList: Error\n";
   return 1; 
 } 
 //
@@ -1532,7 +1532,7 @@ static Standard_Integer DDataStd_SetReferenceList (Draw_Interpretor& di,
       return 0; 
     }
   }
-  di << "DDataStd_SetReferenceList: Error" << "\n";
+  di << "DDataStd_SetReferenceList: Error\n";
   return 1; 
 } 
 
@@ -1565,7 +1565,7 @@ static Standard_Integer DDataStd_SetBooleanList (Draw_Interpretor& di,
     }
     return 0; 
   }
-  di << "DDataStd_SetBooleanList: Error" << "\n";
+  di << "DDataStd_SetBooleanList: Error\n";
   return 1; 
 } 
 
@@ -1592,7 +1592,7 @@ static Standard_Integer DDataStd_SetIntegerList (Draw_Interpretor& di,
     }
     return 0; 
   }
-  di << "DDataStd_SetIntegerList: Error" << "\n";
+  di << "DDataStd_SetIntegerList: Error\n";
   return 1; 
 } 
 
@@ -1619,7 +1619,7 @@ static Standard_Integer DDataStd_SetRealList (Draw_Interpretor& di,
     }
     return 0; 
   }
-  di << "DDataStd_SetRealList: Error" << "\n";
+  di << "DDataStd_SetRealList: Error\n";
   return 1; 
 } 
 
@@ -1681,7 +1681,7 @@ static Standard_Integer DDataStd_GetByteArrayValue (Draw_Interpretor& di,
   
   Standard_Integer index = Draw::Atoi(arg[3]);
   if (index < A->Lower() || index > A->Upper()) {
-    di << "Index is out of range" << "\n";
+    di << "Index is out of range\n";
     return 1;
   } else {
     di << A->Value(index) << "\n";
@@ -1750,7 +1750,7 @@ static Standard_Integer DDataStd_GetBooleanArrayValue (Draw_Interpretor& di,
   
   Standard_Integer index = Draw::Atoi(arg[3]);
   if (index < A->Lower() || index > A->Upper()) {
-    di << "Index is out of range" << "\n";
+    di << "Index is out of range\n";
     return 1;
   } else {
     di << ((A->Value(index) == Standard_True) ? "True" : "False") << "\n";
@@ -1816,7 +1816,7 @@ static Standard_Integer DDataStd_ChangeByteArray (Draw_Interpretor& di,
     }
     return 0;
   }
-  di << "DDataStd_ChangeByteArray: Error" << "\n";
+  di << "DDataStd_ChangeByteArray: Error\n";
   return 1; 
 }
 
@@ -1856,10 +1856,10 @@ static Standard_Integer DDataStd_GetBooleanList (Draw_Interpretor& di,
       }
       di << "\n";
     } else 
-       di << "List is empty" << "\n";
+       di << "List is empty\n";
     return 0; 
   }
-  di << "DDataStd_GetBooleanList: Error" << "\n";
+  di << "DDataStd_GetBooleanList: Error\n";
   return 1; 
 }
 
@@ -1899,11 +1899,11 @@ static Standard_Integer DDataStd_GetIntegerList (Draw_Interpretor& di,
       }
       di << "\n";
     } else 
-      di << "List is empty" << "\n";
+      di << "List is empty\n";
 
     return 0; 
   }
-  di << "DDataStd_GetIntegerList: Error" << "\n";
+  di << "DDataStd_GetIntegerList: Error\n";
   return 1; 
 }
 
@@ -1943,10 +1943,10 @@ static Standard_Integer DDataStd_GetRealList (Draw_Interpretor& di,
       }
       di << "\n";
     } else
-      di << "List is empty" << "\n";
+      di << "List is empty\n";
     return 0; 
   }
-  di << "DDataStd_GetRealList: Error" << "\n";
+  di << "DDataStd_GetRealList: Error\n";
   return 1; 
 }
 
@@ -1989,11 +1989,11 @@ static Standard_Integer DDataStd_GetExtStringList (Draw_Interpretor& di,
       di << "\n";
     }
     else {
-      di << "List is empty" << "\n";
+      di << "List is empty\n";
     }
     return 0; 
   }
-  di << "DDataStd_GetExtStringList: Error" << "\n";
+  di << "DDataStd_GetExtStringList: Error\n";
   return 1; 
 } 
 
@@ -2039,10 +2039,10 @@ static Standard_Integer DDataStd_GetReferenceList (Draw_Interpretor& di,
       }
       di << "\n";
     } else 
-      di << "List is empty" << "\n";
+      di << "List is empty\n";
     return 0;
   }
-  di << "DDataStd_GetReferenceList: Error" << "\n";
+  di << "DDataStd_GetReferenceList: Error\n";
   return 1; 
 } 
 //
@@ -2080,7 +2080,7 @@ static Standard_Integer DDataStd_SetIntPackedMap (Draw_Interpretor& di,
     cout << "Map extent = " << anAtt->Extent()<<endl;
     return 0; 
   }
-  di << "DDataStd_SetIntPackedMap : Error" << "\n";
+  di << "DDataStd_SetIntPackedMap : Error\n";
   return 1;
 } 
 
@@ -2111,7 +2111,7 @@ static Standard_Integer DDataStd_GetIntPackedMap (Draw_Interpretor& di,
       }
     return 0; 
   }
-  di << "DDataStd_GetIntPackedMap : Error" << "\n";
+  di << "DDataStd_GetIntPackedMap : Error\n";
   return 1;
 } 
 
@@ -2154,7 +2154,7 @@ static Standard_Integer DDataStd_ChangeIntPackedMap_Add (Draw_Interpretor& di,
     }
     return 0;
   }
-  di << "DDataStd_ChangeIntPackedMap_Add: Error" << "\n";
+  di << "DDataStd_ChangeIntPackedMap_Add: Error\n";
   return 0; 
 }
 
@@ -2197,7 +2197,7 @@ static Standard_Integer DDataStd_ChangeIntPackedMap_Rem (Draw_Interpretor& di,
     }
     return 0;
   }
-  di << "DDataStd_ChangeIntPackedMap_Rem: Error" << "\n";
+  di << "DDataStd_ChangeIntPackedMap_Rem: Error\n";
   return 0; 
 }
 
@@ -2242,7 +2242,7 @@ static Standard_Integer DDataStd_ChangeIntPackedMap_AddRem (Draw_Interpretor& di
     }
     return 0;
   }
-  di << "DDataStd_ChangeIntPackedMap_AddRem: Error" << "\n";
+  di << "DDataStd_ChangeIntPackedMap_AddRem: Error\n";
   return 0; 
 }
 
@@ -2278,7 +2278,7 @@ static Standard_Integer DDataStd_SetIntPHugeMap (Draw_Interpretor& di,
     cout << "Map extent = " << anAtt->Extent()<<endl;
     return 0; 
   }
-  di << "DDataStd_SetIntPHugeMap : Error" << "\n";
+  di << "DDataStd_SetIntPHugeMap : Error\n";
   return 1;
 }
 
@@ -2314,7 +2314,7 @@ static Standard_Integer DDataStd_SetNDataIntegers2 (Draw_Interpretor& di,
     }    
     return 0; 
   }
-  di << "DDataStd_SetNDataIntegers2 : Error" << "\n";
+  di << "DDataStd_SetNDataIntegers2 : Error\n";
   return 1;
 } 
 //================
@@ -2354,7 +2354,7 @@ static Standard_Integer DDataStd_SetNDataIntAr2 (Draw_Interpretor& di,
     anAtt->SetArrayOfIntegers(aKey, anArr); 
     return 0; 
   }
-  di << "DDataStd_SetNDataIntArrays2 : Error" << "\n";
+  di << "DDataStd_SetNDataIntArrays2 : Error\n";
   return 1;
 } 
 
@@ -2385,7 +2385,7 @@ static Standard_Integer DDataStd_SetAsciiString (Draw_Interpretor& di,
     cout << "String = " << anAtt->Get().ToCString() << " is kept in DF" << endl;
     return 0; 
   }
-  di << "DDataStd_SetAsciiString : Error" << "\n";
+  di << "DDataStd_SetAsciiString : Error\n";
   return 1;
 } 
 //
@@ -2411,7 +2411,7 @@ static Standard_Integer DDataStd_GetAsciiString (Draw_Interpretor& di,
     cout << "String = " <<anAtt->Get().ToCString()  << endl;
     return 0; 
   }
-  di << "DDataStd_GetAsciiString : Error" << "\n";
+  di << "DDataStd_GetAsciiString : Error\n";
   return 1;
 } 
 
@@ -2456,7 +2456,7 @@ static Standard_Integer DDataStd_SetNDataIntegers (Draw_Interpretor& di,
     }    
     return 0; 
   }
-  di << "DDataStd_SetNDataIntegers : Error" << "\n";
+  di << "DDataStd_SetNDataIntegers : Error\n";
   return 1;
 } 
 
@@ -2493,7 +2493,7 @@ static Standard_Integer DDataStd_GetNDIntegers (Draw_Interpretor& di,
 
     return 0; 
   }
-  di << "DDataStd_GetNDIntegers : Error" << "\n";
+  di << "DDataStd_GetNDIntegers : Error\n";
   return 1;
 } 
 
@@ -2529,7 +2529,7 @@ static Standard_Integer DDataStd_GetNDInteger (Draw_Interpretor& di,
       return 0; 
     }
   }
-  di << "DDataStd_SetNDataIntegers : Error" << "\n";
+  di << "DDataStd_SetNDataIntegers : Error\n";
   return 1;
 } 
 
@@ -2566,7 +2566,7 @@ static Standard_Integer DDataStd_SetNDataReals (Draw_Interpretor& di,
     }    
     return 0; 
   }
-  di << "DDataStd_SetNDataReals : Error" << "\n";
+  di << "DDataStd_SetNDataReals : Error\n";
   return 1;
 } 
 
@@ -2601,7 +2601,7 @@ static Standard_Integer DDataStd_GetNDReals (Draw_Interpretor& di,
       }
     return 0; 
   }
-  di << "DDataStd_GetNDReals : Error" << "\n";
+  di << "DDataStd_GetNDReals : Error\n";
   return 1;
 } 
 
@@ -2637,7 +2637,7 @@ static Standard_Integer DDataStd_GetNDReal (Draw_Interpretor& di,
       return 0; 
     }
   }
-  di << "DDataStd_GetNDReal : Error" << "\n";
+  di << "DDataStd_GetNDReal : Error\n";
   return 1;
 } 
 
@@ -2674,7 +2674,7 @@ static Standard_Integer DDataStd_SetNDataStrings (Draw_Interpretor& di,
     }    
     return 0; 
   }
-  di << "DDataStd_SetNDataStrings : Error" << "\n";
+  di << "DDataStd_SetNDataStrings : Error\n";
   return 1;
 } 
 
@@ -2710,7 +2710,7 @@ static Standard_Integer DDataStd_GetNDStrings (Draw_Interpretor& di,
       }
     return 0; 
   }
-  di << "DDataStd_GetNDStrings : Error" << "\n";
+  di << "DDataStd_GetNDStrings : Error\n";
   return 1;
 } 
 
@@ -2747,7 +2747,7 @@ static Standard_Integer DDataStd_GetNDString (Draw_Interpretor& di,
       return 0; 
     }
   }
-  di << "DDataStd_GetNDString : Error" << "\n";
+  di << "DDataStd_GetNDString : Error\n";
   return 1;
 } 
 
@@ -2784,7 +2784,7 @@ static Standard_Integer DDataStd_SetNDataBytes (Draw_Interpretor& di,
     }    
     return 0; 
   }
-  di << "DDataStd_SetNDataBytes : Error" << "\n";
+  di << "DDataStd_SetNDataBytes : Error\n";
   return 1;
 } 
 
@@ -2819,7 +2819,7 @@ static Standard_Integer DDataStd_GetNDBytes (Draw_Interpretor& di,
       }
     return 0; 
   }
-  di << "DDataStd_GetNDBytes : Error" << "\n";
+  di << "DDataStd_GetNDBytes : Error\n";
   return 1;
 } 
 
@@ -2855,7 +2855,7 @@ static Standard_Integer DDataStd_GetNDByte (Draw_Interpretor& di,
       return 0; 
     }
   }
-  di << "DDataStd_GetNDByte : Error" << "\n";
+  di << "DDataStd_GetNDByte : Error\n";
   return 1;
 } 
 //======================== IntArrays ====================================
@@ -2895,7 +2895,7 @@ static Standard_Integer DDataStd_SetNDataIntAr (Draw_Interpretor& di,
     anAtt->SetArrayOfIntegers(aKey, anArr); 
     return 0; 
   }
-  di << "DDataStd_SetNDataIntArrays : Error" << "\n";
+  di << "DDataStd_SetNDataIntArrays : Error\n";
   return 1;
 } 
 
@@ -2933,14 +2933,14 @@ static Standard_Integer DDataStd_GetNDIntArrays (Draw_Interpretor& di,
 	Standard_Integer upper = anArrValue->Upper();
 	for(Standard_Integer i = lower; i<=upper;i++) {
 	  Standard_Integer aValue = anArrValue->Value(i);
-	  cout << "\tValue("<<i<<")"<<" = " <<aValue<<endl;
+	  cout << "\tValue("<<i<<") = " <<aValue<<endl;
 	}
       } else 
 	 cout << "\tthe specified array is Null "<<endl;
     }
     return 0; 
   }
-  di << "DDataStd_GetNDIntArrays : Error" << "\n";
+  di << "DDataStd_GetNDIntArrays : Error\n";
   return 1;
 } 
 
@@ -2978,14 +2978,14 @@ static Standard_Integer DDataStd_GetNDIntArray (Draw_Interpretor& di,
 	Standard_Integer upper = anArrValue->Upper();
 	for(Standard_Integer i = lower; i<=upper;i++) {
 	  Standard_Integer aValue = anArrValue->Value(i);
-	  cout << "\tValue("<<i<<")"<<" = " <<aValue<<endl;
+	  cout << "\tValue("<<i<<") = " <<aValue<<endl;
 	}
       } else 
 	cout << "\tthe specified array is Null or not found"<<endl;
       return 0; 
     }
   }
-  di << "DDataStd_SetNDataIntArray : Error" << "\n";
+  di << "DDataStd_SetNDataIntArray : Error\n";
   return 1;
 } 
 //============================= RealArrays ==============================
@@ -3025,7 +3025,7 @@ static Standard_Integer DDataStd_SetNDataRealAr (Draw_Interpretor& di,
     anAtt->SetArrayOfReals(aKey, anArr); 
     return 0; 
   }
-  di << "DDataStd_SetNDataRealArrays : Error" << "\n";
+  di << "DDataStd_SetNDataRealArrays : Error\n";
   return 1;
 } 
 
@@ -3063,14 +3063,14 @@ static Standard_Integer DDataStd_GetNDRealArrays (Draw_Interpretor& di,
 	Standard_Integer upper = anArrValue->Upper();
 	for(Standard_Integer i = lower; i<=upper;i++) {
 	  Standard_Real aValue = anArrValue->Value(i);
-	  cout << "\tValue("<<i<<")"<<" = " <<aValue<<endl;
+	  cout << "\tValue("<<i<<") = " <<aValue<<endl;
 	}
       } else 
 	 cout << "\tthe specified array is Null "<<endl;
     }
     return 0; 
   }
-  di << "DDataStd_GetNDRealArrays : Error" << "\n";
+  di << "DDataStd_GetNDRealArrays : Error\n";
   return 1;
 } 
 
@@ -3108,14 +3108,14 @@ static Standard_Integer DDataStd_GetNDRealArray (Draw_Interpretor& di,
 	Standard_Integer upper = anArrValue->Upper();
 	for(Standard_Integer i = lower; i<=upper;i++) {
 	  Standard_Real aValue = anArrValue->Value(i);
-	  cout << "\tValue("<<i<<")"<<" = " <<aValue<<endl;
+	  cout << "\tValue("<<i<<") = " <<aValue<<endl;
 	}
       } else 
 	cout << "\tthe specified array is Null or not found"<<endl;
       return 0; 
     }
   }
-  di << "DDataStd_SetNDataRealArray : Error" << "\n";
+  di << "DDataStd_SetNDataRealArray : Error\n";
   return 1;
 }
 
@@ -3240,7 +3240,7 @@ static Standard_Integer DDataStd_GetRefArrayValue (Draw_Interpretor& di,
   
   Standard_Integer index = Draw::Atoi(arg[3]);
   if (index < A->Lower() || index > A->Upper()) {
-    di << "Index is out of range" << "\n";
+    di << "Index is out of range\n";
     return 1;
   } else {
     const TDF_Label& value = A->Value(index);

src/DDataStd/DDataStd_ConstraintCommands.cxx

@@ -47,9 +47,9 @@ static Standard_Integer DDataStd_SetConstraint (Draw_Interpretor& di,
 {   
   if (nb < 5)
   {
-    di << "usage: SetConstraint DF entry keyword geometrie [geometrie ...]" << "\n";
-    di << "or SetConstraint DF entry \"plane\" geometrie - to set plane for existing constraint" << "\n";
-    di << "or SetConstraint DF entry \"value\" value - to set value for existing constraint" << "\n";
+    di << "usage: SetConstraint DF entry keyword geometrie [geometrie ...]\n";
+    di << "or SetConstraint DF entry \"plane\" geometrie - to set plane for existing constraint\n";
+    di << "or SetConstraint DF entry \"value\" value - to set value for existing constraint\n";
     return 1;
   }
 
@@ -122,10 +122,10 @@ static Standard_Integer DDataStd_SetConstraint (Draw_Interpretor& di,
     else if (strcmp(aT,"offset") == 0) aCT = TDataXtd_OFFSET;
     else
     {
-      di << "DDataStd_SetConstraint : unknown type, must be one of:" << "\n";
-      di << "rad/dia/minr/majr/tan/par/perp/concentric/equal/dist/angle/eqrad/symm/midp/" << "\n";
-      di << "eqdist/fix/rigid or from/axis/mate/alignf/aligna/axesa/facesa/round/offset" << "\n";
-      di << "or plane/value" << "\n";
+      di << "DDataStd_SetConstraint : unknown type, must be one of:\n";
+      di << "rad/dia/minr/majr/tan/par/perp/concentric/equal/dist/angle/eqrad/symm/midp/\n";
+      di << "eqdist/fix/rigid or from/axis/mate/alignf/aligna/axesa/facesa/round/offset\n";
+      di << "or plane/value\n";
       return 1;
     }
 
@@ -186,7 +186,7 @@ static Standard_Integer DDataStd_GetConstraint (Draw_Interpretor& di,
     }
     return 0;
   }
-  di << "DDataStd_GetConstraint : Error : not done" << "\n";
+  di << "DDataStd_GetConstraint : Error : not done\n";
   return 1;
 }
 
@@ -200,7 +200,7 @@ static Standard_Integer DDataStd_SetPattern (Draw_Interpretor& di,
 {   
   if (nb < 5)
   {
-    di << "usage: SetPattern (DF,entry,signature,NSentry[realEntry,intEntry[,NSentry,realEntry,intEntry]])" << "\n";
+    di << "usage: SetPattern (DF,entry,signature,NSentry[realEntry,intEntry[,NSentry,realEntry,intEntry]])\n";
     return 1;
   }
 
@@ -226,9 +226,9 @@ static Standard_Integer DDataStd_SetPattern (Draw_Interpretor& di,
   {
     if (nb < 7)
     {
-      di<<"usage:"<<"\n";
-      di<<"SetPattern (DF,entry,signature<=2,NSentry,realEntry,intEntry)"<<"\n";
-      di<<"SetPattern (DF,entry,2<signature<5,NSentry,realEntry,intEntry,NSentry,realEntry,intEntry)"<<"\n";
+      di<<"usage:\n";
+      di<<"SetPattern (DF,entry,signature<=2,NSentry,realEntry,intEntry)\n";
+      di<<"SetPattern (DF,entry,2<signature<5,NSentry,realEntry,intEntry,NSentry,realEntry,intEntry)\n";
       return 1;
     }
 
@@ -257,8 +257,8 @@ static Standard_Integer DDataStd_SetPattern (Draw_Interpretor& di,
     {
       if (nb < 10)
       {
-        di<<"usage:"<<"\n";
-        di<<"SetPattern (DF,entry,2<signature<5,NSentry,realEntry,intEntry,NSentry,realEntry,intEntry)"<<"\n";
+        di<<"usage:\n";
+        di<<"SetPattern (DF,entry,2<signature<5,NSentry,realEntry,intEntry,NSentry,realEntry,intEntry)\n";
         return 1;
       }
 
@@ -288,7 +288,7 @@ static Standard_Integer DDataStd_SetPattern (Draw_Interpretor& di,
   {
     if (nb > 5)
     {
-      di<<"usage: SetPattern (DF,entry,signature>=5,NSentry)"<<"\n";
+      di<<"usage: SetPattern (DF,entry,signature>=5,NSentry)\n";
       return 1;
     }
 
@@ -387,7 +387,7 @@ static Standard_Integer DDataStd_DumpPattern (Draw_Interpretor& di,
     }
     return 0;
   }
-  di << "DDataStd_DumpPattern : Error : not done" << "\n";
+  di << "DDataStd_DumpPattern : Error : not done\n";
   return 1;
 }
 
@@ -411,7 +411,7 @@ static Standard_Integer DDataStd_SetPosition (Draw_Interpretor& di,
     TDataXtd_Position::Set(L,aPos);  
     return 0;
   }
-  di << "Usage: SetPosition (DF, entry, X, Y, Z)" << "\n";
+  di << "Usage: SetPosition (DF, entry, X, Y, Z)\n";
   return 1;
 }
 
@@ -432,7 +432,7 @@ static Standard_Integer DDataStd_GetPosition (Draw_Interpretor& di,
     gp_Pnt aPos;
     if (!TDataXtd_Position::Get(L, aPos))
     {
-      di << "There is no TDataStd_Position attribute on this label" << "\n";
+      di << "There is no TDataStd_Position attribute on this label\n";
       return -1;
     }
 
@@ -441,7 +441,7 @@ static Standard_Integer DDataStd_GetPosition (Draw_Interpretor& di,
     Draw::Set(arg[5],TCollection_AsciiString(aPos.Z()).ToCString());
     return 0;
   }
-  di << "Usage: GetPosition (DF, entry, X(out), Y(out), Z(out))" << "\n";
+  di << "Usage: GetPosition (DF, entry, X(out), Y(out), Z(out))\n";
   return 1;
 }
 

src/DDataStd/DDataStd_DatumCommands.cxx

@@ -75,7 +75,7 @@ static Standard_Integer DDataStd_SetPoint (Draw_Interpretor& di,
       TDataXtd_Point::Set (L,p);
     }
     else {
-      di << "DDataStd_SetPoint : not a point" << "\n";
+      di << "DDataStd_SetPoint : not a point\n";
       return 1;
     }
   }  
@@ -104,7 +104,7 @@ static Standard_Integer DDataStd_SetAxis (Draw_Interpretor& di,
   else if (nb == 4) { 
     Handle(Geom_Line) LINE =  Handle(Geom_Line)::DownCast(DrawTrSurf::Get (arg[3]));
     if (LINE.IsNull()) {
-      di << "DDataStd_SetAxis : not a line" << "\n";
+      di << "DDataStd_SetAxis : not a line\n";
       return 1;
     }
     TDataXtd_Axis::Set (L,LINE->Lin()); 
@@ -135,7 +135,7 @@ static Standard_Integer DDataStd_SetPlane (Draw_Interpretor& di,
   else if (nb == 4) {
     Handle(Geom_Plane) PLANE =  Handle(Geom_Plane)::DownCast(DrawTrSurf::Get (arg[3]));
     if (PLANE.IsNull()) {
-      di << "DDataStd_SetPlane : not a plane" << "\n";
+      di << "DDataStd_SetPlane : not a plane\n";
       return 1;
     }
     TDataXtd_Plane::Set (L,PLANE->Pln()); 
@@ -237,7 +237,7 @@ static Standard_Integer DDataStd_SetGeometry (Draw_Interpretor& di,
   {
     // set NS attribute
     TopoDS_Shape s = DBRep::Get(arg[4]);  
-    if (s.IsNull()) { di <<"shape not found"<< "\n"; return 1;}  
+    if (s.IsNull()) { di <<"shape not found\n"; return 1;}  
     TNaming_Builder SI (L);
     SI.Generated(s);
   }
@@ -260,8 +260,8 @@ static Standard_Integer DDataStd_SetGeometry (Draw_Interpretor& di,
     else if (strcmp(aT,"cyl") == 0) aType = TDataXtd_CYLINDER;
     else
     {
-      di << "DDataStd_SetGeometry : unknown type, must be one of:" << "\n";
-      di << "any/pnt/lin/cir/ell/spl/pln/cyl" << "\n";
+      di << "DDataStd_SetGeometry : unknown type, must be one of:\n";
+      di << "any/pnt/lin/cir/ell/spl/pln/cyl\n";
       return 1;
     }
   }
@@ -295,7 +295,7 @@ static Standard_Integer DDataStd_GetGeometryType (Draw_Interpretor& di,
   Handle(TDataXtd_Geometry) aGA;
   if (!L.FindAttribute(TDataXtd_Geometry::GetID(),aGA))
   {
-    di << "TDataStd_Geometry : attribute not found" << "\n";
+    di << "TDataStd_Geometry : attribute not found\n";
     return 1;
   }
 
@@ -313,7 +313,7 @@ static Standard_Integer DDataStd_GetGeometryType (Draw_Interpretor& di,
   case TDataXtd_CYLINDER:  di <<"cyl"; break;
   default:
     {
-      di << "DDataStd_GetGeometry : unknown type" << "\n";
+      di << "DDataStd_GetGeometry : unknown type\n";
       return 1;
     }
   }

src/DDataStd/DDataStd_DrawDisplayCommands.cxx

@@ -77,7 +77,7 @@ static Standard_Integer DDataStd_PNT (Draw_Interpretor& di,
     TDataXtd_Point::Set (L,gp_Pnt(x,y,z));
     return 0;
   }  
-  di << "DDataStd_PNT : Error : not done" << "\n";
+  di << "DDataStd_PNT : Error : not done\n";
   return 1;
 }
  
@@ -96,7 +96,7 @@ static Standard_Integer DDataStd_Rmdraw (Draw_Interpretor& di,
     if (!D3D.IsNull()) dout.RemoveDrawable(D3D); 
     return 0;
   }
-  di << "DDataStd_Rmdraw : Error : not done" << "\n";
+  di << "DDataStd_Rmdraw : Error : not done\n";
   return 1;
 }
 
@@ -125,7 +125,7 @@ static Standard_Integer DDataStd_DrawOwner (Draw_Interpretor& di,
     else di << 0;
     return 0;
   }
-  di << "DDataStd_DrawOwner : Error" << "\n";
+  di << "DDataStd_DrawOwner : Error\n";
   return 1;
 }
 
@@ -146,7 +146,7 @@ static Standard_Integer DDataStd_DrawDisplay (Draw_Interpretor& di,
     DDataStd_DrawPresentation::Display(L);
     return 0;
   }
-  di << "DDataStd_DrawDisplay : Error" << "\n";
+  di << "DDataStd_DrawDisplay : Error\n";
   return 1;
 }
 
@@ -189,7 +189,7 @@ static Standard_Integer DDataStd_DrawErase (Draw_Interpretor& di,
     DDataStd_DrawPresentation::Erase(L);
     return 0;
   }
-  di << "DDataStd_DrawErase : Error" << "\n";
+  di << "DDataStd_DrawErase : Error\n";
   return 1;
 }
 
@@ -210,7 +210,7 @@ static Standard_Integer DDataStd_DrawUpdate (Draw_Interpretor& di,
     DDataStd_DrawPresentation::Update(L);
     return 0;
   }
-  di << "DDataStd_DrawUpdate : Error" << "\n";
+  di << "DDataStd_DrawUpdate : Error\n";
   return 1;
 }
 

src/DDataStd/DDataStd_NameCommands.cxx

@@ -71,7 +71,7 @@ static Standard_Integer DDataStd_SetName (Draw_Interpretor& di,
     N = TDataStd_Name::Set(L,arg[3]); 
     return 0;
   }
-  di << "DDataStd_SetName : Error" << "\n";
+  di << "DDataStd_SetName : Error\n";
   return 1;
 }
 
@@ -97,7 +97,7 @@ static Standard_Integer DDataStd_GetName (Draw_Interpretor& di,
     di << s.ToCString();
     return 0;
   }
-  di << "DDataStd_SetName : Error" << "\n";
+  di << "DDataStd_SetName : Error\n";
   return 1;
 }
 

src/DDataStd/DDataStd_NamedShapeCommands.cxx

@@ -48,14 +48,14 @@ static Standard_Integer DDataStd_SetShape (Draw_Interpretor& di,
     Handle(TDF_Data) DF;
     if (!DDF::GetDF(arg[1],DF)) return 1;  
     TopoDS_Shape s = DBRep::Get(arg[3]);  
-    if (s.IsNull()) { di <<"shape not found"<< "\n"; return 1;}  
+    if (s.IsNull()) { di <<"shape not found\n"; return 1;}  
     TDF_Label L;
     DDF::AddLabel(DF, arg[2], L);
     TNaming_Builder SI (L);
     SI.Generated(s);
     return 0;
   }
-  di << "DDataStd_SetShape : Error" << "\n";
+  di << "DDataStd_SetShape : Error\n";
   return 1;
 }
 

src/DDataStd/DDataStd_ObjectCommands.cxx

@@ -136,7 +136,7 @@ static Standard_Integer DDataStd_NewNoteBook (Draw_Interpretor& di,
     TDataStd_NoteBook::New(L);
     return 0;
   }
-  di << "DDataStd_NewNoteBook : Error" << "\n";
+  di << "DDataStd_NewNoteBook : Error\n";
   return 1;
 }
 

src/DDataStd/DDataStd_TreeCommands.cxx

@@ -53,7 +53,7 @@ static Standard_Integer DDataStd_SetNode (Draw_Interpretor& di,
     return 0;
   } else if (n == 4) {
     if (!Standard_GUID::CheckGUIDFormat(a[3])) {
-      di<<"DDataStd_SetNode: The format of GUID is invalid"<<"\n";
+      di<<"DDataStd_SetNode: The format of GUID is invalid\n";
       return 1;
     }
     const Standard_GUID ID(a[3]);
@@ -61,7 +61,7 @@ static Standard_Integer DDataStd_SetNode (Draw_Interpretor& di,
     DDF::ReturnLabel(di,TN->Label());
     return 0;    
   }
-  di << "DDataStd_SetNode : Error" << "\n";
+  di << "DDataStd_SetNode : Error\n";
   return 1;
 }    
 
@@ -84,7 +84,7 @@ static Standard_Integer DDataStd_AppendNode (Draw_Interpretor& di,
       ID=Standard_GUID(TDataStd_TreeNode::GetDefaultTreeID());
     else{
       if (!Standard_GUID::CheckGUIDFormat(a[4])) {
-	di<<"DDataStd_AppendNode: The format of GUID is invalid"<<"\n";
+	di<<"DDataStd_AppendNode: The format of GUID is invalid\n";
 	return 1;
       }
       const Standard_GUID varID(a[4]);
@@ -97,17 +97,17 @@ static Standard_Integer DDataStd_AppendNode (Draw_Interpretor& di,
     DDF::AddLabel(DF,a[3],L);
     if ( (L.FindAttribute(ID,child))
        &&(!child->IsRoot()) ){
-      di << "DDataStd_AppendNode : Error : childTreeNode don't detach" << "\n";
+      di << "DDataStd_AppendNode : Error : childTreeNode don't detach\n";
       return 1;
     }
     child = TDataStd_TreeNode::Set(L,ID);
     if (!father->Append(child)) return 1;
 #ifdef OCCT_DEBUG
-    di<<"AppendNode: OK"<<"\n";
+    di<<"AppendNode: OK\n";
 #endif
     return 0;
   }
-  di << "DDataStd_AppendNode : Error" << "\n";
+  di << "DDataStd_AppendNode : Error\n";
   return 1;
 }
 
@@ -130,7 +130,7 @@ static Standard_Integer DDataStd_PrependNode (Draw_Interpretor& di,
       ID=Standard_GUID(TDataStd_TreeNode::GetDefaultTreeID());
     else{
       if (!Standard_GUID::CheckGUIDFormat(a[4])) {
-	di<<"DDataStd_PrependNode: The format of GUID is invalid"<<"\n";
+	di<<"DDataStd_PrependNode: The format of GUID is invalid\n";
 	return 1;
       }
       const Standard_GUID varID(a[4]);
@@ -143,17 +143,17 @@ static Standard_Integer DDataStd_PrependNode (Draw_Interpretor& di,
     DDF::AddLabel(DF,a[3],L);
     if ( (L.FindAttribute(ID,child))
        &&(!child->IsRoot()) ){
-      di << "DDataStd_PrependNode : Error : childTreeNode don't detach" << "\n";
+      di << "DDataStd_PrependNode : Error : childTreeNode don't detach\n";
       return 1;
     }
     child = TDataStd_TreeNode::Set(L,ID);
     if (!father->Prepend(child)) return 1;
 #ifdef OCCT_DEBUG
-    di<<"PrependNode: OK"<<"\n";
+    di<<"PrependNode: OK\n";
 #endif
     return 0;
   }
-  di << "DDataStd_PrependNode : Error" << "\n";
+  di << "DDataStd_PrependNode : Error\n";
   return 1;
 }
 
@@ -176,7 +176,7 @@ static Standard_Integer DDataStd_RootNode (Draw_Interpretor& di,
       ID=Standard_GUID(TDataStd_TreeNode::GetDefaultTreeID());
     else{
       if (!Standard_GUID::CheckGUIDFormat(a[3])) {
-	di<<"DDataStd_RootNode: The format of GUID is invalid"<<"\n";
+	di<<"DDataStd_RootNode: The format of GUID is invalid\n";
 	return 1;
       }
       const Standard_GUID varID(a[3]);
@@ -187,7 +187,7 @@ static Standard_Integer DDataStd_RootNode (Draw_Interpretor& di,
     DDF::ReturnLabel(di,TN->Root()->Label());
     return 0;
   }
-  di << "DDataStd_RootNode : Error" << "\n";
+  di << "DDataStd_RootNode : Error\n";
   return 1;
 }
 
@@ -210,7 +210,7 @@ static Standard_Integer DDataStd_InsertNodeBefore(Draw_Interpretor& di,
       ID=Standard_GUID(TDataStd_TreeNode::GetDefaultTreeID());
     else{
       if (!Standard_GUID::CheckGUIDFormat(a[4])) {
-	di<<"DDataStd_InsertNodeBefore: The format of GUID is invalid"<<"\n";
+	di<<"DDataStd_InsertNodeBefore: The format of GUID is invalid\n";
 	return 1;
       }
       const Standard_GUID varID(a[4]);
@@ -226,7 +226,7 @@ static Standard_Integer DDataStd_InsertNodeBefore(Draw_Interpretor& di,
     if (!current->InsertBefore(TN)) return 1;
     return 0;
   }
-  di << "DDataStd_InsertBefore : Error" << "\n";
+  di << "DDataStd_InsertBefore : Error\n";
   return 1;
 }
 
@@ -249,7 +249,7 @@ static Standard_Integer DDataStd_InsertNodeAfter(Draw_Interpretor& di,
       ID=Standard_GUID(TDataStd_TreeNode::GetDefaultTreeID());
     else{
       if (!Standard_GUID::CheckGUIDFormat(a[4])) {
-	di<<"DDataStd_InsertNodeAfter: The format of GUID is invalid"<<"\n";
+	di<<"DDataStd_InsertNodeAfter: The format of GUID is invalid\n";
 	return 1;
       }
       const Standard_GUID varID(a[4]);
@@ -264,7 +264,7 @@ static Standard_Integer DDataStd_InsertNodeAfter(Draw_Interpretor& di,
     if (!current->InsertAfter(TN)) return 1;
     return 0;
   }
-  di << "DDataStd_InsertNodeAfter : Error" << "\n";
+  di << "DDataStd_InsertNodeAfter : Error\n";
   return 1;
 }
 
@@ -285,7 +285,7 @@ static Standard_Integer DDataStd_DetachNode (Draw_Interpretor& di,Standard_Integ
       ID=Standard_GUID(TDataStd_TreeNode::GetDefaultTreeID());
     else{
       if (!Standard_GUID::CheckGUIDFormat(a[3])) {
-	di<<"DDataStd_DetachNode: The format of GUID is invalid"<<"\n";
+	di<<"DDataStd_DetachNode: The format of GUID is invalid\n";
 	return 1;
       }
       const Standard_GUID varID(a[3]);
@@ -294,10 +294,10 @@ static Standard_Integer DDataStd_DetachNode (Draw_Interpretor& di,Standard_Integ
 
     if (!DDF::Find(DF,a[2],ID,TN)) return 1;
     if (!TN->Remove())
-      di << "Can't Detach the TreeNode" << "\n";
+      di << "Can't Detach the TreeNode\n";
     return 0; 
   } 
-  di << "DDataStd_DetachNode : Error" << "\n";
+  di << "DDataStd_DetachNode : Error\n";
   return 1;
 }
 
@@ -384,7 +384,7 @@ static Standard_Integer DDataStd_ChildNodeIterate (Draw_Interpretor& di,
       ID=Standard_GUID(TDataStd_TreeNode::GetDefaultTreeID());
     else{
       if (!Standard_GUID::CheckGUIDFormat(a[4])) {
-	di<<"DDataStd_ChildNodeIterate: The format of GUID is invalid"<<"\n";
+	di<<"DDataStd_ChildNodeIterate: The format of GUID is invalid\n";
 	return 1;
       }
       const Standard_GUID varID(a[4]);
@@ -392,7 +392,7 @@ static Standard_Integer DDataStd_ChildNodeIterate (Draw_Interpretor& di,
     }
 
     if (!DDF::Find(DF, a[2], ID, TN)) return 1; 
-    //di<<"TDataStd_ChildNodeIterator: "<<"\n";
+    //di<<"TDataStd_ChildNodeIterator: \n";
     TDataStd_ChildNodeIterator itr(TN, AllLevels);
     for (; itr.More(); itr.Next()) {
       Value = itr.Value();
@@ -406,7 +406,7 @@ static Standard_Integer DDataStd_ChildNodeIterate (Draw_Interpretor& di,
     di<<"\n";
     return 0;
   }
-  di << "DDataStd_ChildNodeIterate : Error" << "\n";
+  di << "DDataStd_ChildNodeIterate : Error\n";
   return 1;
 }  
 
@@ -431,7 +431,7 @@ static Standard_Integer DDataStd_InitChildNodeIterator (Draw_Interpretor& di,
       ID=Standard_GUID(TDataStd_TreeNode::GetDefaultTreeID());
     else{
       if (!Standard_GUID::CheckGUIDFormat(a[4])) {
-	di<<"DDataStd_ChildNodeIterator: The format of GUID is invalid"<<"\n";
+	di<<"DDataStd_ChildNodeIterator: The format of GUID is invalid\n";
 	return 1;
       }
       const Standard_GUID varID(a[4]);
@@ -443,7 +443,7 @@ static Standard_Integer DDataStd_InitChildNodeIterator (Draw_Interpretor& di,
     cni.Initialize(TN, AllLevels);
     return 0;
   }
-  di << "DDataStd_InitChildNodeIterator : Error" << "\n";
+  di << "DDataStd_InitChildNodeIterator : Error\n";
   return 1;
 }  
 
@@ -458,11 +458,11 @@ static Standard_Integer DDataStd_ChildNodeMore (Draw_Interpretor& di,
 {
   if (cni.More()) {
     //cout<<"TRUE"<<endl;
-    di<<"TRUE"<<"\n";
+    di<<"TRUE\n";
   }
   else {
     //cout<<"FALSE"<<endl;
-    di<<"FALSE"<<"\n";  
+    di<<"FALSE\n";  
   }
   return 0;
 }