X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=database.c;h=8b22602e03b6a2a60121904a6cf2ae05f2fb22ad;hb=4128f78f5543bebc7cd1868736855207019f1f71;hp=f1ebdf7d47f368bbe1b0282b7c04c90bd12a1a0f;hpb=9c567e5bb78debf56e2e2c1644f252de58a80d50;p=pkg%2Fabook.git

diff --git a/database.c b/database.c
index f1ebdf7..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
@@ -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;
 }