[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1981-g58ca7e6

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  58ca7e6ec563f76dc1cf3ea29c6864bdf6d2f421 (commit)
       via  3590c081ea819f10df1d0017caddb0e21bc014b1 (commit)
      from  0cdd056bf1403e2432b238854bb3fd84ef335098 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=58ca7e6ec563f76dc1cf3ea29c6864bdf6d2f421


commit 58ca7e6ec563f76dc1cf3ea29c6864bdf6d2f421
Author: Bastiaan Jacques <address@hidden>
Date:   Thu May 15 00:33:34 2014 +0200

    Remove unused code.

diff --git a/libbase/RTMP.cpp b/libbase/RTMP.cpp
index a8b0998..17b7552 100644
--- a/libbase/RTMP.cpp
+++ b/libbase/RTMP.cpp
@@ -58,12 +58,8 @@ namespace {
     boost::int32_t decodeInt32LE(const boost::uint8_t* c);
     int encodeInt32LE(boost::uint8_t *output, int nVal);
     unsigned int decodeInt24(const boost::uint8_t* c);
-    boost::uint8_t* encodeInt16(boost::uint8_t *output, boost::uint8_t *outend,
-            short nVal);
     boost::uint8_t* encodeInt24(boost::uint8_t *output, boost::uint8_t *outend,
             int nVal);
-    boost::uint8_t* encodeInt32(boost::uint8_t *output, boost::uint8_t *outend,
-            int nVal);
 
     static const int packetSize[] = { 12, 8, 4, 1 };
  
@@ -1148,16 +1144,6 @@ decodeInt24(const boost::uint8_t *c)
 }
 
 boost::uint8_t*
-encodeInt16(boost::uint8_t *output, boost::uint8_t *outend, short nVal)
-{
-    if (output+2 > outend) return NULL;
-  
-    output[1] = nVal & 0xff;
-    output[0] = nVal >> 8;
-    return output + 2;
-}
-
-boost::uint8_t*
 encodeInt24(boost::uint8_t *output, boost::uint8_t *outend, int nVal)
 {
     if (output + 3 > outend) return NULL;
@@ -1168,18 +1154,6 @@ encodeInt24(boost::uint8_t *output, boost::uint8_t 
*outend, int nVal)
     return output+3;
 }
 
-boost::uint8_t*
-encodeInt32(boost::uint8_t *output, boost::uint8_t *outend, int nVal)
-{
-    if (output+4 > outend) return NULL;
-
-    output[3] = nVal & 0xff;
-    output[2] = nVal >> 8;
-    output[1] = nVal >> 16;
-    output[0] = nVal >> 24;
-    return output + 4;
-}
-
 boost::uint32_t
 getUptime()
 {

http://git.savannah.gnu.org/cgit//commit/?id=3590c081ea819f10df1d0017caddb0e21bc014b1


commit 3590c081ea819f10df1d0017caddb0e21bc014b1
Author: Bastiaan Jacques <address@hidden>
Date:   Wed May 14 21:05:44 2014 +0200

    To keep ubsan (undefined behaviour sanitizer) happy, store ParseStatus, an 
enum as an int, because it can be set to any integer value.

diff --git a/libcore/asobj/XML_as.h b/libcore/asobj/XML_as.h
index 0284c2f..36d1c50 100644
--- a/libcore/asobj/XML_as.h
+++ b/libcore/asobj/XML_as.h
@@ -120,7 +120,7 @@ public:
     ///
     void parseXML(const std::string& xml);
 
-    ParseStatus status() const {
+    int status() const {
         return _status;
     }
 
@@ -177,7 +177,8 @@ private:
     //  1 if successfully loaded
     LoadStatus _loaded;
 
-    ParseStatus _status;       
+    // Nominally used to store ParseStatus, but can be any int value.
+    int _status;
  
     std::string _docTypeDecl;
 

-----------------------------------------------------------------------

Summary of changes:
 libbase/RTMP.cpp       |   26 --------------------------
 libcore/asobj/XML_as.h |    5 +++--
 2 files changed, 3 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
Gnash