database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

only use "public" types in plugin API

Browse Source 
include/plugin.h:
  only use "public" types in plugin API:
  s/uint/unsigned int/ or s/uint/int/
  s/bool/char/
  s/byte/char/
  s/CHARSET_INFO */struct charset_info_st */
This commit is contained in:
unknown
2006-01-16 15:17:45 +01:00
parent ebf577974e
commit 048754ff46
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/plugin.h
View File

@ -75,7 +75,7 @@ struct st_mysql_plugin
const char *descr; /* general descriptive text (for SHOW PLUGINS ) */ const char *descr; /* general descriptive text (for SHOW PLUGINS ) */
int (*init)(void); /* the function to invoke when plugin is loaded */ int (*init)(void); /* the function to invoke when plugin is loaded */
int (*deinit)(void); /* the function to invoke when plugin is unloaded */ int (*deinit)(void); /* the function to invoke when plugin is unloaded */
uint version; /* plugin version (for SHOW PLUGINS) */ unsigned int version; /* plugin version (for SHOW PLUGINS) */
struct st_mysql_show_var *status_vars; struct st_mysql_show_var *status_vars;
}; };
@ -176,11 +176,11 @@ typedef struct st_mysql_ftparser_boolean_info
enum enum_ft_token_type type; enum enum_ft_token_type type;
int yesno; int yesno;
int weight_adjust; int weight_adjust;
bool wasign; char wasign;
bool trunc; char trunc;
/* These are parser state and must be removed. */ /* These are parser state and must be removed. */
byte prev; char prev;
byte *quot; char *quot;
} MYSQL_FTPARSER_BOOLEAN_INFO; } MYSQL_FTPARSER_BOOLEAN_INFO;
@ -224,14 +224,14 @@ typedef struct st_mysql_ftparser_boolean_info
typedef struct st_mysql_ftparser_param typedef struct st_mysql_ftparser_param
{ {
int (*mysql_parse)(void *param, byte *doc, uint doc_len); int (*mysql_parse)(void *param, char *doc, int doc_len);
int (*mysql_add_word)(void *param, byte *word, uint word_len, int (*mysql_add_word)(void *param, char *word, int word_len,
MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info); MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info);
void *ftparser_state; void *ftparser_state;
void *mysql_ftparam; void *mysql_ftparam;
CHARSET_INFO *cs; struct charset_info_st *cs;
byte *doc; char *doc;
uint length; int length;
int mode; int mode;
} MYSQL_FTPARSER_PARAM; } MYSQL_FTPARSER_PARAM;

7
plugin/fulltext/plugin_example.c
View File

