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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_2_rc1
Changes by:     Rob Savoye <rsavoye>    08/02/22 10:06:19

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&only_with_tag=release_0_8_2_rc1&r1=1.5711.2.8&r2=1.5711.2.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.60&r2=1.60.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/lcshm.cpp?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.7&r2=1.7.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5711.2.8
retrieving revision 1.5711.2.9
diff -u -b -r1.5711.2.8 -r1.5711.2.9
--- ChangeLog   22 Feb 2008 08:35:46 -0000      1.5711.2.8
+++ ChangeLog   22 Feb 2008 10:06:18 -0000      1.5711.2.9
@@ -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

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.60
retrieving revision 1.60.2.1
diff -u -b -r1.60 -r1.60.2.1
--- libamf/amf.cpp      19 Feb 2008 19:20:50 -0000      1.60
+++ libamf/amf.cpp      22 Feb 2008 10:06:19 -0000      1.60.2.1
@@ -629,6 +629,9 @@
          return encodeTypedObject(el->getData(), el->getLength());
           break;
          // This is a Gnash specific value
+      case Element::FUNCTION:
+         return 0;
+          break;
       case Element::VARIABLE:
          return 0;
           break;
@@ -665,7 +668,6 @@
     boost::uint8_t* ptr = new boost::uint8_t[size + 1];
     memset(ptr, 0, size + 1);
     
-    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.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- libamf/lcshm.cpp    1 Feb 2008 01:42:41 -0000       1.7
+++ libamf/lcshm.cpp    22 Feb 2008 10:06:19 -0000      1.7.2.1
@@ -177,7 +177,7 @@
 
     boost::uint8_t *addr = _baseaddr + LC_LISTENERS_START;
 
-    int len;
+    int len = 0;
     char *item = reinterpret_cast<char *>(addr);
     while (*item != 0) {
         if (name == item) {
@@ -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