[Gnash-commit] gnash ChangeLog libbase/log.cpp testsuite/libam...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/05 18:20:50

Modified files:
        .              : ChangeLog 
        libbase        : log.cpp 
        testsuite/libamf.all: test_object.cpp 

Log message:
                * libbase/log.cpp: remove silly assertion.
                * testsuite/libamf.all/test_object.cpp: use std::string hexify.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5812&r2=1.5813
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_object.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5812
retrieving revision 1.5813
diff -u -b -r1.5812 -r1.5813
--- ChangeLog   5 Mar 2008 17:38:09 -0000       1.5812
+++ ChangeLog   5 Mar 2008 18:20:49 -0000       1.5813
@@ -1,3 +1,8 @@
+2008-03-04 Benjamin Wolsey <address@hidden>
+
+       * libbase/log.cpp: remove silly assertion.
+       * testsuite/libamf.all/test_object.cpp: use std::string hexify.
+
 2008-03-04 Sandro Santilli <address@hidden>
 
        * testsuite/swfdec/PASSING: added tests that only failed due to 

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- libbase/log.cpp     5 Mar 2008 11:54:33 -0000       1.66
+++ libbase/log.cpp     5 Mar 2008 18:20:50 -0000       1.67
@@ -58,8 +58,6 @@
 std::string hexify (const unsigned char *p, size_t length, bool ascii)
 {
 
-       assert (length <= sizeof(p));
-
        const std::vector<unsigned char> bytes (p, p + length);
 
        std::ostringstream ss;

Index: testsuite/libamf.all/test_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_object.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/libamf.all/test_object.cpp        21 Jan 2008 23:26:49 -0000      
1.12
+++ testsuite/libamf.all/test_object.cpp        5 Mar 2008 18:20:50 -0000       
1.13
@@ -78,6 +78,8 @@
 int
 main(int argc, char *argv[])
 {
+    cout << "hello" << endl;
+
     char buffer[300];
     int c;
 
@@ -297,14 +299,8 @@
     } else {
         size_t s = 12;
         runtest.fail("RTMP Headers mismatch");
-        unsigned char* hexint = new unsigned char[(s*2)+1];
-        hexify((unsigned char *)hexint, (unsigned char *)buf, s, true);
-       hexint[s*2] = '\0';
-        cerr << "buf is: 0x" << hexint << endl;
-        hexify((unsigned char *)hexint, (unsigned char *)out, s, true);
-       hexint[s*2] = '\0';
-        cerr << "out is: 0x" << hexint << endl;
-       delete [] hexint;
+        cerr << "buf is: 0x" << hexify(buf, s, true) << endl;
+        cerr << "out is: 0x" << hexify(out, s, true) << endl;
     }
 
     tmpptr += rtmp.getHeaderSize();
@@ -484,15 +480,8 @@
     }    
 
     size_t hexsize = std::max(AMF_PACKET_SIZE, amf_obj.getTotalSize())*2;
-    unsigned char* hexint = new unsigned char[hexsize+1];
-    hexify((unsigned char *)hexint, (unsigned char *)buf, 
amf_obj.getTotalSize() + 10, true);
-    hexint[hexsize] = '\0';
-    cerr << "buf is: 0x" << hexint << ", size is: " << amf_obj.getTotalSize() 
<< endl;
-    hexify((unsigned char *)hexint, (unsigned char *)out, rtmp.getTotalSize() 
+ 10, true);
-    hexint[hexsize] = '\0';
-    cerr << "out is: 0x" << hexint << ", size is: " << rtmp.getTotalSize() << 
endl;
-
-    delete [] hexint;
+    cerr << "buf is: 0x" << hexify(buf, amf_obj.getTotalSize() + 10, true) << 
", size is: " << amf_obj.getTotalSize() << endl;
+    cerr << "out is: 0x" << hexify(out, rmtp.getTotalSize() + 10, true) << ", 
size is: " << rtmp.getTotalSize() << endl;
     
 //    delete out;
 }