From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sun, 24 Feb 2002 12:24:40 +0000 (+0000)
Subject: Removed C++ comment and empty statements/declarations
X-Git-Tag: YAZ.1.8.6~42
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a97dab98e81128f07806d68b6891dbf65c732ede;p=yaz-moved-to-github.git

Removed C++ comment and empty statements/declarations
---

diff --git a/client/client.c b/client/client.c
index f8aeb96..00764e4 100644
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.144 2002-02-20 14:41:19 adam Exp $
+ * $Id: client.c,v 1.145 2002-02-24 12:24:40 adam Exp $
  */
 
 #include <stdio.h>
@@ -2072,7 +2072,7 @@ int cmd_set_apdufile(char* arg)
   
     if(apdu_file && apdu_file != stderr) { /* don't close stdout*/
         perror("unable to close apdu log file");      
-    };
+    }
     apdu_file=NULL;
   
     if(strlen(arg)<1) {
@@ -2118,7 +2118,7 @@ int cmd_set_marcdump(char* arg)
 {
     if(marcdump && marcdump != stderr) { /* don't close stdout*/
         perror("unable to close apdu log file");      
-    };
+    }
     marcdump=NULL;
     
     if(strlen(arg)<1) {
@@ -2521,7 +2521,7 @@ void process_cmd_line(char* line)
 
 char *command_generator(const char *text, int state) 
 {
-    static idx; // index is the last used the last time command_generator was called
+    static int idx; 
     if (state==0) {
         idx = 0;
     }
@@ -2529,7 +2529,7 @@ char *command_generator(const char *text, int state)
         if (!strncmp(cmd[idx].cmd,text,strlen(text))) {
             ++idx;  /* skip this entry on the next run */
             return strdup(cmd[idx-1].cmd);
-        };
+        }
     }
     return NULL;
 }
@@ -2557,7 +2557,7 @@ char ** readline_completer(char *text, int start, int end) {
         if ((res = sscanf(rl_line_buffer, "%31s %1023[^;]", word, arg)) <= 0) {     
             rl_attempted_completion_over = 1;
             return NULL;
-        };
+        }
     
         if(start != strlen(word) +1 ) {
             rl_attempted_completion_over = 1;
@@ -2587,12 +2587,12 @@ char ** readline_completer(char *text, int start, int end) {
         } else {
             rl_attempted_completion_over = 1;
             return 0;
-        };
-    };
+        }
+    }
 #else 
     return 0;
 #endif 
-};
+}
 
 
 static void client(void)
diff --git a/client/tabcomplete.c b/client/tabcomplete.c
index d3ec86a..20caa12 100644
--- a/client/tabcomplete.c
+++ b/client/tabcomplete.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: tabcomplete.c,v 1.3 2002-01-30 22:02:03 adam Exp $
+ * $Id: tabcomplete.c,v 1.4 2002-02-24 12:24:40 adam Exp $
  */
 
 #include <string.h>
@@ -20,7 +20,7 @@
 
 char* complete_from_list(char* completions[], const char *text, int state)
 {
-	static idx;
+	static int idx;
 	if(state==0) {
 		idx = 0;
 	}
@@ -57,7 +57,7 @@ void oid_loader(struct oident* oid, void* data_)
 {
 	oid_callback_t* data=(oid_callback_t*) data_;
 	
-	//fprintf(stderr,"ja7: called with %d: %s\n",oid->oclass,oid->desc);	
+	
 	if((oid->oclass == CLASS_GENERAL) || (oid->oclass == data->oclass)) {
 		if(data->index==data->max) {
 			data->values=(char**)realloc(data->values,((data->max+1)*2)*sizeof(char*));
@@ -66,7 +66,7 @@ void oid_loader(struct oident* oid, void* data_)
 		data->values[data->index]=oid->desc;
 		++data->index;		
 	}
-};
+}
 
 char** build_list_for_oclass(oid_class oclass) {	
 	oid_callback_t data;	
@@ -120,7 +120,7 @@ char* complete_attributeset(const char* text, int state)
 	
 	free(list);	
 	return res;
-};
+}
 
 /*
  * Local variables: