From 67003d1c98988de4cd8fa0ac81bce26bcf45a173 Mon Sep 17 00:00:00 2001 From: "rburnett@build.mysql.com" <> Date: Sat, 14 Aug 2004 03:38:37 +0200 Subject: mysql_priv.h: Added declarations for print_msg_to_log and vprint_msg_to_log. sql_print_error are simple functions that wrap calls to print_msg_to_log. Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE gen_lex_hash.cc: Added NULL error reporting parameter to handle_options log.cc: Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log. Print_msg_to_log will write the message to the windows event log if on NT. We now have error, warning, and information versions of sql_print_xxxx. T his is a variation of a similar changeset WAX did. mysqld.cc: Added option_error_reporter callback function and pass that into handle_options mysql.cc: Added NULL as error reporter arg to the end of handle_options Many files: Added NULL error reporter parameter as the last paramter to handle_options my_getopt.c: Added second function pointer to server as an error reporting callback. Added local function report_option_error that will either write the error to stderr or to the error reporting callback. changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error my_getopt.h: Changed declaration of handle_options to use typedefs for the two function pointers. added second function pointer to server as an error reporting callback mysqld.dsp: Added custom build step for compiling message file and added message resource file (output of mc) --- include/my_getopt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/my_getopt.h b/include/my_getopt.h index 11ecc66fac3..01b21951972 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -50,11 +50,11 @@ struct my_option extern char *disabled_my_option; extern my_bool my_getopt_print_errors; +typedef my_bool (* hoGetOneOption) (int, const struct my_option *, char * ); +typedef void (* hoErrorReporter) (const char *format, va_list args ); + extern int handle_options (int *argc, char ***argv, - const struct my_option *longopts, - my_bool (*get_one_option)(int, - const struct my_option *, - char *)); + const struct my_option *longopts, hoGetOneOption, hoErrorReporter ); extern void my_print_help(const struct my_option *options); extern void my_print_variables(const struct my_option *options); -- cgit v1.2.1