removed unnecessary wstandend call

[pkg/abook.git] / database.c

diff --git a/database.c b/database.c
index 17aaf2fac0fef6722ff13bffc9773f259f1a739c..f1ebdf7d47f368bbe1b0282b7c04c90bd12a1a0f 100644 (file)
--- a/database.c
+++ b/database.c
@@ -58,6 +58,7 @@ struct abook_field abook_fields[ITEM_FIELDS] = {
        {"Name",        "name",         TAB_CONTACT},/* NAME */
        {"E-mails",     "email",        TAB_CONTACT},/* EMAIL */
        {"Address",     "address",      TAB_ADDRESS},/* ADDRESS */
+       {"Address2",    "address2",     TAB_ADDRESS},/* ADDRESS2 */   
        {"City",        "city",         TAB_ADDRESS},/* CITY */
        {"State/Province","state",      TAB_ADDRESS},/* STATE */
        {"ZIP/Postal Code","zip",       TAB_ADDRESS},/* ZIP */
@@ -231,7 +232,7 @@ close_database()
 
 #define _MAX_FIELD_LEN(X)      (X == EMAIL ? MAX_EMAILSTR_LEN:MAX_FIELD_LEN)
 
-inline static void
+static void
 validate_item(list_item item)
 {
        int i;
@@ -350,8 +351,8 @@ surnamecmp(const void *i1, const void *i2)
        s1 = get_surname(a[NAME]);
        s2 = get_surname(b[NAME]);
 
-       if( !(ret = safe_strcmp(s1, s2)) )
-               ret = safe_strcmp(a[NAME], b[NAME]);
+       if( !(ret = safe_strcoll(s1, s2)) )
+               ret = safe_strcoll(a[NAME], b[NAME]);
 
        free(s1);
        free(s2);
@@ -367,7 +368,7 @@ namecmp(const void *i1, const void *i2)
        itemcpy(a, i1);
        itemcpy(b, i2);
        
-       return safe_strcmp( a[NAME], b[NAME] );
+       return safe_strcoll( a[NAME], b[NAME] );
 }
 
 void