[Gnash-commit] gnash ChangeLog testsuite/libbase/NoSeekFileTes...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/10 07:03:02

Modified files:
        .              : ChangeLog 
        testsuite/libbase: NoSeekFileTest.cpp 

Log message:
        fix build (don't use 'read' as a variable name, being already
        a library function).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6878&r2=1.6879
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/NoSeekFileTest.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6878
retrieving revision 1.6879
diff -u -b -r1.6878 -r1.6879
--- ChangeLog   10 Jun 2008 06:12:10 -0000      1.6878
+++ ChangeLog   10 Jun 2008 07:03:01 -0000      1.6879
@@ -1,5 +1,10 @@
 2008-06-10 Sandro Santilli <address@hidden>
 
+       * testsuite/libbase/NoSeekFileTest.cpp: fix build (don't use
+         'read' as a variable name, being already a library function).
+
+2008-06-10 Sandro Santilli <address@hidden>
+
        * libbase/LoadThread.{cpp,h}: change seek to return 0 on success
          and -1 on error (to be closer to IOChannel iface). There were no
          users of it, I tested. Note that seek() doesn't do what dox say

Index: testsuite/libbase/NoSeekFileTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/NoSeekFileTest.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/libbase/NoSeekFileTest.cpp        9 Jun 2008 19:08:27 -0000       
1.12
+++ testsuite/libbase/NoSeekFileTest.cpp        10 Jun 2008 07:03:02 -0000      
1.13
@@ -56,8 +56,8 @@
 }
 
 
-bool 
-compare_reads(gnash::IOChannel* reader, int fd, char* first, char* second)
+static bool 
+compare_reads(gnash::IOChannel* reader, int fd, const char* first, const char* 
second)
 {
        char buf[CHUNK_SIZE];
        char buf2[CHUNK_SIZE];
@@ -65,7 +65,7 @@
        stringstream ss;
 
 
-       size_t read = 0;
+       size_t consumed = 0;
 
        for(;;)
        {
@@ -97,10 +97,10 @@
                        return false;
                }
 
-               read+=sz1;
+               consumed+=sz1;
        }
 
-       if ( read == 0 ) 
+       if ( consumed == 0 ) 
        {
                runtest.fail("No bytes read from either " + string(first) + " 
or " + string(second) + " file");
                return false;
@@ -113,7 +113,7 @@
                return false;
        }
 
-       ss << "compared " << read << " bytes from "
+       ss << "compared " << consumed << " bytes from "
                << first << " and " << second;
 
        runtest.pass(ss.str());