gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] /srv/bzr/gnash/rtmp r9880: be less verbose.


From: rob
Subject: [Gnash-commit] /srv/bzr/gnash/rtmp r9880: be less verbose.
Date: Mon, 22 Dec 2008 10:44:32 -0800
User-agent: Bazaar (1.5)

------------------------------------------------------------
revno: 9880
committer: address@hidden
branch nick: rtmp
timestamp: Mon 2008-12-22 10:44:32 -0800
message:
  be less verbose.
modified:
  libnet/http.cpp
=== modified file 'libnet/http.cpp'
--- a/libnet/http.cpp   2008-12-21 16:48:24 +0000
+++ b/libnet/http.cpp   2008-12-22 18:44:32 +0000
@@ -1128,22 +1128,22 @@
 amf::Buffer &
 HTTP::formatEchoResponse(const std::string &num, amf::Element &el)
 {
-    GNASH_REPORT_FUNCTION;
+//    GNASH_REPORT_FUNCTION;
     boost::shared_ptr<amf::Buffer> data = amf::AMF::encodeElement(el);
-    return formatEchoResponse(num, data->reference(), data->size());
+    return formatEchoResponse(num, data->reference(), data->allocated());
 }
 
 amf::Buffer &
 HTTP::formatEchoResponse(const std::string &num, amf::Buffer &data)
 {
-    GNASH_REPORT_FUNCTION;
-    return formatEchoResponse(num, data.reference(), data.size());
+//    GNASH_REPORT_FUNCTION;
+    return formatEchoResponse(num, data.reference(), data.allocated());
 }
 
 amf::Buffer &
 HTTP::formatEchoResponse(const std::string &num, boost::uint8_t *data, size_t 
size)
 {
-    GNASH_REPORT_FUNCTION;
+//    GNASH_REPORT_FUNCTION;
 
     boost::uint8_t *tmpptr  = data;
     
@@ -1187,7 +1187,9 @@
        _buffer += amf::Element::NULL_AMF0;
     } else {
        // Add the AMF data we're echoing back
-       _buffer.append(data, size);
+       if (size) {
+           _buffer.append(data, size);
+       }
     }
     
     return _buffer;


reply via email to

[Prev in Thread] Current Thread [Next in Thread]