- The Sprit of PHP is to have descriptive function names and not

  necessarily short ones. Maybe we should have some FAQ for this?

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index f429b1c026b8195eda126e494c89c792c99d2cc2..6748f23ef9b78348d913204230282c86e4895d91 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -78,11 +78,11 @@ function_entry pgsql_functions[] = {
        PHP_FE(pg_put_line,             NULL)
        PHP_FE(pg_end_copy,             NULL)
 #if HAVE_PQCLIENTENCODING
-       PHP_FE(pg_client_enc,           NULL)
-       PHP_FE(pg_set_client_enc,       NULL)
+       PHP_FE(pg_client_encoding,              NULL)
+       PHP_FE(pg_set_client_encoding,  NULL)
        /* for downwards compatibility */
-       PHP_FALIAS(pg_clientencoding,           pg_client_enc,          NULL)
-       PHP_FALIAS(pg_setclientencoding,        pg_set_client_enc,      NULL)
+       PHP_FALIAS(pg_clientencoding,           pg_client_encoding,                     NULL)
+       PHP_FALIAS(pg_setclientencoding,        pg_set_client_encoding, NULL)
 #endif
        {NULL, NULL, NULL}
 };
@@ -1709,9 +1709,9 @@ PHP_FUNCTION(pg_loexport)
 
 #if HAVE_PQCLIENTENCODING
 
-/* {{{ proto int pg_set_client_enc([int connection,] string encoding)
+/* {{{ proto int pg_set_client_encoding([int connection,] string encoding)
    Set client encoding */
-PHP_FUNCTION(pg_set_client_enc)
+PHP_FUNCTION(pg_set_client_encoding)
 {
        zval **encoding, **pgsql_link = NULL;
        int id = -1;
@@ -1745,9 +1745,9 @@ PHP_FUNCTION(pg_set_client_enc)
 }
 /* }}} */
 
-/* {{{ proto string pg_client_enc([int connection])
+/* {{{ proto string pg_client_encoding([int connection])
    Get the current client encoding */
-PHP_FUNCTION(pg_client_enc)
+PHP_FUNCTION(pg_client_encoding)
 {
        zval **pgsql_link = NULL;
        int id = -1;

diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index 53cb1127b6c09c0a72021531d753cc3f1687405a..e4023f9a6c855af1855354741cdd93f6bebc6b50 100644 (file)
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -88,8 +88,8 @@ PHP_FUNCTION(pg_loexport);
 PHP_FUNCTION(pg_put_line);
 PHP_FUNCTION(pg_end_copy);
 #if HAVE_PQCLIENTENCODING
-PHP_FUNCTION(pg_client_enc);
-PHP_FUNCTION(pg_set_client_enc);
+PHP_FUNCTION(pg_client_encoding);
+PHP_FUNCTION(pg_set_client_encoding);
 #endif
 
 void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent);