# HG changeset patch # User rosfran # Date 1179448471 -3600 # Node ID 74c1f4270cf0f1989e13a8225cc103067176fe72 # Parent 951db70240719249d600ebc0db80c59062ba2686 [svn r695] Fixed erroneous maximum iteration count on reading zero-sized buffers on FileTransfer. diff -r 951db7024071 -r 74c1f4270cf0 gmyth/src/Makefile.am --- a/gmyth/src/Makefile.am Thu May 17 22:44:17 2007 +0100 +++ b/gmyth/src/Makefile.am Fri May 18 01:34:31 2007 +0100 @@ -99,7 +99,7 @@ if HAVE_INDENT indent: - for src_file in $(libgmyth_la_SOURCES); do \ + @for src_file in $(libgmyth_la_SOURCES); do \ indent -gnu -i4 -l80 -bfda -nut -pcs -psl -bli0 -cs -cli4 -nbfda -sai -saw -saf -sbi4 -npro -nfca $$src_file; \ done; \ for inc_file in $(libgmyth_include_HEADERS); do \ diff -r 951db7024071 -r 74c1f4270cf0 gmyth/src/gmyth_file_transfer.c --- a/gmyth/src/gmyth_file_transfer.c Thu May 17 22:44:17 2007 +0100 +++ b/gmyth/src/gmyth_file_transfer.c Fri May 18 01:34:31 2007 +0100 @@ -309,7 +309,11 @@ gmyth_debug ("OK!!! MOVED to the next program info [%s]!", gmyth_file_get_file_name (GMYTH_FILE (transfer))); - } + } else { + gmyth_debug ("XXXXXXXXXXXXXX Oulu tests XXXXXXXXXXXXXXXX"); + gmyth_debug ("None new file found. We continue with the same file opened before"); + } + } else { @@ -725,8 +729,9 @@ gmyth_string_list_append_char_array (strlist, query->str); gmyth_string_list_append_char_array (strlist, "REQUEST_BLOCK"); gmyth_string_list_append_int (strlist, size - total_read); - - guint iter_count = 200; + + /* 200??? Is this a TV or a HQ data traffic? */ + guint iter_count = 4; do { @@ -817,6 +822,7 @@ gmyth_debug ("Trying to move to the next program chain..."); if (priv->recorder != NULL && priv->do_next_program_chain) { + priv->do_next_program_chain = FALSE; retval = GMYTH_FILE_READ_NEXT_PROG_CHAIN; GMythProgramInfo *prog_info = gmyth_recorder_get_current_program_info (priv->recorder);