*** empty log message ***

[pkg/abook.git] / edit.c

diff --git a/edit.c b/edit.c
index e6ba4342494912c9a455b58cf8c80d677718e5c3..5edebec4d2fb2f01e1a6afcd47063d4fb55d5507 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -120,13 +120,12 @@ print_editor_header(int item)
 {
        char *header;
        char email[MAX_EMAIL_LEN];
-       int i, x, len;
-       
+
        if( (header = (char *)malloc(EDITW_COLS)) == NULL )
                return;
 
        get_first_email(email, item);
-       
+
        if( *database[item][EMAIL] )
                snprintf(header, EDITW_COLS, "%s <%s>",
                                database[item][NAME],
@@ -134,11 +133,9 @@ print_editor_header(int item)
        else
                snprintf(header, EDITW_COLS, "%s", database[item][NAME]);
 
-       len = strlen(header);
-       x = (EDITW_COLS - len) / 2;
-       mvwaddstr(editw, 0, x, header);
-       for(i = x; i < x + len; i++)
-               mvwaddch(editw, 1, i, '^');
+       mvwaddstr(editw, 0, (EDITW_COLS - strlen(header)) / 2,
+                       header);
+
        free(header);
 }
 
@@ -157,23 +154,24 @@ editor_print_data(int tab, int item)
                        char emails[MAX_EMAILS][MAX_EMAIL_LEN];
                        split_emailstr(item, emails);
                        getyx(editw, y, x);
-                       mvwaddstr(editw, y+1, TAB_START_X, "E-mail addresses:");
+                       mvwaddstr(editw, y+1, FIELDS_START_X,
+                                       "E-mail addresses:");
                        for(k = 0; k < MAX_EMAILS; k++) {
                                getyx(editw, y, x);
-                               mvwprintw(editw, y+1, TAB_START_X,
+                               mvwprintw(editw, y+1, FIELDS_START_X,
                                "%c -", '2' + k);
                                mvwprintw(editw, y +1, TAB_COLON_POS,
                                                ": %s", emails[k]);
                        }
                        continue;
                }
-                               
+
                if(j > 1) {
                        getyx(editw, y, x); y++;
                } else
-                       y = TAB_START_Y;
+                       y = FIELDS_START_Y;
 
-               mvwprintw(editw, y, TAB_START_X, "%d - %s",
+               mvwprintw(editw, y, FIELDS_START_X, "%d - %s",
                                j,
                                abook_fields[i].name);
                mvwaddch(editw, y, TAB_COLON_POS, ':');
@@ -205,10 +203,10 @@ change_field(char *msg, char **field)
        char tmp[MAX_FIELD_LEN];
        int max_len = MAX_FIELD_LEN;
        int ret;
-       
+
        if( !strncmp("E-mail", msg, 6) )
                max_len = MAX_EMAIL_LEN;
-       
+
        statusline_addstr(msg);
        if( (ret = statusline_getnstr( tmp, max_len - 1, 0 ) ? 1:0 ) ) {
                my_free(*field);
@@ -266,7 +264,7 @@ edit_emails(char c, int item)
                fix_email_str(emails[c - '2']);
        } else
                *emails[c - '2'] = 0;
-       
+
        my_free(database[item][EMAIL]);
 
        for(i = 0; i < MAX_EMAILS; i++) {
@@ -290,7 +288,7 @@ edit_field(int tab, char c, int item)
        int n = c - '1' + 1;
        char *str;
 
-       if(n < 1 || n > MAX_TAB_LINES)
+       if(n < 1 || n > MAX_TAB_FIELDS)
                return 0;
 
        edit_undo(item, BACKUP_ITEM);
@@ -344,7 +342,7 @@ edit_undo(int item, int mode)
                                free_list_item(backup[0]);
                                my_free(backup);
                        }
-                       backup = abook_malloc(sizeof(list_item));
+                       backup = (list_item *)abook_malloc(sizeof(list_item));
                        for(i = 0; i < ITEM_FIELDS; i++)
                                backup[0][i] = safe_strdup(database[item][i]);
                        break;
@@ -363,7 +361,7 @@ edit_loop(int item)
 {
        static int tab = 0; /* first tab */
        int c;
-       
+
        werase(editw);
        headerline(EDITOR_HELPLINE);
        refresh_statusline();