From 084108a6f1044a92d7bf074cbd766dad58ebc5b1 Mon Sep 17 00:00:00 2001 From: Maksym Veremeyenko Date: Wed, 5 Oct 2011 16:31:08 +0300 Subject: [PATCH] fix limit usage on library file load --- src/library.c | 10 +++++++--- src/whois.c | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/library.c b/src/library.c index db9ff24..a7a44a4 100644 --- a/src/library.c +++ b/src/library.c @@ -128,7 +128,7 @@ int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filenam /* open and process file */ if((f = fopen(filename, "rt"))) { - while( !feof(f) && c < (limit -1)) + while(!feof(f) && c < limit) { char *s, *sp_r, *sp_b; @@ -158,7 +158,9 @@ int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filenam /* insert item */ items[c++] = item; - }; + } + else + g_warning("omnplay_library_load_file: ignored line [%s]\n", l); } fclose(f); @@ -171,6 +173,8 @@ int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filenam *pcount = c; + g_warning("omnplay_library_load_file: loaded [%d] items from [%s] file, limit [%d]\n", c, filename, limit); + return r; }; @@ -206,8 +210,8 @@ static void omnplay_library_save_file(playlist_item_t* item, int count, char* fi frames2tc(item[i].in, 25.0, tc_in), frames2tc(item[i].dur, 25.0, tc_dur), item[i].title); - fclose(f); + g_warning("omnplay_library_save_file: written [%d] lines to file [%s]\n", count, filename); }; }; diff --git a/src/whois.c b/src/whois.c index dc4d3f8..844e6e7 100644 --- a/src/whois.c +++ b/src/whois.c @@ -55,6 +55,8 @@ static int save_list(playlist_item_t* item, int count, char* filename) frames2tc(item[i].dur, 25.0, tc_dur)); fclose(f); + + g_warning("whois.c: save_list: filename=[%s], count=[%d]\n", filename, count); } else r = 1; -- 1.7.4.4