0.4.13pre1 updates

[pkg/abook.git] / database.h

diff --git a/database.h b/database.h
index 8676f7162e12144bd2ef9f377815625b3e218236..eff0e59b14797428c15c38e709b483e2e1c17bfd 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);
@@ -62,6 +59,7 @@ void          sort_database();
 char           *get_surname(char *s);
 int            find_item(char *str, int start);
 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);
@@ -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