[Refdb-cvs] CVS: refdb/src readris.c,1.12.2.3,1.12.2.4
Status: Beta
Brought to you by:
mhoenicka
From: Markus H. <mho...@us...> - 2005-10-28 23:49:53
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8011 Modified Files: Tag: Release_0_9_5_stable readris.c Log Message: read_ris_set(): use feof() instead of checking errno Index: readris.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/readris.c,v retrieving revision 1.12.2.3 retrieving revision 1.12.2.4 diff -u -U2 -r1.12.2.3 -r1.12.2.4 --- readris.c 29 Jul 2005 21:15:35 -0000 1.12.2.3 +++ readris.c 28 Oct 2005 23:49:45 -0000 1.12.2.4 @@ -122,5 +122,10 @@ if (result == NULL) { free(linebuffer); - return 2; + if (feof(fp)) { + return 2; + } + else { + return 0; + } } } @@ -140,11 +145,11 @@ while (!setdone) { result = fgets(linebuffer, RIS_LINE_SIZE, fp); - if (result == NULL && errno != EOF) { -/* free(linebuffer); */ -/* return 0; */ - filedone++; - setdone++; + if (result == NULL && !feof(fp)) { + free(linebuffer); + return 0; +/* filedone++; */ +/* setdone++; */ } - if (result == NULL && errno == EOF) { + else if (result == NULL /* EOF */) { filedone++; setdone++; |