X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=database.c;h=259c63c6414cf359aa8867f06d209ddaa1412347;hb=1ce000762e496959ea5afa3830b171c73f0409c8;hp=e8a4fa390f168185920dfaac61a205e209108a56;hpb=a4028acb18fd04cbf03ddbd976115aeb04ddd867;p=pkg%2Fabook.git diff --git a/database.c b/database.c index e8a4fa3..259c63c 100644 --- a/database.c +++ b/database.c @@ -24,16 +24,13 @@ # include "config.h" #endif -static void free_item(int i); - - list_item *database = NULL; int items = 0; #define INITIAL_LIST_CAPACITY 30 -int list_capacity = 0; +static int list_capacity = 0; extern int first_list_item; extern int curitem; @@ -285,12 +282,12 @@ adjust_list_capacity() int add_item2database(list_item item) { - if( item[NAME] == NULL || ! *item[NAME] ) { + if(item[NAME] == NULL || ! *item[NAME]) { free_list_item(item); return 1; } - if( ++items > list_capacity) + if(++items > list_capacity) adjust_list_capacity(); validate_item(item); @@ -306,27 +303,26 @@ remove_selected_items() { int i, j; - if( list_is_empty() ) + if(list_is_empty()) return; - if( ! selected_items() ) - selected[ curitem ] = 1; + if(!selected_items()) + selected[curitem] = 1; - for( j = LAST_ITEM; j >= 0; j-- ) { - if( selected[j] ) { + for(j = LAST_ITEM; j >= 0; j--) { + if(selected[j]) { free_item(j); /* added for .4 data_s_ */ - for( i = j; i < LAST_ITEM; i++ ) { - itemcpy(database[ i ], database[ i + 1 ]); - selected[ i ] = selected[ i + 1 ]; + for(i = j; i < LAST_ITEM; i++) { + itemcpy(database[i], database[i + 1]); + selected[i] = selected[i + 1]; } items--; } } - if( curitem > LAST_ITEM && items > 0 ) + if(curitem > LAST_ITEM && items > 0) curitem = LAST_ITEM; - adjust_list_capacity(); select_none(); @@ -379,7 +375,7 @@ namecmp(const void *i1, const void *i2) itemcpy(a, i1); itemcpy(b, i2); - return safe_strcoll( a[sort_field], b[sort_field] ); + return safe_strcoll(a[sort_field], b[sort_field]); } static int