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

[Russ Nelson]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Russ Nelson <nelsonrn>  08/05/07 20:59:30

Modified files:
        .              : ChangeLog 
        libamf         : amf.cpp 
        libbase        : extension.cpp memory.cpp shm.cpp 
        server         : character.cpp 
        server/asobj   : ClassHierarchy.cpp NetStreamGst.cpp 
        server/vm      : ActionExec.cpp Machine.cpp 

Log message:
        /tmp/cvspkcyL2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6547&r2=1.6548
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/memory.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/shm.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ClassHierarchy.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Machine.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6547
retrieving revision 1.6548
diff -u -b -r1.6547 -r1.6548
--- ChangeLog   7 May 2008 20:09:22 -0000       1.6547
+++ ChangeLog   7 May 2008 20:59:28 -0000       1.6548
@@ -1,3 +1,16 @@
+2008-05-07 Russ Nelson <address@hidden>
+
+       * libamf/amf.cpp: eliminate "tmp used before initialization"
+       * libamf/amf.cpp: eliminate "variable not used" warning.
+       * libbase/extension.cpp: remove unused variable.
+       * libbase/memory.cpp: comment out unused variable.
+       * libbase/shm.cpp: nuke nuke.
+       * server/character.cpp: mark unused variables as such.
+       * server/asobj/ClassHierarchy.cpp: remove unused function.
+       * server/asobj/NetStreamGst.cpp: mark unused variables as such.
+       * server/vm/ActionExec.cpp: #if 0 out an unused variable.
+       * server/vm/Machine.cpp: mark unused variables as such.
+       
 2008-05-07 Benjamin Wolsey <address@hidden>
 
        * testsuite/swfdec/PASSING: update for new tests.

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- libamf/amf.cpp      3 May 2008 18:44:05 -0000       1.77
+++ libamf/amf.cpp      7 May 2008 20:59:29 -0000       1.78
@@ -587,15 +587,21 @@
           break;
       case Element::TYPED_OBJECT_AMF0:
 //       tmp = encodeTypedObject(el->getData(), el->getLength());
+         tmp = 0;
           break;
 //       // This is a Gnash specific value
 //       case Element::VARIABLE:
 //       case Element::FUNCTION:
 //          break;
+      default:
+         tmp = 0;
+          break;
     };
 
+    if (tmp) {
     buf->append(tmp);
     delete tmp;
+    }
     return buf;
 }
 
@@ -784,7 +790,6 @@
 //    GNASH_REPORT_FUNCTION;
     Network::byte_t *tmpptr = in;
     boost::uint16_t length = 0;
-    Network::byte_t len = 0;
 
 #ifndef GNASH_TRUST_AMF
     ENSUREBYTES(tmpptr, tooFar, sizeof(boost::uint16_t));

Index: libbase/extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/extension.cpp       5 Mar 2008 03:55:52 -0000       1.18
+++ libbase/extension.cpp       7 May 2008 20:59:29 -0000       1.19
@@ -205,7 +205,7 @@
     struct dirent *entry;
     //string::size_type pos;
     char *dirlistcopy;
-    char *dir, libsdir;
+    char *dir;
     char *suffix = 0;
 
 //    scoped_lock lock(lib_mutex);

Index: libbase/memory.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/memory.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/memory.cpp  30 Apr 2008 18:02:05 -0000      1.7
+++ libbase/memory.cpp  7 May 2008 20:59:29 -0000       1.8
@@ -225,7 +225,7 @@
             struct small_mallinfo *ptr = _info + i;
 
 //         // Get the time stamp
-            int diff_stamp_sec = (ptr->stamp.tv_sec) - (ptr - 1)->stamp.tv_sec;
+//            int diff_stamp_sec = (ptr->stamp.tv_sec) - (ptr - 
1)->stamp.tv_sec;
             int diff_stamp_nsec = (ptr->stamp.tv_nsec) - (ptr - 
1)->stamp.tv_nsec;
 //             if ((diff_stamp_sec > 0) || (diff_stamp_nsec > 0)) {
 //             if (ptr->line && (ptr - 1)->line) {

