X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=ui.c;h=27aa91f12f35edc1cc828c92188b1a83446d312b;hb=392a8ae6d501ab5c20b8bb8176cac4aa9dbf99f3;hp=2799039ca11b0d7d76e146cee03081fde9ff26fa;hpb=ebb3a365ead9d1898c92fccaf53f118faa1b6fbf;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 2799039..27aa91f 100644
--- a/ui.c
+++ b/ui.c
@@ -45,18 +45,18 @@
 extern int items, curitem;
 extern char *datafile;
 
-extern int alternative_datafile;
+extern bool alternative_datafile;
 
 /*
  * internal variables
  */
 
-bool ui_initialized = FALSE;
+static bool ui_initialized = FALSE;
 
-bool should_resize = FALSE;
-bool can_resize = FALSE;
+static bool should_resize = FALSE;
+static bool can_resize = FALSE;
 
-WINDOW *top = NULL, *bottom = NULL;
+static WINDOW *top = NULL, *bottom = NULL;
 
 
 static void
@@ -82,13 +82,13 @@ resize_abook()
 #ifdef TIOCGWINSZ
 	struct winsize winsz;
 
-	ioctl (0, TIOCGWINSZ, &winsz);
+	ioctl(0, TIOCGWINSZ, &winsz);
 #ifdef DEBUG
 	if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) {
 		fprintf(stderr, "Warning: COLS=%d, LINES=%d\n", winsz.ws_col, winsz.ws_row);
 	}
 #endif
-		
+
 	if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) {
 #ifdef HAVE_RESIZETERM
 		resizeterm(winsz.ws_row, winsz.ws_col);
@@ -115,7 +115,7 @@ win_changed(int i)
 	if( can_resize )
 		resize_abook();
 	else
-		should_resize = TRUE;	
+		should_resize = TRUE;
 }
 #endif /* SIGWINCH */
 
@@ -217,7 +217,7 @@ int
 statusline_msg(char *msg)
 {
 	int c;
-	
+
 	clear_statusline();
 	statusline_addstr(msg);
 	c = getch();
@@ -265,11 +265,13 @@ statusline_ask_boolean(char *msg, int def)
 
 	free(msg2);
 
-	switch( tolower(getch()) ) {
+	switch(tolower(getch())) {
 		case 'n':
+		case 'N':
 			ret = FALSE;
 			break;
 		case 'y':
+		case 'Y':
 			ret = TRUE;
 			break;
 		default:
@@ -343,7 +345,7 @@ display_help(int help)
 	erase();
 	headerline("help");
 
-	for( i = 0; tbl[i] != NULL; i++) {
+	for(i = 0; tbl[i] != NULL; i++) {
 		waddstr(helpw, tbl[i]);
 		if( ( !( (i+1) % (LINES-8) ) ) ||
 			(tbl[i+1] == NULL) ) {
@@ -475,7 +477,7 @@ ui_remove_items()
 	if(statusline_ask_boolean("Remove selected item(s)", TRUE))
 		remove_selected_items();
 
-	clear_statusline();	
+	clear_statusline();
 	refresh_list();
 }
 
@@ -498,7 +500,7 @@ ui_find(int next)
 	clear_statusline();
 
 	if(next) {
-		if( !*findstr )
+		if(!*findstr)
 			return;
 	} else {
 		char *s;
@@ -548,12 +550,12 @@ ui_print_database()
 	char *command = opt_get_str(STR_PRINT_COMMAND);
 	int mode;
 
-	if( list_is_empty() )
+	if(list_is_empty())
 		return;
 
 	statusline_addstr("Print All/Selected/Cancel (a/s/C)?");
 
-	switch( tolower(getch()) ) {
+	switch(tolower(getch())) {
 		case 'a':
 			mode = ENUM_ALL;
 			break;
@@ -575,7 +577,7 @@ ui_print_database()
 		return;
 
 	fexport("text", handle, mode);
-	
+
 	pclose(handle);
 }
 
@@ -587,13 +589,13 @@ ui_open_datafile()
 
 	filename = ask_filename("File to open: ");
 
-	if( !filename || ! *filename) {
+	if(!filename || ! *filename) {
 		free(filename);
 		refresh_screen();
 		return;
 	}
 
-	if( opt_get_bool(BOOL_AUTOSAVE) )
+	if(opt_get_bool(BOOL_AUTOSAVE))
 		save_database();
 	else if(statusline_ask_boolean("Save current database", FALSE))
 		save_database();
@@ -602,7 +604,7 @@ ui_open_datafile()
 
 	load_database(filename);
 
-	if( items == 0 ) {
+	if(items == 0) {
 		statusline_msg("Sorry, that specified file appears not to be a valid abook addressbook");
 		load_database(datafile);
 	} else {