0.4.13pre1 updates

diff --git a/THANKS b/THANKS
index 6a04e234f813aed26d8ada6b8aa98300a3e24a30..9153b4c4e4b7a4d949c06caea83788e6d4cc1e20 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,5 +10,6 @@ R. Shohn Trojacek     <snazzle@galvani.tamu.edu>
 ?                      <antirez@invece.org>
 Shao Zhang             <shao@cia.com.au>
 Gustavo Niemeyer       <gustavo@niemeyer.net>
+Koenraad Heijlen       <vipie@ulyssis.org>
 
 See also AUTHORS

diff --git a/configure b/configure
index 542db2b739811b4d2757c2215384d97d834d7fcc..2ac8ce64d140ae18f052ed026f6f4dcaaaff87c1 100755 (executable)
--- a/configure
+++ b/configure
@@ -697,7 +697,7 @@ fi
 
 PACKAGE=abook
 
-VERSION=0.4.13-cvs
+VERSION=0.4.13pre1
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

diff --git a/configure.in b/configure.in
index a67423cdd814f5bbdca32786682c254ae707df20..b8a13b73b0f230a147d6cbe75ee7bf6079dcc250 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.4.13-cvs)
+AM_INIT_AUTOMAKE(abook, 0.4.13pre1)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

diff --git a/database.c b/database.c
index e324810eab04c0394a3476da1c3b5ab5d4dedb75..ddc96ab21aaa047ee6235a102a4d31f61320b14e 100644 (file)
--- a/database.c
+++ b/database.c
@@ -421,6 +421,12 @@ is_selected(int item)
        return selected[item];
 }
 
+int
+is_valid_item(int item)
+{
+       return item <= LAST_ITEM && item >= 0;
+}
+
 int
 real_db_enumerate_items(struct db_enumerator e)
 {

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