X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=database.h;h=a81bd6e4e751de9780aa3addd2b971342d1dd071;hb=ea03fe3e692ec5ea007dae3fd4d8f6247eccb40e;hp=bd86d975a9cce5460d07aa181e22a72c417b2c27;hpb=4909ba20244f55ee7326a40d751cf6737c2bc2b6;p=pkg%2Fabook.git

diff --git a/database.h b/database.h
index bd86d97..a81bd6e 100644
--- a/database.h
+++ b/database.h
@@ -43,7 +43,7 @@ enum {
 	FIELD_STRING = 1,
 	FIELD_EMAILS,
 	FIELD_LIST,
-	FIELD_DAY,
+	FIELD_DATE,
 };
 
 enum {
@@ -66,7 +66,7 @@ abook_field *real_find_field(char *key, abook_field_list *list, int *nb);
 #define find_field(key, list)		real_find_field(key, list, NULL)
 #define find_field_number(key, pt_nb)	real_find_field(key, NULL, pt_nb)
 #define find_declared_field(key)	find_field(key,NULL)
-void get_field_keyname(int i, char **key, char **name);
+void get_field_info(int i, char **key, char **name, int *type);
 void add_field(abook_field_list **list, abook_field *f);
 char *declare_new_field(char *key, char *name, char *type, int accept_standard);
 void init_standard_fields();
@@ -88,6 +88,8 @@ char *get_surname(char *s);
 int find_item(char *str, int start, int search_fields[]);
 int is_selected(int item);
 int is_valid_item(int item);
+int last_item();
+int db_n_items();
 
 int real_db_enumerate_items(struct db_enumerator e);
 struct db_enumerator init_db_enumerator(int mode);
@@ -113,7 +115,7 @@ char *real_db_field_get(int item, int i, int std);
 #define db_fget(item, i)		real_db_field_get(item, i, 1)
 #define db_fget_byid(item, i)		real_db_field_get(item, i, 0)
 #define db_name_get(item)		db_fget(item, NAME)
-#define db_email_get(item)		db_fget(item, EMAIL)
+char *db_email_get(int item); /* memory has to be freed by the caller */
 
 /*
  * database field write
@@ -130,14 +132,5 @@ int real_db_field_put(int item, int i, int std, char *val);
 list_item db_item_get(int i);
 
 
-/*
- * Various macros
- */
-
-#define LAST_ITEM (items - 1)
-
-#define have_multiple_emails(item) \
-	strchr(db_email_get(item), ',')
-
 #endif /* _DATABASE_H */