diff options
| author | unknown <svoj@april.(none)> | 2006-01-10 15:05:31 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-01-10 15:05:31 +0400 |
| commit | f6d3d2fea018e2121be08819dfa02ff85765ee52 (patch) | |
| tree | 674c98293676570987d82a3988a9ae8783c44198 | |
| parent | a670199a4cd1f2a7ad704cc2a26fe4020c54f8e7 (diff) | |
| download | mariadb-git-f6d3d2fea018e2121be08819dfa02ff85765ee52.tar.gz | |
Fixed warnings.
include/plugin.h:
mysql_plugin_declaration contains 9 elements now.
| -rw-r--r-- | include/plugin.h | 2 | ||||
| -rw-r--r-- | plugin/fulltext/plugin_example.c | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/plugin.h b/include/plugin.h index 6c571b8504b..b93e3bafe73 100644 --- a/include/plugin.h +++ b/include/plugin.h @@ -41,7 +41,7 @@ int _mysql_plugin_interface_version_= MYSQL_PLUGIN_INTERFACE_VERSION; \ int _mysql_sizeof_struct_st_plugin_= sizeof(struct st_mysql_plugin); \ struct st_mysql_plugin _mysql_plugin_declarations_[]= { -#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0}} +#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0}} /* declarations for SHOW STATUS support in plugins diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index 4caa6de3197..269c58e8b40 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -98,7 +98,8 @@ static int simple_parser_plugin_deinit(void) 1 failure (cannot happen) */ -static int simple_parser_init(MYSQL_FTPARSER_PARAM *param) +static int simple_parser_init(MYSQL_FTPARSER_PARAM *param + __attribute__((unused))) { return(0); } @@ -118,7 +119,8 @@ static int simple_parser_init(MYSQL_FTPARSER_PARAM *param) 1 failure (cannot happen) */ -static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param) +static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param + __attribute__((unused))) { return(0); } @@ -179,7 +181,7 @@ int simple_parser_parse(MYSQL_FTPARSER_PARAM *param) add_word(param, start, end - start); break; } - else if (isspace(*end)) + else if (my_isspace(param->cs, *end)) { if (end > start) add_word(param, start, end - start); @@ -208,7 +210,7 @@ static struct st_mysql_ftparser simple_parser_descriptor= struct st_mysql_show_var simple_status[]= { - {"static", "just a static text", SHOW_CHAR}, + {"static", (char *)"just a static text", SHOW_CHAR}, {"called", (char *)&number_of_calls, SHOW_LONG}, {0,0,0} }; @@ -227,6 +229,6 @@ mysql_declare_plugin simple_parser_plugin_init, /* init function (when loaded) */ simple_parser_plugin_deinit,/* deinit function (when unloaded) */ 0x0001, /* version */ - &simple_status /* status variables */ + simple_status /* status variables */ } mysql_declare_plugin_end; |