X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=database.c;h=2a5ce8be107f8479ec7e07784259f51cf008c35b;hb=3cea3c8809447c5d6658671b78b9af7137fd9b0d;hp=f1ebdf7d47f368bbe1b0282b7c04c90bd12a1a0f;hpb=00afcdbf62dbf2233c2e09fc9b0abe305a6988e7;p=pkg%2Fabook.git diff --git a/database.c b/database.c index f1ebdf7..2a5ce8b 100644 --- a/database.c +++ b/database.c @@ -242,7 +242,7 @@ validate_item(list_item item) item[EMAIL] = strdup(""); for(i=0; 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 +263,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 +471,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; }