@ -13,9 +13,8 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <my_global.h> #include <stdlib.h>
#include <m_string.h> #include <ctype.h>
#include <m_ctype.h>
#include <plugin.h> #include <plugin.h>
long number_of_calls= 0; /* for SHOW STATUS, see below */ long number_of_calls= 0; /* for SHOW STATUS, see below */
@ -181,7 +180,7 @@ int simple_parser_parse(MYSQL_FTPARSER_PARAM *param)
add_word(param, start, end - start); add_word(param, start, end - start);
break; break;
} }
else if (my_isspace(param->cs, *end)) else if (isspace(*end))
{ {
if (end > start) if (end > start)
add_word(param, start, end - start); add_word(param, start, end - start);

20
storage/myisam/ft_boolean_search.c
View File

@ -165,7 +165,7 @@ typedef struct st_my_ftb_param
} MY_FTB_PARAM; } MY_FTB_PARAM;
static int ftb_query_add_word(void *param, byte *word, uint word_len, static int ftb_query_add_word(void *param, char *word, int word_len,
MYSQL_FTPARSER_BOOLEAN_INFO *info) MYSQL_FTPARSER_BOOLEAN_INFO *info)
{ {
MY_FTB_PARAM *ftb_param= (MY_FTB_PARAM *)param; MY_FTB_PARAM *ftb_param= (MY_FTB_PARAM *)param;
@ -264,13 +264,13 @@ static int ftb_query_add_word(void *param, byte *word, uint word_len,
} }
static int ftb_parse_query_internal(void *param, byte *query, uint len) static int ftb_parse_query_internal(void *param, char *query, int len)
{ {
MY_FTB_PARAM *ftb_param= (MY_FTB_PARAM *)param; MY_FTB_PARAM *ftb_param= (MY_FTB_PARAM *)param;
MYSQL_FTPARSER_BOOLEAN_INFO info; MYSQL_FTPARSER_BOOLEAN_INFO info;
CHARSET_INFO *cs= ftb_param->ftb->charset; CHARSET_INFO *cs= ftb_param->ftb->charset;
byte **start= &query; char **start= &query;
byte *end= query + len; char *end= query + len;
FT_WORD w; FT_WORD w;
info.prev= ' '; info.prev= ' ';
@ -571,7 +571,7 @@ typedef struct st_my_ftb_phrase_param
} MY_FTB_PHRASE_PARAM; } MY_FTB_PHRASE_PARAM;
static int ftb_phrase_add_word(void *param, byte *word, uint word_len, static int ftb_phrase_add_word(void *param, char *word, int word_len,
MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info __attribute__((unused))) MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info __attribute__((unused)))
{ {
MY_FTB_PHRASE_PARAM *phrase_param= (MY_FTB_PHRASE_PARAM *)param; MY_FTB_PHRASE_PARAM *phrase_param= (MY_FTB_PHRASE_PARAM *)param;
@ -601,11 +601,11 @@ static int ftb_phrase_add_word(void *param, byte *word, uint word_len,
} }
static int ftb_check_phrase_internal(void *param, byte *document, uint len) static int ftb_check_phrase_internal(void *param, char *document, int len)
{ {
FT_WORD word; FT_WORD word;
MY_FTB_PHRASE_PARAM *phrase_param= (MY_FTB_PHRASE_PARAM *)param; MY_FTB_PHRASE_PARAM *phrase_param= (MY_FTB_PHRASE_PARAM *)param;
const byte *docend= document + len; const char *docend= document + len;
while (ft_simple_get_word(phrase_param->cs, &document, docend, &word, FALSE)) while (ft_simple_get_word(phrase_param->cs, &document, docend, &word, FALSE))
{ {
ftb_phrase_add_word(param, word.pos, word.len, 0); ftb_phrase_add_word(param, word.pos, word.len, 0);
@ -812,7 +812,7 @@ typedef struct st_my_ftb_find_param
} MY_FTB_FIND_PARAM; } MY_FTB_FIND_PARAM;
static int ftb_find_relevance_add_word(void *param, byte *word, uint len, static int ftb_find_relevance_add_word(void *param, char *word, int len,
MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info __attribute__((unused))) MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info __attribute__((unused)))
{ {
MY_FTB_FIND_PARAM *ftb_param= (MY_FTB_FIND_PARAM *)param; MY_FTB_FIND_PARAM *ftb_param= (MY_FTB_FIND_PARAM *)param;
@ -845,10 +845,10 @@ static int ftb_find_relevance_add_word(void *param, byte *word, uint len,
} }
static int ftb_find_relevance_parse(void *param, byte *doc, uint len) static int ftb_find_relevance_parse(void *param, char *doc, int len)
{ {
FT_INFO *ftb= ((MY_FTB_FIND_PARAM *)param)->ftb; FT_INFO *ftb= ((MY_FTB_FIND_PARAM *)param)->ftb;
byte *end= doc + len; char *end= doc + len;
FT_WORD w; FT_WORD w;
while (ft_simple_get_word(ftb->charset, &doc, end, &w, TRUE)) while (ft_simple_get_word(ftb->charset, &doc, end, &w, TRUE))
ftb_find_relevance_add_word(param, w.pos, w.len, 0); ftb_find_relevance_add_word(param, w.pos, w.len, 0);