Index: libbase/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/shm.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/shm.cpp     11 Apr 2008 19:02:33 -0000      1.8
+++ libbase/shm.cpp     7 May 2008 20:59:29 -0000       1.9
@@ -84,7 +84,7 @@
 }
 
 bool
-Shm::attach(key_t key, bool nuke)
+Shm::attach(key_t key, bool /* nuke */)
 {
 //    GNASH_REPORT_FUNCTION;
     

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- server/character.cpp        3 May 2008 21:08:47 -0000       1.97
+++ server/character.cpp        7 May 2008 20:59:29 -0000       1.98
@@ -186,6 +186,9 @@
                #ifdef DEBUG_SET_INVALIDATED
                printf("%p set_invalidated() of %s in %s:%d\n",
                        this, get_name(), debug_file, debug_line);
+               #else
+               UNUSED(debug_file);
+               UNUSED(debug_line);
                #endif
                
                // NOTE: the SnappingRanges instance used here is not 
initialized by the

Index: server/asobj/ClassHierarchy.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ClassHierarchy.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/ClassHierarchy.cpp     6 May 2008 11:16:26 -0000       1.16
+++ server/asobj/ClassHierarchy.cpp     7 May 2008 20:59:30 -0000       1.17
@@ -212,12 +212,6 @@
 
 } // end anonymous namespace
 
-static
-as_value do_nothing(const fn_call&)
-{
-       return as_value();
-}
-
 bool
 ClassHierarchy::declareClass(extensionClass& c)
 {

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/asobj/NetStreamGst.cpp       7 May 2008 01:28:03 -0000       1.85
+++ server/asobj/NetStreamGst.cpp       7 May 2008 20:59:30 -0000       1.86
@@ -645,6 +645,8 @@
     plugin_name);
 
   g_free(plugin_name);
+#else
+UNUSED(message);
 #endif
 }
 
@@ -780,8 +782,8 @@
 }
 
 void
-NetStreamGst::decodebin_unknown_cb(GstElement* /*decodebin*/, GstPad* pad,
-                                  GstCaps *caps, gpointer user_data)
+NetStreamGst::decodebin_unknown_cb(GstElement* /*decodebin*/, GstPad* /*pad*/,
+                                  GstCaps *caps, gpointer /*user_data*/)
 {
   GstStructure* str = gst_caps_get_structure (caps, 0);
   const gchar* structure_name = gst_structure_get_name (str);

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- server/vm/ActionExec.cpp    21 Apr 2008 11:54:33 -0000      1.72
+++ server/vm/ActionExec.cpp    7 May 2008 20:59:30 -0000       1.73
@@ -187,7 +187,9 @@
        // TODO: specify in the .gnashrc !!
        static const size_t maxBranchCount = 65536; // what's enough ?
 
+#if 0
        boost::uint32_t timeLimit = getScriptTimeout();
+#endif
        WallClockTimer timer;
 
        size_t branchCount = 0;

Index: server/vm/Machine.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Machine.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/vm/Machine.cpp       6 Mar 2008 14:52:21 -0000       1.8
+++ server/vm/Machine.cpp       7 May 2008 20:59:30 -0000       1.9
@@ -2312,6 +2312,9 @@
        // And push the instance ('this')
        mStack.push(instance);
        pushCall(1, &mStack.top(0), pBinding); //TODO: pBinding->getGetter());
+#else
+UNUSED(pDefinition);
+UNUSED(name);
 #endif
 }
 
@@ -2340,6 +2343,10 @@
        mStack.push(instance);
        mStack.push(newvalue);
        pushCall(2, &mStack.top(1), pBinding); //TODO: pBinding->getSetter());
+#else
+UNUSED(pDefinition);
+UNUSED(name);
+UNUSED(newvalue);
 #endif
 }