diff options
| author | Andrey Hristov <andrey@php.net> | 2003-01-18 15:03:01 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2003-01-18 15:03:01 +0000 |
| commit | 309ef518fc9e04f672243fae06a0f445616cb5b6 (patch) | |
| tree | d1ff2832f37f07da3f8018ccbab7cd66571c83be | |
| parent | 7002a39f97cfe2ca4d104852762de0aec98b88b2 (diff) | |
| download | php-git-309ef518fc9e04f672243fae06a0f445616cb5b6.tar.gz | |
Renamed get_memory_usage() to memory_get_usage() (per Andi's advice)
This doesn't break any BC.
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/php_var.h | 2 | ||||
| -rw-r--r-- | ext/standard/var.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 949f906fed..ed882249f8 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -548,7 +548,7 @@ function_entry basic_functions[] = { 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) diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h index f399a236bf..3ae0bb200f 100644 --- a/ext/standard/php_var.h +++ b/ext/standard/php_var.h @@ -29,7 +29,7 @@ PHP_FUNCTION(debug_zval_dump); 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); diff --git a/ext/standard/var.c b/ext/standard/var.c index e68a5a5400..12f9a0e3f2 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -678,9 +678,9 @@ PHP_FUNCTION(unserialize) /* }}} */ #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)); } /* }}} */ |
