Corrected some references to MAX_EMAILS

[pkg/abook.git] / database.h

diff --git a/database.h b/database.h
index 8676f7162e12144bd2ef9f377815625b3e218236..4354c93f82b4004ef0b9cad03b41653cc024d5d5 100644 (file)
--- a/database.h
+++ b/database.h
@@ -43,12 +43,9 @@ enum {
 
 struct db_enumerator {
        int item;
-       int mode; /* boolean */ /* warning: read only */
+       int mode; /* warning: read only */
 };
 
-#define db_enumerate_items(e) \
-       while( -1 != (e.item = real_db_enumerate_items(e)))
-
 int            parse_database(FILE *in);
 int            write_database(FILE *out, struct db_enumerator e);
 int            load_database(char *filename);
@@ -60,8 +57,9 @@ void          remove_selected_items();
 void           sort_surname();
 void           sort_database();
 char           *get_surname(char *s);
-int            find_item(char *str, int start);
+int            find_item(char *str, int start, int search_fields[]);
 int            is_selected(int item);
+int            is_valid_item(int item);
 
 int            real_db_enumerate_items(struct db_enumerator e);
 struct db_enumerator   init_db_enumerator(int mode);
@@ -74,7 +72,7 @@ struct db_enumerator  init_db_enumerator(int mode);
        int _i,_j,_k,len; \
        memset(&emails, 0, sizeof(emails) ); \
        len = strlen(database[item][EMAIL]); \
-       for( _i=0,_j=0, _k=0; _i < len && _j < 4; _i++ ) { \
+       for( _i=0,_j=0, _k=0; _i < len && _j < MAX_EMAILS; _i++ ) { \
                if( database[item][EMAIL][_i] ==',' ) { \
                        _j++; \
                        _k = 0; \
@@ -87,4 +85,7 @@ struct db_enumerator  init_db_enumerator(int mode);
 #define have_multiple_emails(item) \
        strchr(database[item][EMAIL], ',')
 
+#define db_enumerate_items(e) \
+       while( -1 != (e.item = real_db_enumerate_items(e)))
+
 #endif