cvs: php4 /ext/standard basic_functions.c php_var.h var.c

andrey Sat Jan 18 10:03:02 2003 EDT Modified files: /php4/ext/standard basic_functions.c php_var.h var.c Log: Renamed get_memory_usage() to memory_get_usage() (per Andi's advice) This doesn't break any BC. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.562 php4/ext/standard/basic_functions.c:1.563 --- php4/ext/standard/basic_functions.c:1.562 Wed Jan 15 13:54:02 2003 +++ php4/ext/standard/basic_functions.c Sat Jan 18 10:03:00 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.562 2003/01/15 18:54:02 wez Exp $ */ +/* $Id: basic_functions.c,v 1.563 2003/01/18 15:03:00 andrey Exp $ */ #include "php.h" #include "php_streams.h" @@ -548,7 +548,7 @@ PHP_FE(debug_zval_dump, NULL) PHP_FE(print_r, NULL) #if MEMORY_LIMIT - PHP_FE(get_memory_usage, NULL) + PHP_FE(memory_get_usage, NULL) #endif PHP_FE(register_shutdown_function, NULL) Index: php4/ext/standard/php_var.h diff -u php4/ext/standard/php_var.h:1.23 php4/ext/standard/php_var.h:1.24 --- php4/ext/standard/php_var.h:1.23 Tue Jan 14 13:26:47 2003 +++ php4/ext/standard/php_var.h Sat Jan 18 10:03:00 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_var.h,v 1.23 2003/01/14 18:26:47 andrey Exp $ */ +/* $Id: php_var.h,v 1.24 2003/01/18 15:03:00 andrey Exp $ */ #ifndef PHP_VAR_H #define PHP_VAR_H @@ -29,7 +29,7 @@ PHP_FUNCTION(serialize); PHP_FUNCTION(unserialize); #if MEMORY_LIMIT -PHP_FUNCTION(get_memory_usage); +PHP_FUNCTION(memory_get_usage); #endif void php_var_dump(zval **struc, int level TSRMLS_DC); Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.154 php4/ext/standard/var.c:1.155 --- php4/ext/standard/var.c:1.154 Tue Jan 14 13:26:47 2003 +++ php4/ext/standard/var.c Sat Jan 18 10:03:01 2003 @@ -678,9 +678,9 @@ /* }}} */ #if MEMORY_LIMIT -/* {{{ proto int get_memory_usage() +/* {{{ proto int memory_get_usage() Returns the allocated by PHP memory */ -PHP_FUNCTION(get_memory_usage) { +PHP_FUNCTION(memory_get_usage) { RETURN_LONG(AG(allocated_memory)); } /* }}} */