PrintF refactored completely.

astand · astand · commit ff267a4b6167 · 2021-01-11T16:58:20.000+03:00
diff --git a/src/codegen/c-main-generator.cpp b/src/codegen/c-main-generator.cpp
@@ -59,8 +59,7 @@ void CiMainGenerator::Generate(std::vector<MessageDescriptor_t*>& msgs, const Fs
   fwriter->AppendLine("#ifdef __cplusplus\nextern \"C\" {\n#endif", 2);
   fwriter->AppendLine("#include <stdint.h>", 2);
 
-  snprintf(wbuff, kWBUFF_len, "#ifdef %s", fsd.usemon_def.c_str());
-  fwriter->AppendLine(wbuff);
+  fwriter->AppendLine(PrintF("#ifdef %s", fsd.usemon_def.c_str()));
 
   fwriter->AppendText(
     "// This file must define:\n"
@@ -200,8 +199,7 @@ void CiMainGenerator::WriteSigStructField(const SignalDescriptor_t& sig, bool bi
 
   if (bits && (sig.LengthBit < 8))
   {
-    snprintf(wbuff, kWBUFF_len, " : %d", sig.LengthBit);
-    dtype += wbuff;
+    dtype += PrintF(" : %d", sig.LengthBit);
   }
 
   dtype += ";";
@@ -217,25 +215,21 @@ void CiMainGenerator::WriteSigStructField(const SignalDescriptor_t& sig, bool bi
 
   fwriter->AppendText(pad);
 
-  snprintf(wbuff, kWBUFF_len, " Bits=%2d", sig.LengthBit);
-  fwriter->AppendText(wbuff);
+  fwriter->AppendText(PrintF(" Bits=%2d", sig.LengthBit));
 
   if (sig.Unit.size() > 0)
   {
-    snprintf(wbuff, kWBUFF_len, " Unit:'%-13s'", sig.Unit.c_str());
-    fwriter->AppendText(wbuff);
+    fwriter->AppendText(PrintF(" Unit:'%-13s'", sig.Unit.c_str()));
   }
 
   if (sig.Offset != 0)
   {
-    snprintf(wbuff, kWBUFF_len, " Offset= %-18f", sig.Offset);
-    fwriter->AppendText(wbuff);
+    fwriter->AppendText(PrintF(" Offset= %-18f", sig.Offset));
   }
 
   if (sig.Factor != 1)
   {
-    snprintf(wbuff, kWBUFF_len, " Factor= %-15d", sig.LengthBit);
-    fwriter->AppendText(wbuff);
+    fwriter->AppendText(PrintF(" Factor= %-15d", sig.LengthBit));
   }
 
   fwriter->AppendLine("", 2);

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ void CiMainGenerator::Generate(std::vector<MessageDescriptor_t*>& msgs, const Fs`
`59`	`59`	`fwriter->AppendLine("#ifdef __cplusplus\nextern \"C\" {\n#endif", 2);`
`60`	`60`	`fwriter->AppendLine("#include <stdint.h>", 2);`
`61`	`61`
`62`		`- snprintf(wbuff, kWBUFF_len, "#ifdef %s", fsd.usemon_def.c_str());`
`63`		`- fwriter->AppendLine(wbuff);`
	`62`	`+ fwriter->AppendLine(PrintF("#ifdef %s", fsd.usemon_def.c_str()));`
`64`	`63`
`65`	`64`	`fwriter->AppendText(`
`66`	`65`	`"// This file must define:\n"`
`@@ -200,8 +199,7 @@ void CiMainGenerator::WriteSigStructField(const SignalDescriptor_t& sig, bool bi`
`200`	`199`
`201`	`200`	`if (bits && (sig.LengthBit < 8))`
`202`	`201`	`{`
`203`		`- snprintf(wbuff, kWBUFF_len, " : %d", sig.LengthBit);`
`204`		`- dtype += wbuff;`
	`202`	`+ dtype += PrintF(" : %d", sig.LengthBit);`
`205`	`203`	`}`
`206`	`204`
`207`	`205`	`dtype += ";";`
`@@ -217,25 +215,21 @@ void CiMainGenerator::WriteSigStructField(const SignalDescriptor_t& sig, bool bi`
`217`	`215`
`218`	`216`	`fwriter->AppendText(pad);`
`219`	`217`
`220`		`- snprintf(wbuff, kWBUFF_len, " Bits=%2d", sig.LengthBit);`
`221`		`- fwriter->AppendText(wbuff);`
	`218`	`+ fwriter->AppendText(PrintF(" Bits=%2d", sig.LengthBit));`
`222`	`219`
`223`	`220`	`if (sig.Unit.size() > 0)`
`224`	`221`	`{`
`225`		`- snprintf(wbuff, kWBUFF_len, " Unit:'%-13s'", sig.Unit.c_str());`
`226`		`- fwriter->AppendText(wbuff);`
	`222`	`+ fwriter->AppendText(PrintF(" Unit:'%-13s'", sig.Unit.c_str()));`
`227`	`223`	`}`
`228`	`224`
`229`	`225`	`if (sig.Offset != 0)`
`230`	`226`	`{`
`231`		`- snprintf(wbuff, kWBUFF_len, " Offset= %-18f", sig.Offset);`
`232`		`- fwriter->AppendText(wbuff);`
	`227`	`+ fwriter->AppendText(PrintF(" Offset= %-18f", sig.Offset));`
`233`	`228`	`}`
`234`	`229`
`235`	`230`	`if (sig.Factor != 1)`
`236`	`231`	`{`
`237`		`- snprintf(wbuff, kWBUFF_len, " Factor= %-15d", sig.LengthBit);`
`238`		`- fwriter->AppendText(wbuff);`
	`232`	`+ fwriter->AppendText(PrintF(" Factor= %-15d", sig.LengthBit));`
`239`	`233`	`}`
`240`	`234`
`241`	`235`	`fwriter->AppendLine("", 2);`