Fix conversion warning in StatusArg

mrotteveel · mrotteveel · commit 3e3c65b934be · 2025-07-10T08:54:31.000+02:00
+ constexpr
diff --git a/src/common/StatusArg.cpp b/src/common/StatusArg.cpp
@@ -45,7 +45,7 @@
 
 namespace {
 	// Didn't want to bring dyn.h and friends here.
-	const int DYN_MSG_FAC		= 8;
+	constexpr int DYN_MSG_FAC = FB_IMPL_MSG_FACILITY_DYN;
 }
 
 namespace Firebird {
@@ -166,7 +166,7 @@ void StatusVector::ImplStatusVector::putStrArg(unsigned startWith)
 			m_strings.append(1, '\0');
 		}
 		else
-			 m_strings.append(*ptr, strlen(*ptr) + 1);
+			 m_strings.append(*ptr, fb_strlen(*ptr) + 1);
 
 		*ptr = &m_strings[pos];
 		setStrPointers(oldBase);

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`
`46`	`46`	`namespace {`
`47`	`47`	`// Didn't want to bring dyn.h and friends here.`
`48`		`- const int DYN_MSG_FAC = 8;`
	`48`	`+ constexpr int DYN_MSG_FAC = FB_IMPL_MSG_FACILITY_DYN;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`namespace Firebird {`
`@@ -166,7 +166,7 @@ void StatusVector::ImplStatusVector::putStrArg(unsigned startWith)`
`166`	`166`	`m_strings.append(1, '\0');`
`167`	`167`	`}`
`168`	`168`	`else`
`169`		`- m_strings.append(ptr, strlen(ptr) + 1);`
	`169`	`+ m_strings.append(ptr, fb_strlen(ptr) + 1);`
`170`	`170`
`171`	`171`	`*ptr = &m_strings[pos];`
`172`	`172`	`setStrPointers(oldBase);`