diff -ru modif1/fam/fam.c orig/fam/fam.c --- modif1/fam/fam.c 2008-04-14 04:16:37.000000000 +0200 +++ orig/fam/fam.c 2005-02-08 06:38:04.000000000 +0100 @@ -51,7 +51,6 @@ PHP_FE(fam_cancel_monitor, NULL) PHP_FE(fam_pending, NULL) PHP_FE(fam_next_event, NULL) - PHP_FE(fam_next_event_timeout, NULL) {NULL, NULL, NULL} /* Must be the last line in fam_functions[] */ }; /* }}} */ @@ -393,52 +392,6 @@ } /* }}} */ -/* {{{ proto array fam_next_event_timeout(resource id, int timeout_seconds, int timeout_microseconds) - Get next pending FAM event or quit after the timeout */ -PHP_FUNCTION(fam_next_event_timeout) -{ - int argc = ZEND_NUM_ARGS(); - zval *id; - FAMConnection *fc; - FAMEvent fe; - struct timeval tv; - fd_set rfds; - int fd; - int retval; - - if (zend_parse_parameters(argc TSRMLS_CC, "rll", &id, &tv.tv_sec, &tv.tv_usec) == FAILURE) - return; - - ZEND_FETCH_RESOURCE(fc, FAMConnection *, &id, -1, "fam", le_fam); - ZEND_VERIFY_RESOURCE(fc); - - /* if event queue is empty, waiting for a new fam event */ - if (FAMPending(fc) == 0) { - fd = FAMCONNECTION_GETFD(fc); - FD_ZERO(&rfds); - FD_SET(fd, &rfds); - retval = select(fd + 1, &rfds, NULL, NULL, &tv); - if (retval == -1) - RETURN_FALSE; - - if (retval == 0) { - array_init(return_value); - add_assoc_long( return_value, "timeout", 1); - return; - } - } - - fe.hostname = NULL; - if (FAMNextEvent(fc, &fe) < 0) - RETURN_FALSE; - - array_init(return_value); - if (fe.hostname) - add_assoc_string(return_value, "hostname", fe.hostname, 1); - add_assoc_string(return_value, "filename", fe.filename, 1); - add_assoc_long(return_value, "code", fe.code); -} -/* }}} */ /* * Local variables: diff -ru modif1/fam/php_fam.h orig/fam/php_fam.h --- modif1/fam/php_fam.h 2008-04-14 04:16:20.000000000 +0200 +++ orig/fam/php_fam.h 2005-02-08 06:38:04.000000000 +0100 @@ -47,7 +47,6 @@ PHP_FUNCTION(fam_cancel_monitor); PHP_FUNCTION(fam_pending); PHP_FUNCTION(fam_next_event); -PHP_FUNCTION(fam_next_event_timeout); /* Declare any global variables you may need between the BEGIN