From d0115322acedbc8ca59cd55e2d8d6254a928b457 Mon Sep 17 00:00:00 2001 From: robocop Date: Mon, 18 Apr 2005 03:24:34 +0000 Subject: [PATCH] Misc. --- src/burp/burp.cpp | 4 ++-- src/dsql/parse.y | 2 +- src/remote/inet_server.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/burp/burp.cpp b/src/burp/burp.cpp index 90c4b900c2..5d3da160e3 100644 --- a/src/burp/burp.cpp +++ b/src/burp/burp.cpp @@ -1988,7 +1988,7 @@ static gbak_action open_files(const TEXT* file1, BURP_error(14, true, *file2, 0, 0, 0, 0); // msg 14 database %s already exists. To replace it, use the -R switch } - else { + else { isc_drop_database(status_vector, &tdgbl->db_handle); if (tdgbl->db_handle) { ISC_STATUS_ARRAY status_vector2; @@ -2093,7 +2093,7 @@ static void burp_usage() BURP_print(95, 0, 0, 0, 0, 0); // msg 95 legal switches are - in_sw_tab_t* in_sw_tab = burp_in_sw_table; + const in_sw_tab_t* in_sw_tab = burp_in_sw_table; for (; in_sw_tab->in_sw; in_sw_tab++) if (in_sw_tab->in_sw_msg) { BURP_msg_put(in_sw_tab->in_sw_msg, (void*)switch_char, 0, 0, diff --git a/src/dsql/parse.y b/src/dsql/parse.y index a59f534039..715dc81500 100644 --- a/src/dsql/parse.y +++ b/src/dsql/parse.y @@ -4763,7 +4763,7 @@ int LexerState::yylex ( tok_class = classes[c]; if (!(tok_class & CHR_WHITE)) - break; + break; } /* Depending on tok_class of token, parse token */ diff --git a/src/remote/inet_server.cpp b/src/remote/inet_server.cpp index f6d0f21985..3c5d27053e 100644 --- a/src/remote/inet_server.cpp +++ b/src/remote/inet_server.cpp @@ -117,10 +117,10 @@ const char* FIREBIRD_USER_NAME = "firebird"; #ifdef VMS static int assign(SCHAR *); -#endif -//static void name_process(UCHAR *); -static void signal_handler(int); +#else static void set_signal(int, void (*)(int)); +#endif +static void signal_handler(int); #if (defined SUPERSERVER && defined UNIX ) static void signal_sigpipe_handler(int);