[Gnash-commit] gnash ChangeLog libamf/amf.cpp libamf/lcshm.cpp

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/02/22 09:59:57

Modified files:
        .              : ChangeLog 
        libamf         : amf.cpp lcshm.cpp 

Log message:
                * libamf/amf.cpp: Eliminate warnings.
                * libamf/lcshm.cpp: Delete[] tmp, not ptr. Return ptr.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5721&r2=1.5722
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/lcshm.cpp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5721
retrieving revision 1.5722
diff -u -b -r1.5721 -r1.5722
--- ChangeLog   22 Feb 2008 08:33:58 -0000      1.5721
+++ ChangeLog   22 Feb 2008 09:59:56 -0000      1.5722
@@ -1,3 +1,8 @@
+2008-02-22  Rob Savoye  <address@hidden>
+
+       * libamf/amf.cpp: Eliminate warnings.
+       * libamf/lcshm.cpp: Delete[] tmp, not ptr. Return ptr.
+
 2008-02-21  Rob Savoye  <address@hidden>
 
        * macros/docbook.m4: Don't use the POSIX shell wrappers for the
@@ -57,12 +62,12 @@
        * libmedia/gst/GstUtil.{cpp,h}: Static Gstreamer utility class.
        * libmedia/gst/SoundGst.cpp: Use the configuration audio output
        pipeline.
-       * server/asobj/NetStreamGst.cpp: Likewise, and don't attempt to load
-       the flvdemux element, since it's loaded statically.
-       * libmedia/gst/gstflvdemux.c: Make sure that the element name doesn't
-       conflict with an existing flvdemux.
-       * libmedia/gst/gnash_gst_version.h: Utility macros for dealing with
-       Gstreamer versions. Unused for now.
+       * server/asobj/NetStreamGst.cpp: Likewise, and don't attempt to
+       load the flvdemux element, since it's loaded statically.
+       * libmedia/gst/gstflvdemux.c: Make sure that the element name
+       doesn't conflict with an existing flvdemux.
+       * libmedia/gst/gnash_gst_version.h: Utility macros for dealing
+       with Gstreamer versions. Unused for now.
 
 2008-02-20 Sandro Santilli <address@hidden>
 
@@ -75,15 +80,15 @@
        * server/vm/ASHandlers.cpp (ActionImplementsOp): better logging,
          catch bogus opcodes.
        * server/vm/ASHandlers.cpp (CommonGetUrl): only loadVariables if
-         targetLoad flag is set (tested). Log an SWF error if loadVariables
-         is set but targtLoad is clear.
+         targetLoad flag is set (tested). Log an SWF error if
+         loadVariables is set but targtLoad is clear.
 
 2008-02-20 Bastiaan Jacques <address@hidden>
 
-       * server/parser/video_stream_def.cpp: Don't make a fuss about embedded
-       video definitions without a real codec or video data, because they are
-       frequently (or perhaps always) used as to place NetStream videos on 
-       the stage.
+       * server/parser/video_stream_def.cpp: Don't make a fuss about
+       embedded video definitions without a real codec or video data,
+       because they are frequently (or perhaps always) used as to
+       place NetStream videos on  the stage.
 
 2008-02-20 Sandro Santilli <address@hidden>
 

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- libamf/amf.cpp      19 Feb 2008 19:20:50 -0000      1.60
+++ libamf/amf.cpp      22 Feb 2008 09:59:57 -0000      1.61
@@ -162,7 +162,7 @@
 AMF::readElements(boost::uint8_t *in)
 {
     GNASH_REPORT_FUNCTION;
-boost::uint8_t *x = in;
+    boost::uint8_t *x = in;
     astype_e type = (astype_e)*x;
     bool boolshift;
     const char *mstr = NULL;
@@ -632,6 +632,9 @@
       case Element::VARIABLE:
          return 0;
           break;
+      case Element::FUNCTION:
+         return 0;
+          break;
     };
 
     // you should never get here
@@ -665,7 +668,7 @@
     boost::uint8_t* ptr = new boost::uint8_t[size + 1];
     memset(ptr, 0, size + 1);
     
-    boost::uint8_t *x = ptr;
+//    boost::uint8_t *x = ptr;
     size = 0;
     for (ait = data.begin(); ait != data.end(); ait++) {
        amf::Element *el = (*(ait));

Index: libamf/lcshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/lcshm.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libamf/lcshm.cpp    1 Feb 2008 01:42:41 -0000       1.7
+++ libamf/lcshm.cpp    22 Feb 2008 09:59:57 -0000      1.8
@@ -346,7 +346,7 @@
 }
 
 boost::uint8_t *
-LcShm::formatHeader(const std::string &con, const std::string &host, bool 
domain)
+LcShm::formatHeader(const std::string &con, const std::string &host, bool /* 
domain */ )
 {
     GNASH_REPORT_FUNCTION;
 //    boost::uint8_t *ptr = data + LC_HEADER_SIZE;
@@ -372,9 +372,9 @@
     memcpy(ptr, tmp, host.size());
     ptr +=  host.size();
     
-    delete[] ptr;
+    delete[] tmp;
     
-//     return ptr;
+    return ptr;
 }
 
 /// \brief Prepares the LcShm object to receive commands from a
@@ -405,7 +405,7 @@
     
     Listener::setBaseAddress(reinterpret_cast<uint8_t *>(Shm::getAddr()));
     _baseaddr = reinterpret_cast<uint8_t *>(Shm::getAddr());
-    boost::uint8_t *ptr = parseHeader(Listener::getBaseAddress());
+    parseHeader(Listener::getBaseAddress());
 //    vector<amf::Element *> ellist = parseBody(ptr);
 //     log_debug("Base address is: 0x%x, 0x%x",
 //               (unsigned int)Listener::getBaseAddress(), (unsigned 
int)_baseaddr);
@@ -431,7 +431,7 @@
     
     Listener::setBaseAddress(reinterpret_cast<uint8_t *>(Shm::getAddr()));
     _baseaddr = reinterpret_cast<uint8_t *>(Shm::getAddr());
-    boost::uint8_t *ptr = parseHeader(Listener::getBaseAddress());
+    parseHeader(Listener::getBaseAddress());
 //    vector<amf::Element *> ellist = parseBody(ptr);
 //     log_debug("Base address is: 0x%x, 0x%x",
 //               (unsigned int)Listener::getBaseAddress(), (unsigned 
int)_baseaddr);