[svn r695] Fixed erroneous maximum iteration count on reading zero-sized buffers on FileTransfer. trunk
authorrosfran
Fri May 18 01:34:31 2007 +0100 (2007-05-18)
branchtrunk
changeset 68974c1f4270cf0
parent 688 951db7024071
child 690 ba11bfc5f239
[svn r695] Fixed erroneous maximum iteration count on reading zero-sized buffers on FileTransfer.
gmyth/src/Makefile.am
gmyth/src/gmyth_file_transfer.c
     1.1 --- a/gmyth/src/Makefile.am	Thu May 17 22:44:17 2007 +0100
     1.2 +++ b/gmyth/src/Makefile.am	Fri May 18 01:34:31 2007 +0100
     1.3 @@ -99,7 +99,7 @@
     1.4  
     1.5  if HAVE_INDENT
     1.6  indent: 
     1.7 -	for src_file in $(libgmyth_la_SOURCES); do \
     1.8 +	@for src_file in $(libgmyth_la_SOURCES); do \
     1.9  		indent -gnu -i4 -l80 -bfda -nut -pcs -psl -bli0 -cs -cli4 -nbfda -sai -saw -saf -sbi4 -npro -nfca $$src_file; \
    1.10  	done; \
    1.11  	for inc_file in $(libgmyth_include_HEADERS); do \
     2.1 --- a/gmyth/src/gmyth_file_transfer.c	Thu May 17 22:44:17 2007 +0100
     2.2 +++ b/gmyth/src/gmyth_file_transfer.c	Fri May 18 01:34:31 2007 +0100
     2.3 @@ -309,7 +309,11 @@
     2.4                  gmyth_debug ("OK!!! MOVED to the next program info [%s]!",
     2.5                               gmyth_file_get_file_name (GMYTH_FILE (transfer)));
     2.6  
     2.7 -	} 
     2.8 +	} else {
     2.9 +	    gmyth_debug ("XXXXXXXXXXXXXX Oulu tests XXXXXXXXXXXXXXXX");
    2.10 +	    gmyth_debug ("None new file found. We continue with the same file opened before");
    2.11 +	}
    2.12 +
    2.13      }
    2.14      else
    2.15      {
    2.16 @@ -725,8 +729,9 @@
    2.17      gmyth_string_list_append_char_array (strlist, query->str);
    2.18      gmyth_string_list_append_char_array (strlist, "REQUEST_BLOCK");
    2.19      gmyth_string_list_append_int (strlist, size - total_read);
    2.20 -
    2.21 -    guint iter_count = 200;
    2.22 +    
    2.23 +    /* 200??? Is this a TV or a HQ data traffic? */
    2.24 +    guint iter_count = 4;
    2.25  
    2.26      do
    2.27      {
    2.28 @@ -817,6 +822,7 @@
    2.29          gmyth_debug ("Trying to move to the next program chain...");
    2.30          if (priv->recorder != NULL && priv->do_next_program_chain)
    2.31          {
    2.32 +	    priv->do_next_program_chain = FALSE;
    2.33              retval = GMYTH_FILE_READ_NEXT_PROG_CHAIN;
    2.34              GMythProgramInfo *prog_info =
    2.35                  gmyth_recorder_get_current_program_info (priv->recorder);