[PHP-CVS] cvs: php-src /ext/standard basic_functions.c var.c

[Hannes Magnusson]

bjori           Tue Jul 25 16:40:11 2006 UTC

  Modified files:              
    /php-src/ext/standard       basic_functions.c var.c 
  Log:
  Update protos & arginfo for memory_get_usage() & memory_get_peak_usage()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.795&r2=1.796&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.795 
php-src/ext/standard/basic_functions.c:1.796
--- php-src/ext/standard/basic_functions.c:1.795        Fri Jul 21 23:29:25 2006
+++ php-src/ext/standard/basic_functions.c      Tue Jul 25 16:40:11 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.795 2006/07/21 23:29:25 andrei Exp $ */
+/* $Id: basic_functions.c,v 1.796 2006/07/25 16:40:11 bjori Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -3085,11 +3085,13 @@
 
 #if MEMORY_LIMIT
 static
-ZEND_BEGIN_ARG_INFO(arginfo_memory_get_usage, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_usage, 0, 0, 0)
+       ZEND_ARG_INFO(0, real_usage)
 ZEND_END_ARG_INFO()
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_memory_get_peak_usage, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_peak_usage, 0, 0, 0)
+       ZEND_ARG_INFO(0, real_usage)
 ZEND_END_ARG_INFO()
 #endif
 /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.242&r2=1.243&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.242 php-src/ext/standard/var.c:1.243
--- php-src/ext/standard/var.c:1.242    Tue Jul 25 13:41:08 2006
+++ php-src/ext/standard/var.c  Tue Jul 25 16:40:11 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: var.c,v 1.242 2006/07/25 13:41:08 dmitry Exp $ */
+/* $Id: var.c,v 1.243 2006/07/25 16:40:11 bjori Exp $ */
 
 
 
@@ -1149,7 +1149,7 @@
 /* }}} */
 
 #if MEMORY_LIMIT
-/* {{{ proto int memory_get_usage()
+/* {{{ proto int memory_get_usage([real_usage])
     Returns the allocated by PHP memory */
 PHP_FUNCTION(memory_get_usage) {
        zend_bool real_usage = 0;
@@ -1161,7 +1161,7 @@
        RETURN_LONG(zend_memory_usage(real_usage TSRMLS_CC));
 }
 /* }}} */
-/* {{{ proto int memory_get_peak_usage()
+/* {{{ proto int memory_get_peak_usage([real_usage])
     Returns the peak allocated by PHP memory */
 PHP_FUNCTION(memory_get_peak_usage) {
        zend_bool real_usage = 0;

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