Renamed get_memory_usage() to memory_get_usage() (per Andi's advice)

This doesn't break any BC.

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 949f906fed63ba5f9a600de374ad7a8954efb5db..ed882249f8c6b1cf3676c54bf8b244d73fb28f43 100644 (file)
--- 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 f399a236bfe268da46827924fb94cf230d58c850..3ae0bb200f4cb11692849ac0edd7b6602df762b8 100644 (file)
--- 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 e68a5a54005f0e94b6ec8e17d50984cf273ff905..12f9a0e3f203a0c42d29a2a4c1e6cea7c3455f23 100644 (file)
--- 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));
 }
 /* }}} */