X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Ftabcomplete.c;h=28faedf1a70ba63029958db3cb2c8fb403fe48f7;hp=b748c10e8608e65e87c9b83a980967a4ce95db5d;hb=95d8bd04e10519a635972a24176270ef4dbe8d2c;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505

diff --git a/client/tabcomplete.c b/client/tabcomplete.c
index b748c10..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.12 2005-06-25 15:46:01 adam Exp $
+ * $Id: tabcomplete.c,v 1.16 2006-05-07 20:57:26 adam Exp $
  */
 
 #include <string.h>
@@ -12,16 +12,15 @@
 #include <yaz/oid.h>
 #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;
     
     if(!completions) return NULL;
@@ -40,6 +39,7 @@ char* complete_from_list(char* completions[], const char *text, int state)
             return (char*)strdup(completions[idx-1]);
         };
     };
+#endif
     return NULL;
 }
 
@@ -78,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;
@@ -121,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;
@@ -131,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