From: Jaakko Heinonen <jheinonen@users.sourceforge.net>
Date: Mon, 2 Apr 2001 20:35:24 +0000 (+0000)
Subject: Minor cleanups
X-Git-Tag: upstream/0.6.1~2^2~395
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=4892aec476c9d7ce2cf11483cc369fcddf7bea6a;p=pkg%2Fabook.git

Minor cleanups
---

diff --git a/database.c b/database.c
index 03e20ed..8b8d2be 100644
--- a/database.c
+++ b/database.c
@@ -152,10 +152,9 @@ write_database(FILE *out)
 	for( i = 0; i < items; i++ ) {
 		fprintf(out, "[%d]\n", i);
 		for(j=0; j<ITEM_FIELDS; j++) {
-			if( database[i][j] != NULL )
-				if( *database[i][j] )
-					fprintf(out, "%s=%s\n",
-						abook_fields[j].key, database[i][j]);
+			if( database[i][j] != NULL && *database[i][j] )
+				fprintf(out, "%s=%s\n",
+					abook_fields[j].key, database[i][j]);
 		}
 		fputc('\n', out);
 	}
@@ -450,8 +449,7 @@ find(int next)
 void
 print_number_of_items()
 {
-	char *str =
-		mkstr("     |%3d/%3d", selected_items(), items);
+	char *str = mkstr("     " "|%3d/%3d", selected_items(), items);
 
 	mvaddstr(0, COLS-strlen(str), str);
 
diff --git a/edit.c b/edit.c
index 50363f3..28009fe 100644
--- a/edit.c
+++ b/edit.c
@@ -242,7 +242,9 @@ edit_emails(char c, int item)
 	split_emailstr(item, emails);
 
 	if(change_field("E-mail: ", &field)) {
+#ifdef DEBUG
 		fprintf(stderr, "change_field = TRUE\n");
+#endif
 		return; /* user cancelled ( C-g ) */
 	}
 	if(field) {
diff --git a/list.c b/list.c
index ce0f9ef..01bb156 100644
--- a/list.c
+++ b/list.c
@@ -269,13 +269,13 @@ highlight_line(WINDOW *win, int line)
 int
 selected_items()
 {
-	int i, a=0;
+	int i, n = 0;
 
 	for(i = 0; i < items; i++)
 		if(selected[i])
-			a++;
+			n++;
 
-	return a;
+	return n;
 }
 
 void