X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=database.c;h=8b22602e03b6a2a60121904a6cf2ae05f2fb22ad;hb=7d50ad7bf95f96320e86f9201533ae308609aa05;hp=e9d939e57d1de7b46babb2d97c0ce045eea659f6;hpb=14afac6aa99dbefeedc6bbc793faf9ba1de2eca7;p=pkg%2Fabook.git

diff --git a/database.c b/database.c
index e9d939e..8b22602 100644
--- a/database.c
+++ b/database.c
@@ -136,10 +136,7 @@ load_database(char *filename)
 	
 	parse_database(in);
 
-	if ( items == 0 )
-		return 2;
-
-	return 0;
+	return (items == 0) ? 2 : 0;
 }
 
 int
@@ -242,7 +239,7 @@ validate_item(list_item item)
 		item[EMAIL] = strdup("");
 
 	for(i=0; i<ITEM_FIELDS; i++)
-		if( item[i] && (strlen(item[i]) > _MAX_FIELD_LEN(i) ) ) {
+		if( item[i] && ((int)strlen(item[i]) > _MAX_FIELD_LEN(i) ) ) {
 			tmp = item[i];
 			item[i][_MAX_FIELD_LEN(i)-1] = 0;
 			item[i] = strdup(item[i]);
@@ -263,9 +260,9 @@ adjust_list_capacity()
 	else
 		return;
 
-	database = abook_realloc(database,
+	database = (list_item *)abook_realloc(database,
 			sizeof(list_item) * list_capacity);
-	selected = abook_realloc(selected, list_capacity);
+	selected = (char *)abook_realloc(selected, list_capacity);
 }
 
 int
@@ -351,8 +348,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);
@@ -368,7 +365,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
@@ -471,10 +468,10 @@ out:
 struct db_enumerator
 init_db_enumerator(int mode)
 {
-	struct db_enumerator new;
+	struct db_enumerator e;
 
-	new.item = -1; /* important - means "start from beginning" */
-	new.mode = mode;
+	e.item = -1; /* important - means "start from beginning" */
+	e.mode = mode;
 
-	return new;
+	return e;
 }