[Gnash-commit] gnash ChangeLog server/button_character_instanc...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/27 16:00:48

Modified files:
        .              : ChangeLog 
        server         : button_character_instance.cpp 

Log message:
                * server/button_character_instance.cpp: compare std::strings for
                  portability (no strcasecmp).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6725&r2=1.6726
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.101&r2=1.102

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6725
retrieving revision 1.6726
diff -u -b -r1.6725 -r1.6726
--- ChangeLog   27 May 2008 15:32:29 -0000      1.6725
+++ ChangeLog   27 May 2008 16:00:47 -0000      1.6726
@@ -1,3 +1,8 @@
+2008-05-27 Benjamin Wolsey <address@hidden>
+
+       * server/button_character_instance.cpp: compare std::strings for
+         portability (no strcasecmp).
+
 2008-05-27 Sandro Santilli <address@hidden>
 
        * libmedia/ffmpeg/sound_handler_sdl.cpp (delete_all_sounds):

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- server/button_character_instance.cpp        22 Apr 2008 13:12:09 -0000      
1.101
+++ server/button_character_instance.cpp        27 May 2008 16:00:48 -0000      
1.102
@@ -37,6 +37,7 @@
 #include "ExecutableCode.h"
 #include "namedStrings.h"
 #include "Object.h" // for getObjectInterface
+#include "StringPredicates.h"
 
 /** \page buttons Buttons and mouse behaviour
 
@@ -825,7 +826,7 @@
        as_object* ch = get_path_element_character(key);
        if ( ch ) return ch;
 
-       std::string name = _vm.getStringTable().value(key);
+       const std::string& name = _vm.getStringTable().value(key);
        return getChildByName(name); // possibly NULL
 }
 
@@ -842,17 +843,18 @@
 
        for (CharsVect::iterator i=actChars.begin(), e=actChars.end(); i!=e; 
++i)
        {
-               character* child = *i;
-               const char* pat_c = child->get_name().c_str();
-               const char* nam_c = name.c_str();
+
+               character* const child = *i;
+               const std::string& childname = child->get_name();
 
                if ( _vm.getSWFVersion() >= 7 )
                {
-                       if (! strcmp(pat_c, nam_c) ) return child;
+                       if ( childname == name ) return child;
                }
                else
                {
-                       if ( ! strcasecmp(pat_c, nam_c) ) return child;
+                   StringNoCaseEqual noCaseCompare;
+                       if ( noCaseCompare(childname, name) ) return child;
                }
        }