mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-23 19:23:03 +01:00
The merge is being fixed.
This commit is contained in:
parent
04640224ce
commit
042472b132
@ -1112,7 +1112,6 @@ void GSEC_print_status(const ISC_STATUS* status_vector, bool exitOnError)
|
||||
SCHAR s[1024];
|
||||
while (fb_interpret(s, sizeof(s), &vector))
|
||||
{
|
||||
TRANSLATE_CP(s);
|
||||
const char* nl = (s[0] ? s[strlen(s) - 1] != '\n' : true) ? "\n" : "";
|
||||
int exitCode = util_print("%s%s", s, nl);
|
||||
if (exitOnError && exitCode != 0)
|
||||
|
@ -781,17 +781,3 @@ static void usage_exit(void)
|
||||
|
||||
exit(FINI_ERROR);
|
||||
}
|
||||
|
||||
//
|
||||
// Until the fb_assert could be converted to a function/object linked with each module
|
||||
// we need this ugly workaround.
|
||||
//
|
||||
extern "C" void API_ROUTINE gds__log(const TEXT* text, ...)
|
||||
{
|
||||
va_list ptr;
|
||||
|
||||
va_start(ptr, text);
|
||||
vprintf(text, ptr);
|
||||
va_end(ptr);
|
||||
printf("\n\n");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user