By popular demand renaming uu(encode/decode) to convert_uu(encode/decode).

diff --git a/NEWS b/NEWS
index ddf37c798df19e2849d49a75ad07ec012109e95d..27bb936b2cd099b0e144337567742fbc6fd73503 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -32,8 +32,8 @@ PHP                                                                        NEWS
   . array_udiff_assoc(). (Andrey)
   . array_udiff_uassoc(). (Andrey)
   . array_diff_uassoc(). (Andrey)
-  . uuencode(). (Ilia)
-  . uudecode(). (Ilia)
+  . convert_uuencode(). (Ilia)
+  . convert_uudecode(). (Ilia)
 - Added "resume_pos" context option to "ftp://" wrapper. (Sara)
 - Added optional parameter to OCIWriteTemporaryLob() to specify the type of LOB
   (Patch by Novicky Marek <novicky@aarongroup.cz>). (Thies)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 5fb9a539f435882ac593088552884fc79edb33ae..14c51179a9e728795359e14428f117a79074cc0f 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -490,8 +490,8 @@ function_entry basic_functions[] = {
        PHP_FE(base64_decode,                                                                                                   NULL)
        PHP_FE(base64_encode,                                                                                                   NULL)
 
-       PHP_FE(uuencode,                                                                                                                NULL)
-       PHP_FE(uudecode,                                                                                                                NULL)
+       PHP_FE(convert_uuencode,                                                                                                                NULL)
+       PHP_FE(convert_uudecode,                                                                                                                NULL)
 
        PHP_FE(abs,                                                                                                                             NULL)
        PHP_FE(ceil,                                                                                                                    NULL)

diff --git a/ext/standard/php_uuencode.h b/ext/standard/php_uuencode.h
index 37ca9d5f0507a258c25c534205b5672d2776a2a3..76caa31f0da959d5cc94c8ec6a391d795018ed89 100644 (file)
--- a/ext/standard/php_uuencode.h
+++ b/ext/standard/php_uuencode.h
@@ -21,8 +21,8 @@
 #ifndef PHP_UUENCODE_H
 #define PHP_UUENCODE_H
 
-PHP_FUNCTION(uudecode);
-PHP_FUNCTION(uuencode);
+PHP_FUNCTION(convert_uudecode);
+PHP_FUNCTION(convert_uuencode);
 
 PHPAPI int php_uudecode(char *src, int src_len, char **dest);
 PHPAPI int php_uuencode(char *src, int src_len, char **dest);

diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c
index fa6d981928e4bfca6584ad2c95fde9722d83f367..38e78471b8406a5c260b9a2e97362fd6dbb61c7b 100644 (file)
--- a/ext/standard/uuencode.c
+++ b/ext/standard/uuencode.c
@@ -172,7 +172,7 @@ PHPAPI int php_uudecode(char *src, int src_len, char **dest)
 
 /* {{{ proto string uuencode(string data) 
    uuencode a string */
-PHP_FUNCTION(uuencode)
+PHP_FUNCTION(convert_uuencode)
 {
        char *src, *dst;
        int src_len, dst_len;
@@ -189,7 +189,7 @@ PHP_FUNCTION(uuencode)
 
 /* {{{ proto string uudecode(string data)
    decode a uuencoded string */
-PHP_FUNCTION(uudecode)
+PHP_FUNCTION(convert_uudecode)
 {
        char *src, *dst;
        int src_len, dst_len;