8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 06:03:02 +01:00
This commit is contained in:
dimitr 2008-02-29 08:45:02 +00:00
parent 8e782e04df
commit 331a464574
6 changed files with 10 additions and 9 deletions

View File

@ -166,6 +166,6 @@ public:
LexerState lex; LexerState lex;
}; };
}; // namespace } // namespace
#endif // DSQL_PARSER_H #endif // DSQL_PARSER_H

View File

@ -696,7 +696,7 @@ enum
ddl_charset, ddl_collation//, ddl_sec_class ddl_charset, ddl_collation//, ddl_sec_class
}; };
}; // namespace } // namespace
// macros for error generation // macros for error generation

View File

@ -977,7 +977,7 @@ enum node_args {
e_user_count e_user_count
}; };
}; // namespace } // namespace
namespace Jrd { namespace Jrd {
@ -1064,6 +1064,6 @@ enum nod_flags_vals {
NOD_SPECIAL_SYNTAX = 1 // nod_sys_function NOD_SPECIAL_SYNTAX = 1 // nod_sys_function
}; };
}; // namespace } // namespace
#endif // DSQL_NODE_H #endif // DSQL_NODE_H

View File

@ -64,7 +64,7 @@ public:
}; };
typedef dsql_sym *DSQL_SYM; typedef dsql_sym *DSQL_SYM;
}; // namespace } // namespace
#endif // DSQL_SYM_H #endif // DSQL_SYM_H

View File

@ -64,7 +64,7 @@ namespace Jrd {
dsql_req* request; dsql_req* request;
}; };
}; // namespace } // namespace
#endif #endif

View File

@ -5822,18 +5822,19 @@ ISC_STATUS API_ROUTINE fb__shutdown(ISC_STATUS * user_status)
* *
**************************************/ **************************************/
YEntry status(user_status); YEntry status(user_status);
try try
{ {
// Shutdown clients before providers // Shutdown clients before providers
if (ShutChain::run(FB_SHUT_PREPROVIDERS) == 0) if (ShutChain::run(FB_SHUT_PREPROVIDERS) == 0)
{ {
// Shutdown providers // Shutdown providers
for (int n=0; n<SUBSYSTEMS; ++n) for (int n = 0; n < SUBSYSTEMS; ++n)
{ {
PTR entry = get_entrypoint(PROC_SHUTDOWN, n); PTR entry = get_entrypoint(PROC_SHUTDOWN, n);
if (entry != no_entrypoint) if (entry != no_entrypoint)
{ {
if (entry(status) != 0) if (entry(status) != FB_SUCCESS)
break; break;
} }
} }