From: Sean J. <sja...@us...> - 2004-05-09 05:13:19
|
Update of /cvsroot/binaryphp/binaryphp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25609 Modified Files: php_var.cpp Log Message: Fixes string comparisons (strcmp/etc return 0 when the strings are the same) Index: php_var.cpp =================================================================== RCS file: /cvsroot/binaryphp/binaryphp/php_var.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** php_var.cpp 22 Nov 2003 16:48:10 -0000 1.37 --- php_var.cpp 9 May 2004 05:13:09 -0000 1.38 *************** *** 222,226 **** break; case PHP_STRING: ! return !container.compare(var.getstring()); break; } --- 222,226 ---- break; case PHP_STRING: ! return container.compare(var.getstring()) != 0; break; } *************** *** 232,245 **** { case PHP_INT: ! return strcmp(cmp, intstring(getint())); break; case PHP_FLOAT: ! return strcmp(cmp, doublestring(getfloat())); break; case PHP_BOOL: ! return strcmp(cmp, intstring(getint())); break; case PHP_STRING: ! return container.compare(cmp); break; } --- 232,245 ---- { case PHP_INT: ! return strcmp(cmp, intstring(getint())) == 0; break; case PHP_FLOAT: ! return strcmp(cmp, doublestring(getfloat())) == 0; break; case PHP_BOOL: ! return strcmp(cmp, intstring(getint())) == 0; break; case PHP_STRING: ! return container.compare(cmp) == 0; break; } *************** *** 260,264 **** break; case PHP_STRING: ! return container.compare(intstring(i)); break; } --- 260,264 ---- break; case PHP_STRING: ! return container.compare(intstring(i)) == 0; break; } *************** *** 282,286 **** break; case PHP_STRING: ! return container.compare(var.getstring()); break; } --- 282,286 ---- break; case PHP_STRING: ! return container.compare(var.getstring()) == 0; break; } |