minor cleanups

diff --git a/abook.c b/abook.c
index debd3f61fc74ca6de7bc3b2cf0e56aa2844c40fb..ee4160ad94d0610e0f5b210a375d93865e12d946 100644 (file)
--- a/abook.c
+++ b/abook.c
@@ -754,7 +754,7 @@ add_email_add_item(int quiet, char *name, char *email)
                                        name,
                                        email,
                                        datafile);
-                       c = fgetc(in);
+                       c = getc(in);
                        if(c == 'n' || c == 'N') {
                                fclose(in);
                                return 0;

diff --git a/list.c b/list.c
index d3a53c36f423c50b49e757145e8014a7727cbf8b..62159522a74368d295f03f681d51193f2bfbeadf 100644 (file)
--- a/list.c
+++ b/list.c
@@ -155,17 +155,15 @@ print_list_line(int i, int line, int highlight)
 void
 list_headerline()
 {
-#ifdef A_BOLD
+#if defined(A_BOLD) && defined(A_NORMAL)
        attrset(A_BOLD);
-#else
-       /* hmm, maybe something here */
 #endif
        mvaddstr(2, NAMEPOS, abook_fields[NAME].name);
        mvaddstr(2, EMAILPOS, abook_fields[EMAIL].name);
        if(extra_column > 0)
                mvaddnstr(2, EXTRAPOS, abook_fields[extra_column].name,
                                COLS-EXTRAPOS);
-#ifdef A_BOLD
+#if defined(A_BOLD) && defined(A_NORMAL)
        attrset(A_NORMAL);
 #endif
 }