svn: /php/php-src/trunk/ext/standard/ basic_functions.c

patrickallaert Mon, 20 Jun 2011 07:11:21 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=312325 Log: Changed register_shutdown_function() to reflect that it is using a cb (thx arpad) Changed paths: U php/php-src/trunk/ext/standard/basic_functions.c Modified: php/php-src/trunk/ext/standard/basic_functions.c =================================================================== --- php/php-src/trunk/ext/standard/basic_functions.c 2011-06-20 06:50:58 UTC (rev 312324) +++ php/php-src/trunk/ext/standard/basic_functions.c 2011-06-20 07:11:21 UTC (rev 312325) @@ -5062,12 +5062,12 @@ } /* }}} */ -/* {{{ proto void register_shutdown_function(string function_name) U +/* {{{ proto void register_shutdown_function(callback function) U Register a user-level function to be called on request termination */ PHP_FUNCTION(register_shutdown_function) { php_shutdown_function_entry shutdown_function_entry; - char *function_name = NULL; + char *callback_name = NULL; int i; shutdown_function_entry.arg_count = ZEND_NUM_ARGS(); @@ -5084,8 +5084,8 @@ } /* Prevent entering of anything but valid callback (syntax check only!) */ - if (!zend_is_callable(shutdown_function_entry.arguments[0], 0, &function_name TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid shutdown callback '%s' passed", function_name); + if (!zend_is_callable(shutdown_function_entry.arguments[0], 0, &callback_name TSRMLS_CC)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid shutdown callback '%s' passed", callback_name); efree(shutdown_function_entry.arguments); RETVAL_FALSE; } else { @@ -5099,8 +5099,8 @@ } zend_hash_next_index_insert(BG(user_shutdown_function_names), &shutdown_function_entry, sizeof(php_shutdown_function_entry), NULL); } - if (function_name) { - efree(function_name); + if (callback_name) { + efree(callback_name); } } /* }}} */