X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Ftabcomplete.c;h=28faedf1a70ba63029958db3cb2c8fb403fe48f7;hp=546c23977666be828b6d514603b1ee40dae14e5e;hb=95d8bd04e10519a635972a24176270ef4dbe8d2c;hpb=16d6519a78fe4917ec865a7d084672579ab317ae diff --git a/client/tabcomplete.c b/client/tabcomplete.c index 546c239..28faedf 100644 --- a/client/tabcomplete.c +++ b/client/tabcomplete.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 1995-2005, Index Data ApS + * Copyright (C) 1995-2006, Index Data ApS * See the file LICENSE for details. * - * $Id: tabcomplete.c,v 1.14 2006-05-07 19:38:58 adam Exp $ + * $Id: tabcomplete.c,v 1.16 2006-05-07 20:57:26 adam Exp $ */ #include @@ -12,15 +12,13 @@ #include #include "tabcomplete.h" -extern char** curret_global_list; - /* *************************************************************************** * * generic completer * * ***************************************************************************/ -char* complete_from_list(char* completions[], const char *text, int state) +char *complete_from_list(char* completions[], const char *text, int state) { #if HAVE_READLINE_READLINE_H static int idx; @@ -80,7 +78,8 @@ void oid_loader(struct oident* oid, void* data_) } } -char** build_list_for_oclass(oid_class oclass) { +char** build_list_for_oclass(oid_class oclass) +{ oid_callback_t data; data.values = (char **) calloc(10,sizeof(char*)); data.index = 0; @@ -123,8 +122,8 @@ char* complete_format(const char* text, int state) char* complete_schema(const char* text, int state) { - char** list=build_list_for_oclass(CLASS_SCHEMA); - char* res=complete_from_list(list,text,state); + char** list = build_list_for_oclass(CLASS_SCHEMA); + char* res = complete_from_list(list,text,state); free(list); return res; @@ -133,19 +132,14 @@ char* complete_schema(const char* text, int state) char* complete_attributeset(const char* text, int state) { - char** list=build_list_for_oclass(CLASS_ATTSET); - char* res=complete_from_list(list,text,state); + char** list = build_list_for_oclass(CLASS_ATTSET); + char* res = complete_from_list(list,text,state); free(list); return res; } -char* default_completer(const char* text, int state) -{ - return complete_from_list(curret_global_list,text,state); -} - /* * Local variables: * c-basic-offset: 4