Fix zero-length format string warning in __CmiEnforceHelper (#3478)

evan-charmworks · evan-charmworks · commit 223f8b395cd4 · 2021-09-12T11:46:57.000-05:00
diff --git a/src/conv-core/convcore.C b/src/conv-core/convcore.C
@@ -4213,7 +4213,8 @@ void CmiError(const char *format, ...)
 
 void __CmiEnforceHelper(const char* expr, const char* fileName, const char* lineNum)
 {
-  __CmiEnforceMsgHelper(expr, fileName, lineNum, "");
+  CmiAbort("[%d] Assertion \"%s\" failed in file %s line %s.\n", CmiMyPe(), expr,
+           fileName, lineNum);
 }
 
 void __CmiEnforceMsgHelper(const char* expr, const char* fileName, const char* lineNum,

Original file line number	Diff line number	Diff line change
`@@ -4213,7 +4213,8 @@ void CmiError(const char *format, ...)`
`4213`	`4213`
`4214`	`4214`	`void __CmiEnforceHelper(const char* expr, const char* fileName, const char* lineNum)`
`4215`	`4215`	`{`
`4216`		`- __CmiEnforceMsgHelper(expr, fileName, lineNum, "");`
	`4216`	`+ CmiAbort("[%d] Assertion \"%s\" failed in file %s line %s.\n", CmiMyPe(), expr,`
	`4217`	`+ fileName, lineNum);`
`4217`	`4218`	`}`
`4218`	`4219`
`4219`	`4220`	`void __CmiEnforceMsgHelper(const char* expr, const char* fileName, const char* lineNum,`