[Gnash-commit] /srv/bzr/gnash/rtmp r9592: Minor formatting changes.

[rob]

------------------------------------------------------------
revno: 9592
committer: address@hidden
branch nick: rtmp
timestamp: Wed 2008-08-20 10:32:44 -0600
message:
  Minor formatting changes.
modified:
  libamf/flv.cpp
  libnet/rtmp.cpp
  testsuite/libnet.all/test_rtmp.cpp

=== modified file 'libamf/flv.cpp'
--- a/libamf/flv.cpp    2008-08-18 23:35:08 +0000
+++ b/libamf/flv.cpp    2008-08-20 16:32:44 +0000
@@ -44,7 +44,6 @@
 namespace amf 
 {
 
-
 Flv::Flv() 
 {
 //    GNASH_REPORT_FUNCTION;

=== modified file 'libnet/rtmp.cpp'
--- a/libnet/rtmp.cpp   2008-08-19 17:49:24 +0000
+++ b/libnet/rtmp.cpp   2008-08-20 16:32:44 +0000
@@ -492,6 +492,7 @@
     memset(ping, 0, sizeof(rtmp_ping_t));
 
     // All the data fields in a ping message are 2 bytes long.
+    // FIXME: FIXME: FIXME: breaks on big endian, ppc
     boost::uint16_t type = ntohs(*reinterpret_cast<rtmp_ping_e *>(ptr));
     ping->type = static_cast<rtmp_ping_e>(type);
     ptr += sizeof(boost::uint16_t);
@@ -510,6 +511,7 @@
 
     return ping;    
 }
+
 RTMP::rtmp_ping_t *
 RTMP::decodePing(amf::Buffer *buf)
 {

=== modified file 'testsuite/libnet.all/test_rtmp.cpp'
--- a/testsuite/libnet.all/test_rtmp.cpp        2008-08-15 17:03:45 +0000
+++ b/testsuite/libnet.all/test_rtmp.cpp        2008-08-20 16:32:44 +0000
@@ -179,6 +179,7 @@
 //    test_types();
 }
 
+// 00 00 cf 03 04 c3 00 00
 void
 test_system()
 {
@@ -208,7 +209,7 @@
 
     boost::uint32_t time = *(reinterpret_cast<boost::uint32_t 
*>(buf2->reference() + 2));
     Buffer *enc2 = server.encodePing(RTMP::PING_CLIENT, htonl(time));
-//    cerr << hexify(enc2->begin(), enc2->size(), false) << endl;
+    cerr << hexify(enc2->begin(), enc2->size(), false) << endl;
     if ((memcmp(buf2->reference(), enc2->reference(), 6) == 0)) {
         runtest.pass("Encoded RTMP Ping Client message");
     } else {
@@ -259,7 +260,6 @@
     Buffer *buf1 = hex2mem("03 00 00 00 00 01 1f 14 00 00 00 00");
     Buffer *head1 = server.encodeHeader(0x3, RTMP::HEADER_12, 287,
                                         RTMP::INVOKE, RTMPMsg::FROM_SERVER);
-//    cerr << hexify(head1->begin(), RTMP_MAX_HEADER_SIZE, false) << endl;
     
      if ((memcmp(buf1->reference(), head1->reference(), RTMP_MAX_HEADER_SIZE) 
== 0)) {
          runtest.pass("Encoded RTMP header(Invoke)");
@@ -278,7 +278,6 @@
      Buffer *buf2 = hex2mem("02 00 00 00 00 00 06 04 00 00 00 00");
      Buffer *head2 = server.encodeHeader(0x2, RTMP::HEADER_12, PING_MSG_SIZE,
                                      RTMP::PING, RTMPMsg::FROM_SERVER);
-//     cerr << hexify(head2->begin(), RTMP_MAX_HEADER_SIZE, false) << endl;
      if ((memcmp(buf2->reference(), head2->reference(), 8) == 0)) {
          runtest.pass("Encoded RTMP header(Ping 0)");
      } else {
@@ -347,7 +346,7 @@
         std::vector<amf::Element *> props = hell[0]->getProperties();        
 //         printf("FIXME: %d, %d, %s:%s\n", props.size(), msg1->getStatus(),
 //                props[3]->getName(), props[3]->to_string());
-//         msg1->dump();
+//        msg1->dump();
         if ((msg1->getStatus() ==  RTMPMsg::NC_CONNECT_SUCCESS)
             && (msg1->getMethodName() == "_result")
             && (msg1->getStreamID() == 1)
@@ -557,7 +556,7 @@
 #else
 
 int
-main(int /*argc*/, char /* *argv[]*/)
+main(int /* argc */, char /* *argv[] */ )
 {
   // nop
   return 0;