[Gnash-commit] gnash/libamf lcshm.cpp sol.cpp

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/04/11 19:36:03

Modified files:
        libamf         : lcshm.cpp sol.cpp 

Log message:
        Cleanup a few compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/lcshm.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/sol.cpp?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: lcshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/lcshm.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- lcshm.cpp   11 Apr 2008 19:02:35 -0000      1.12
+++ lcshm.cpp   11 Apr 2008 19:36:02 -0000      1.13
@@ -358,7 +358,7 @@
 //    Network::byte_t *ptr = data + LC_HEADER_SIZE;
     int size = con.size() + host.size() + 9;
 
-    Buffer *buf;
+//    Buffer *buf;
     
     Network::byte_t *header = new Network::byte_t[size + 1];
     Network::byte_t *ptr = header;
@@ -373,11 +373,11 @@
     // Which is then always followed by 3 AMF objects.
     Buffer *buf1 = AMF::encodeString(con);
     memcpy(ptr, buf1->begin(), buf1->size());
-    ptr += buf->size();
+    ptr += buf1->size();
 
     Buffer *buf2 = AMF::encodeString(host);
     memcpy(ptr, buf2->begin(), buf2->size());
-    ptr += buf->size();
+    ptr += buf2->size();
     
     return ptr;
 }
@@ -446,8 +446,8 @@
 
 /// \brief Invokes a method on a specified LcShm object.
 void
-LcShm::send(const string &name, const string &domainname,
-            vector<amf::Element *> &data)
+LcShm::send(const string & /* name */, const string & /* domainname */,
+            vector<amf::Element *> &/* data */)
 {
     GNASH_REPORT_FUNCTION;
 

Index: sol.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/sol.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- sol.cpp     6 Apr 2008 18:11:34 -0000       1.32
+++ sol.cpp     11 Apr 2008 19:36:03 -0000      1.33
@@ -325,7 +325,7 @@
     boost::uint16_t size;
     Network::byte_t *buf;
     Network::byte_t *ptr;
-    int bodysize;
+    size_t bodysize;
 
     // Make sure it's an SOL file
     if (stat(filespec.c_str(), &st) == 0) {
@@ -373,7 +373,7 @@
 
         AMF amf_obj;
        int size = 0;
-        while (size <= bodysize) {
+        while (size <= static_cast<boost::uint16_t>(bodysize)) {
            amf::Element *el =  amf_obj.extractVariable(ptr);
             if (el != 0) {
                size += amf_obj.totalsize();