[PHP-CVS] cvs: php4 /ext/ncurses ncurses_functions.c

[Wez Furlong]

wez             Sat Sep 28 13:03:02 2002 EDT

  Modified files:              
    /php4/ext/ncurses   ncurses_functions.c 
  Log:
  Fix crash bug and return value.
  
  
Index: php4/ext/ncurses/ncurses_functions.c
diff -u php4/ext/ncurses/ncurses_functions.c:1.21 
php4/ext/ncurses/ncurses_functions.c:1.22
--- php4/ext/ncurses/ncurses_functions.c:1.21   Fri Sep 27 18:33:14 2002
+++ php4/ext/ncurses/ncurses_functions.c        Sat Sep 28 13:03:02 2002
@@ -1642,7 +1642,7 @@
 }
 /* }}} */
 
-/* {{{ proto int ncurses_mousemask(int newmask, int oldmask)
+/* {{{ proto int ncurses_mousemask(int newmask, int &oldmask)
    Returns and sets mouse options */
 PHP_FUNCTION(ncurses_mousemask)
 {
@@ -1669,13 +1669,13 @@
    Reads mouse event from queue */
 PHP_FUNCTION(ncurses_getmouse)
 {
-  zval **arg;
+       zval **arg;
        MEVENT mevent;
        ulong retval;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE){
                WRONG_PARAM_COUNT;
-  }
+       }
 
        pval_destructor(*arg);
        array_init(*arg);
@@ -1688,7 +1688,7 @@
        add_assoc_long(*arg, "z", mevent.z);
        add_assoc_long(*arg, "mmask", mevent.bstate);
 
-       RETURN_BOOL(retval);
+       RETURN_BOOL(retval == 0);
 }
 /* }}} */
 
@@ -1775,9 +1775,9 @@
        int nx, ny, retval;
        WINDOW **win;
 
-       if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &y, &x, &toscreen) == 
FAILURE){
+       if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &handle, &y, &x, 
+&toscreen) == FAILURE){
                WRONG_PARAM_COUNT;
-  }
+       }
 
        FETCH_WINRES(win, handle);
 
@@ -1788,10 +1788,10 @@
        ny = Z_LVAL_PP(y);
        nx = Z_LVAL_PP(x);
 
- retval = wmouse_trafo (*win, &ny, &nx, Z_LVAL_PP(toscreen));
+       retval = wmouse_trafo (*win, &ny, &nx, Z_LVAL_PP(toscreen));
 
- Z_LVAL_PP(y) = ny;
- Z_LVAL_PP(x) = nx;
+       Z_LVAL_PP(y) = ny;
+       Z_LVAL_PP(x) = nx;
 
        RETURN_BOOL(retval);
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php