ALICE_print fix, isError flag added

bogdan.khavronin · bogdan.khavronin · commit 24c74e14e80b · 2025-09-22T15:11:26.000+03:00
diff --git a/src/alice/alice.cpp b/src/alice/alice.cpp
@@ -557,7 +557,7 @@ int alice(Firebird::UtilSvc* uSvc)
 
 			if (any_error)
 			{
-				ALICE_print(24);	// msg 24: Summary of validation errors\n
+				ALICE_print(24, SafeArg(), false);	// msg 24: Summary of validation errors\n
 
 				for (int i = 0; i < MAX_VAL_ERRORS; ++i)
 				{
@@ -637,13 +637,19 @@ void ALICE_upper_case(const TEXT* in, TEXT* out, const size_t buf_size)
 //		Display a formatted error message
 //
 
-void ALICE_print(USHORT	number, const SafeArg& arg)
+void ALICE_print(USHORT	number, const SafeArg& arg, const bool isError)
 {
 	AliceGlobals* tdgbl = AliceGlobals::getSpecific();
 	if (tdgbl->uSvc->isService())
 	{
+		if (!isError)
+			tdgbl->uSvc->started();
+
 		tdgbl->uSvc->getStatusAccessor().setServiceStatus(ALICE_MSG_FAC, number, arg);
-		tdgbl->uSvc->started();
+
+		if (isError)
+			tdgbl->uSvc->started();
+
 		return;
 	}
 
diff --git a/src/alice/alice_proto.h b/src/alice/alice_proto.h
@@ -34,7 +34,7 @@ int		alice(Firebird::UtilSvc*);
 class AliceGlobals;
 
 void	ALICE_upper_case(const TEXT*, TEXT*, const size_t);
-void	ALICE_print(USHORT, const MsgFormat::SafeArg& arg = MsgFormat::SafeArg());
+void	ALICE_print(USHORT, const MsgFormat::SafeArg& arg = MsgFormat::SafeArg(), const bool isError = true);
 void	ALICE_error(USHORT, const MsgFormat::SafeArg& arg = MsgFormat::SafeArg());
 void	ALICE_print_status(bool error, const ISC_STATUS*);
 void	ALICE_exit(int, AliceGlobals*);

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ int alice(Firebird::UtilSvc* uSvc)`
`557`	`557`
`558`	`558`	`if (any_error)`
`559`	`559`	`{`
`560`		`- ALICE_print(24); // msg 24: Summary of validation errors\n`
	`560`	`+ ALICE_print(24, SafeArg(), false); // msg 24: Summary of validation errors\n`
`561`	`561`
`562`	`562`	`for (int i = 0; i < MAX_VAL_ERRORS; ++i)`
`563`	`563`	`{`
`@@ -637,13 +637,19 @@ void ALICE_upper_case(const TEXT* in, TEXT* out, const size_t buf_size)`
`637`	`637`	`// Display a formatted error message`
`638`	`638`	`//`
`639`	`639`
`640`		`-void ALICE_print(USHORT number, const SafeArg& arg)`
	`640`	`+void ALICE_print(USHORT number, const SafeArg& arg, const bool isError)`
`641`	`641`	`{`
`642`	`642`	`AliceGlobals* tdgbl = AliceGlobals::getSpecific();`
`643`	`643`	`if (tdgbl->uSvc->isService())`
`644`	`644`	`{`
	`645`	`+ if (!isError)`
	`646`	`+ tdgbl->uSvc->started();`
	`647`	`+`
`645`	`648`	`tdgbl->uSvc->getStatusAccessor().setServiceStatus(ALICE_MSG_FAC, number, arg);`
`646`		`- tdgbl->uSvc->started();`
	`649`	`+`
	`650`	`+ if (isError)`
	`651`	`+ tdgbl->uSvc->started();`
	`652`	`+`
`647`	`653`	`return;`
`648`	`654`	`}`
`649`	`655`