[Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/01 10:39:16

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp as_environment.h 

Log message:
                * server/as_environment.cpp, server/as_environment.h:
                changed register-related functions to use unsigned
                ints rather the ints for offsets.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.454&r2=1.455
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -b -r1.454 -r1.455
--- ChangeLog   1 Jul 2006 10:00:29 -0000       1.454
+++ ChangeLog   1 Jul 2006 10:39:16 -0000       1.455
@@ -1,6 +1,9 @@
 2006-07-01 Sandro Santilli <address@hidden>
 
        * server/as_environment.cpp, server/as_environment.h:
+       changed register-related functions to use unsigned
+       ints rather the ints for offsets.
+       * server/as_environment.cpp, server/as_environment.h:
        added a get_version() method to hide implementation.
        * server/ActionExec.cpp, server/sprite_instance.cpp,
        server/swf/ASHandlers.cpp: use env.get_version()

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/as_environment.cpp   1 Jul 2006 10:00:29 -0000       1.7
+++ server/as_environment.cpp   1 Jul 2006 10:39:16 -0000       1.8
@@ -274,25 +274,19 @@
     m_variables[varname] = val;
 }
 
-// Return a pointer to the specified local register.
-// Local registers are numbered starting with 1.
-//
-// Return value will never be NULL.  If reg is out of bounds,
-// we log an error, but still return a valid pointer (to
-// global reg[0]).  So the behavior is a bit undefined, but
-// not dangerous.
 as_value*
-as_environment::local_register_ptr(int reg)
+as_environment::local_register_ptr(unsigned int reg)
 {
     // We index the registers from the end of the register
     // array, so we don't have to keep base/frame
     // pointers.
 
-    if (reg <= 0 || reg > (int) m_local_register.size()) {
-       log_error("Invalid local register %d, stack only has %zd entries\n",
+       if (reg > m_local_register.size())
+       {
+               log_error("Invalid local register %d, stack only has "
+                       "%zd entries\n",
                  reg, m_local_register.size());
        
-       // Fallback: use global 0.
        return &m_global_register[0];
     }
     

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/as_environment.h     1 Jul 2006 10:00:29 -0000       1.9
+++ server/as_environment.h     1 Jul 2006 10:39:16 -0000       1.10
@@ -167,6 +167,7 @@
 
        /// Set/initialize the value of the local variable.
        void    set_local(const tu_string& varname, const as_value& val);
+
        /// \brief
        /// Add a local var with the given name and value to our
        /// current local frame. 
@@ -196,15 +197,24 @@
        void    add_frame_barrier() { m_local_frames.push_back(frame_slot()); }
 
        // Local registers.
-       void    add_local_registers(int register_count)
+       void    add_local_registers(unsigned int register_count)
        {
                m_local_register.resize(m_local_register.size() + 
register_count);
        }
-       void    drop_local_registers(int register_count)
+       void    drop_local_registers(unsigned int register_count)
        {
                m_local_register.resize(m_local_register.size() - 
register_count);
        }
-       as_value*       local_register_ptr(int reg);
+
+       /// \brief
+       /// Return a pointer to the specified local register.
+       /// Local registers are numbered starting with 1.
+       //
+       /// Return value will never be NULL.  If reg is out of bounds,
+       /// we log an error, but still return a valid pointer (to
+       /// global reg[0]).  So the behavior is a bit undefined, but
+       /// not dangerous.
+       as_value* local_register_ptr(unsigned int reg);
 
        sprite_instance*        find_target(const tu_string& path) const;
        sprite_instance*        find_target(const as_value& val) const;