[Gnash-commit] gnash ChangeLog testsuite/libamf.all/test_lc.cpp [release_0_8_2_rc1]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_2_rc1
Changes by:     Sandro Santilli <strk>  08/02/25 08:38:00

Modified files:
        .              : ChangeLog 
        testsuite/libamf.all: test_lc.cpp 

Log message:
        don't assume (void*) is 32-bit, remove unneeded casts,
        fix missing return warnings. Should fix bug #22378.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.5711.2.20&r2=1.5711.2.21
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_lc.cpp?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.7&r2=1.7.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5711.2.20
retrieving revision 1.5711.2.21
diff -u -b -r1.5711.2.20 -r1.5711.2.21
--- ChangeLog   25 Feb 2008 07:25:10 -0000      1.5711.2.20
+++ ChangeLog   25 Feb 2008 08:37:59 -0000      1.5711.2.21
@@ -1,5 +1,8 @@
 2008-02-25 Sandro Santilli <address@hidden>
 
+       * testsuite/libamf.all/test_lc.cpp: don't assume (void*) is 32-bit,
+         remove unneeded casts, fix missing return warnings. Should fix bug
+         #22378.
        * libmedia/sdl: removed unused code.
 
 2008-02-24 Benjamin Wolsey <address@hidden>

Index: testsuite/libamf.all/test_lc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_lc.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- testsuite/libamf.all/test_lc.cpp    20 Feb 2008 15:26:29 -0000      1.7
+++ testsuite/libamf.all/test_lc.cpp    25 Feb 2008 08:38:00 -0000      1.7.2.1
@@ -72,11 +72,11 @@
 
 static TestState runtest;
 
-bool test_read();
-bool test_write();
-bool test_listen();
-bool test_data();
-bool load_data();
+void test_read();
+void test_write();
+void test_listen();
+void test_data();
+void load_data();
 
 LogFile& dbglogfile = LogFile::getDefaultInstance();
 
@@ -113,7 +113,7 @@
 //     test_write(filespec);
 }
 
-bool
+void
 test_listen()
 {
 
@@ -190,7 +190,7 @@
     
 }
 
-bool
+void
 test_data()
 {
     LcShm lc;
@@ -236,7 +236,7 @@
     lc.send(con1, "localhost", els);
 }
 
-bool
+void
 load_data()
 {
 
@@ -256,9 +256,9 @@
     string srcdir = SRCDIR;
     srcdir += "/segment.raw";
     int fd = ::open(srcdir.c_str(), O_RDONLY);
-    void *dataptr = static_cast<unsigned char *>(mmap(0, 64528, PROT_READ, 
MAP_SHARED, fd, 0));
+    void *dataptr = mmap(0, 64528, PROT_READ, MAP_SHARED, fd, 0);
 
-    if (dataptr != (void *)0xffffffff) {
+    if (dataptr != (void*)-1) {
         memcpy(shmaddr, dataptr, 64528);
     } else {
         cerr << "ERROR: couldn't map input file!" << endl;
@@ -267,7 +267,7 @@
     ::close(fd);
 }
 
-bool
+void
 test_read()
 {
 
@@ -287,9 +287,9 @@
     string srcdir = SRCDIR;
     srcdir += "/segment.raw";
     int fd = ::open(srcdir.c_str(), O_RDONLY);
-    void *dataptr = static_cast<unsigned char *>(mmap(0, 64528, PROT_READ, 
MAP_SHARED, fd, 0));
+    void *dataptr = mmap(0, 64528, PROT_READ, MAP_SHARED, fd, 0);
 #if 1
-    if (dataptr != (void *)0xffffffff) {
+    if (dataptr != (void*)-1) {
         memcpy(shmaddr, dataptr, 64528);
     } else {
         cerr << "ERROR: couldn't map input file!" << endl;
@@ -340,7 +340,7 @@
     lc.close();
 }
 
-bool
+void
 test_write()
 {
 #if 0