X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=dbadm.c;h=40ecf0b862a5a2a6d18bc739eacb44bc5d20f123;hb=8a8cd0f5bb40dcfad68608193e8c57decd90b25e;hp=5e7bf6e1d44f1750a2649514693f265a6f548b0d;hpb=adbf9f09c9bf2a680c61b1ef3541c04f1cde97cf;p=paraslash.git

diff --git a/dbadm.c b/dbadm.c
index 5e7bf6e1..40ecf0b8 100644
--- a/dbadm.c
+++ b/dbadm.c
@@ -37,7 +37,7 @@ WINDOW *att_win;
 static char **choices;
 
 /* no looging */
-void para_log(__unused int ll, __unused const char *fmt,...)
+void para_log(__a_unused int ll, __a_unused const char *fmt,...)
 {
 }
 
@@ -56,19 +56,19 @@ static int client_cmd(const char *cmd)
 static char **get_all_atts(int *num_atts)
 {
 	int fd = client_cmd("laa");
-	FILE *pipe;
+	FILE *f;
 	char **ret = NULL, *buf;
 
 	if (fd < 0)
 		return NULL;
-	pipe = fdopen(fd, "r");
-	if (!pipe) {
+	f = fdopen(fd, "r");
+	if (!f) {
 		close(fd);
 		return NULL;
 	}
 	*num_atts = 0;
 	buf = para_malloc(MAXLINE * sizeof(char));
-	while (fgets(buf, MAXLINE - 1, pipe) && *buf) {
+	while (fgets(buf, MAXLINE - 1, f) && *buf) {
 		size_t n = strlen(buf);
 		buf[n - 1] = '\0';
 		if (choice_len < n - 1)
@@ -99,7 +99,7 @@ static char *get_atts(char *filename)
 	return buf;
 }
 
-static void _item_init(__unused MENU* menu)
+static void _item_init(__a_unused MENU* menu)
 {
 //	static int subsequent_run;
 	int i, n;