diff options
| author | unknown <serg@serg.mylan> | 2003-10-15 18:05:04 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-15 18:05:04 +0200 |
| commit | 35dbfb25f9c22bf6c99415e6d8038a80d41400a2 (patch) | |
| tree | 46e12017301c2460ba8df67a7fdb5d4ef4a98f21 | |
| parent | 29825f1f8ac5227f50f8bf02ce4db9a779197b58 (diff) | |
| download | mariadb-git-35dbfb25f9c22bf6c99415e6d8038a80d41400a2.tar.gz | |
cleanup
myisam/ft_update.c:
unused parameter removed
myisam/ftdefs.h:
unused parameter removed
myisam/mi_check.c:
unused parameter removed
mysys/Makefile.am:
unused file removed from Makefile
| -rw-r--r-- | myisam/ft_update.c | 12 | ||||
| -rw-r--r-- | myisam/ftdefs.h | 2 | ||||
| -rw-r--r-- | myisam/mi_check.c | 3 | ||||
| -rw-r--r-- | mysys/Makefile.am | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/myisam/ft_update.c b/myisam/ft_update.c index 8423b6898cd..79892f54002 100644 --- a/myisam/ft_update.c +++ b/myisam/ft_update.c @@ -114,9 +114,7 @@ uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const byte *record) DBUG_RETURN(0); } -FT_WORD * _mi_ft_parserecord(MI_INFO *info, uint keynr, - byte *keybuf __attribute__((unused)), - const byte *record) +FT_WORD * _mi_ft_parserecord(MI_INFO *info, uint keynr, const byte *record) { TREE ptree; DBUG_ENTER("_mi_ft_parserecord"); @@ -199,9 +197,9 @@ int _mi_ft_update(MI_INFO *info, uint keynr, byte *keybuf, int cmp, cmp2; DBUG_ENTER("_mi_ft_update"); - if (!(old_word=oldlist=_mi_ft_parserecord(info, keynr, keybuf, oldrec))) + if (!(old_word=oldlist=_mi_ft_parserecord(info, keynr, oldrec))) goto err0; - if (!(new_word=newlist=_mi_ft_parserecord(info, keynr, keybuf, newrec))) + if (!(new_word=newlist=_mi_ft_parserecord(info, keynr, newrec))) goto err1; error=0; @@ -249,7 +247,7 @@ int _mi_ft_add(MI_INFO *info, uint keynr, byte *keybuf, const byte *record, FT_WORD *wlist; DBUG_ENTER("_mi_ft_add"); - if ((wlist=_mi_ft_parserecord(info, keynr, keybuf, record))) + if ((wlist=_mi_ft_parserecord(info, keynr, record))) { error=_mi_ft_store(info,keynr,keybuf,wlist,pos); my_free((char*) wlist,MYF(0)); @@ -268,7 +266,7 @@ int _mi_ft_del(MI_INFO *info, uint keynr, byte *keybuf, const byte *record, DBUG_ENTER("_mi_ft_del"); DBUG_PRINT("enter",("keynr: %d",keynr)); - if ((wlist=_mi_ft_parserecord(info, keynr, keybuf, record))) + if ((wlist=_mi_ft_parserecord(info, keynr, record))) { error=_mi_ft_erase(info,keynr,keybuf,wlist,pos); my_free((char*) wlist,MYF(0)); diff --git a/myisam/ftdefs.h b/myisam/ftdefs.h index c0a19262dcf..5b260ceb10b 100644 --- a/myisam/ftdefs.h +++ b/myisam/ftdefs.h @@ -124,7 +124,7 @@ uint _mi_ft_segiterator(FT_SEG_ITERATOR *); void ft_parse_init(TREE *, CHARSET_INFO *); int ft_parse(TREE *, byte *, int); FT_WORD * ft_linearize(TREE *); -FT_WORD * _mi_ft_parserecord(MI_INFO *, uint, byte *, const byte *); +FT_WORD * _mi_ft_parserecord(MI_INFO *, uint, const byte *); uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const byte *record); extern const struct _ft_vft _ft_vft_nlq; diff --git a/myisam/mi_check.c b/myisam/mi_check.c index ceac8f6356c..a6ce3a9c87b 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -2575,8 +2575,7 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key) my_free((char*) wptr, MYF(MY_ALLOW_ZERO_PTR)); if ((error=sort_get_next_record(sort_param))) DBUG_RETURN(error); - if (!(wptr=_mi_ft_parserecord(info,sort_param->key, - key,sort_param->record))) + if (!(wptr=_mi_ft_parserecord(info,sort_param->key,sort_param->record))) DBUG_RETURN(1); if (wptr->pos) break; diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 6ec1e1ec40d..5ff682fbc80 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -39,7 +39,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \ my_symlink.c my_symlink2.c \ mf_pack.c mf_unixpath.c mf_strip.c \ - mf_soundex.c mf_wcomp.c mf_wfile.c \ + mf_wcomp.c mf_wfile.c \ mf_qsort.c mf_qsort2.c mf_sort.c \ ptr_cmp.c mf_radix.c queues.c \ tree.c list.c hash.c array.c string.c typelib.c \ |