From: Andi Gutmans <andi@php.net>
Date: Wed, 13 Sep 2000 04:13:36 +0000 (+0000)
Subject: - The Sprit of PHP is to have descriptive function names and not
X-Git-Tag: php-4.0.3RC1~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=526d45e95ff72543888ef1a8a8d2ae84e40718ae;p=php

- 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 f429b1c026..6748f23ef9 100644
--- 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 53cb1127b6..e4023f9a6c 100644
--- 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);