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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/30 09:32:19

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

Log message:
                * libamf/amf.{cpp,h}: changed amf_element_t.data type to
                  'const' unsigned char. This fixed compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.778&r2=1.779
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -b -r1.778 -r1.779
--- ChangeLog   30 Aug 2006 09:11:08 -0000      1.778
+++ ChangeLog   30 Aug 2006 09:32:19 -0000      1.779
@@ -1,5 +1,7 @@
 2006-08-30 Sandro Santilli  <address@hidden>
 
+       * libamf/amf.{cpp,h}: changed amf_element_t.data type to
+         'const' unsigned char. This fixed compiler warnings.
        * server/gstring.h, server/asobj/gstring.h,
          server/string.cpp, server/asobj/string.cpp,
          server/Makefile.am, server/asobj/Makefile.am:

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libamf/amf.cpp      28 Aug 2006 11:07:14 -0000      1.15
+++ libamf/amf.cpp      30 Aug 2006 09:32:19 -0000      1.16
@@ -975,9 +975,9 @@
           break;
       case Boolean:
       case String:
-          length = ntohs(*(const short *)tmpptr); // @@ this cast is dangerous
+          length = ntohs(*reinterpret_cast<const short *>(tmpptr)); // @@ this 
cast is dangerous due to memory alignment constraints
           tmpptr += sizeof(short);
-          el.data = (unsigned char*)tmpptr; // @@ this cast is dangerous
+          el.data = (const unsigned char*)tmpptr; 
           dbglogfile << "Variable \"" << el.name.c_str() << "\" is: " << 
el.data << endl;
           tmpptr += length;
           el.length = length;

Index: libamf/amf.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libamf/amf.h        12 Aug 2006 15:11:53 -0000      1.6
+++ libamf/amf.h        30 Aug 2006 09:32:19 -0000      1.7
@@ -197,7 +197,7 @@
       astype_e       type;
       short          length;
       std::string     name;
-      unsigned char   *data;
+      const unsigned char   *data;
     } amf_element_t;
     AMF();
     AMF(int size);