- whitespace changes

[pkg/abook.git] / edit.c

diff --git a/edit.c b/edit.c
index 7abbb09ac9a1150fb2ec1c983459dcd90cdc42d1..cb423264de2672be76fd123db6006c1e132ee2c8 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -17,6 +17,7 @@
 #include "list.h"
 #include "edit.h"
 #include "misc.h"
+#include "xmalloc.h"
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
@@ -38,7 +39,7 @@ editor_tab(const int tab)
 {
        int i;
        const int spacing = 12;
-       const char *tab_names[] = {
+       static char *tab_names[] = {
                "CONTACT",
                "ADDRESS",
                " PHONE ",
@@ -46,13 +47,13 @@ editor_tab(const int tab)
                "CUSTOM "
        };
 
-       mvwhline(editw, TABLINE+1, 0, UI_HLINE_CHAR, EDITW_COLS);
-       for(i=0; i < TABS; i++) {
+       mvwhline(editw, TABLINE + 1, 0, UI_HLINE_CHAR, EDITW_COLS);
+       for(i = 0; i < TABS; i++) {
                mvwaddch(editw,  TABLINE+1, spacing * i + 2,  UI_TEE_CHAR);
                mvwaddch(editw,  TABLINE+1, spacing * i + 12, UI_TEE_CHAR);
        }
 
-       for(i=0; i < TABS; i++) {
+       for(i = 0; i < TABS; i++) {
                mvwaddch(editw,  TABLINE, spacing * i + 2,  UI_ULCORNER_CHAR);
                mvwaddch(editw,  TABLINE, spacing * i + 3,  UI_LBOXLINE_CHAR);
                mvwaddstr(editw, TABLINE, spacing * i + 4,  tab_names[i]);
@@ -135,19 +136,18 @@ print_editor_header(int item)
        char *header;
        char email[MAX_EMAIL_LEN];
 
-       if( (header = (char *)malloc(EDITW_COLS)) == NULL )
+       if((header = xmalloc(EDITW_COLS)) == NULL)
                return;
 
        get_first_email(email, item);
 
-       if( *database[item][EMAIL] )
+       if(*database[item][EMAIL])
                snprintf(header, EDITW_COLS, "%s <%s>",
                                database[item][NAME],
                                email);
        else
                snprintf(header, EDITW_COLS, "%s", database[item][NAME]);
 
-       fprintf(stderr, "%d\n", strwidth(header));
        mvwaddstr(editw, 0, (EDITW_COLS - strwidth(header)) / 2,
                        header);
 
@@ -164,7 +164,7 @@ editor_print_data(int tab, int item)
                if(abook_fields[i].tab != tab)
                        continue;
 
-               if(i==EMAIL) { /* special field */
+               if(i == EMAIL) { /* special field */
                        int k;
                        char emails[MAX_EMAILS][MAX_EMAIL_LEN];
                        split_emailstr(item, emails);
@@ -182,7 +182,8 @@ editor_print_data(int tab, int item)
                }
 
                if(j > 1) {
-                       getyx(editw, y, x); y++;
+                       getyx(editw, y, x);
+                       y++;
                } else
                        y = FIELDS_START_Y;
 
@@ -219,7 +220,7 @@ change_field(char *msg, char **field)
        char *old;
        int ret = 0;
 
-       if( !strncmp("E-mail", msg, 6) )
+       if(!strncmp("E-mail", msg, 6))
                max_len = MAX_EMAIL_LEN;
 
        old = *field;
@@ -227,9 +228,9 @@ change_field(char *msg, char **field)
        *field = ui_readline(msg, old, max_len - 1, 0);
 
        if(*field) {
-               free(old);
+               xfree(old);
                if(!**field)
-                       my_free(*field);
+                       xfree(*field);
        } else {
                *field = old;
                ret = 1;
@@ -249,18 +250,18 @@ change_name_field(char **field)
        tmp = strdup(*field);
        change_field("Name: ", field);
 
-       if( *field == NULL || ! **field ) {
-               my_free(*field);
+       if(*field == NULL || ! **field) {
+               xfree(*field);
                *field = strdup(tmp);
        }
 
-       my_free(tmp);
+       xfree(tmp);
 }
 
 static void
 fix_email_str(char *str)
 {
-       for(; *str; str++ )
+       for(; *str; str++)
                *str = *str == ',' ? '_' : *str;
 }
 
@@ -285,7 +286,7 @@ edit_emails(char c, int item)
        } else
                *emails[email_num] = 0;
 
-       my_free(database[item][EMAIL]);
+       xfree(database[item][EMAIL]);
 
        for(i = 0; i < MAX_EMAILS; i++) {
                if( *emails[i] ) {
@@ -326,14 +327,14 @@ edit_field(int tab, char c, int item)
                return 1;
        }
 
-       for(i=0, j=0; i< ITEM_FIELDS; i++) {
+       for(i = 0, j = 0; i< ITEM_FIELDS; i++) {
                if(abook_fields[i].tab == tab)
                        j++;
                if(j==n)
                        break;
        }
 
-       if(j!=n)
+       if(j != n)
                return 0;
 
        str = mkstr("%s: ", abook_fields[i].name);
@@ -354,15 +355,15 @@ edit_undo(int item, int mode)
                case CLEAR_UNDO:
                        if(backup) {
                                free_list_item(backup[0]);
-                               my_free(backup);
+                               xfree(backup);
                        }
                        break;
                case BACKUP_ITEM:
                        if(backup) {
                                free_list_item(backup[0]);
-                               my_free(backup);
+                               xfree(backup);
                        }
-                       backup = (list_item *)abook_malloc(sizeof(list_item));
+                       backup = xmalloc(sizeof(list_item));
                        for(i = 0; i < ITEM_FIELDS; i++)
                                backup[0][i] = safe_strdup(database[item][i]);
                        break;
@@ -370,7 +371,7 @@ edit_undo(int item, int mode)
                        if(backup) {
                                free_list_item(database[item]);
                                itemcpy(database[item], backup[0]);
-                               my_free(backup);
+                               xfree(backup);
                        }
                        break;
                default:
@@ -395,7 +396,7 @@ edit_loop(int item)
        refresh();
        wrefresh(editw);
 
-       switch( (c = getch()) ) {
+       switch((c = getch())) {
                case 'c': tab = TAB_CONTACT; break;
                case 'a': tab = TAB_ADDRESS; break;
                case 'p': tab = TAB_PHONE; break;
@@ -412,7 +413,7 @@ edit_loop(int item)
                case 'k': if(is_valid_item(item-1)) item--; break;
                case KEY_DOWN:
                case '>':
-               case 'j': if(is_valid_item(item+1)) item++; break;
+               case 'j': if(is_valid_item(item + 1)) item++; break;
                case 'r': roll_emails(item); break;
                case '?': display_help(HELP_EDITOR); break;
                case 'u': edit_undo(item, RESTORE_ITEM); break;
@@ -437,7 +438,7 @@ edit_item(int item)
 
        init_editor();
 
-       while( (item = edit_loop(item)) >= 0 )
+       while((item = edit_loop(item)) >= 0)
                curitem = item; /* hmm, this is not very clean way to go */
 
        close_editor();