cvs: php4 /ext/pgsql pgsql.c php_pgsql.h

andi Tue Sep 12 21:13:36 2000 EDT Modified files: /php4/ext/pgsql pgsql.c php_pgsql.h Log: - The Sprit of PHP is to have descriptive function names and not necessarily short ones. Maybe we should have some FAQ for this? Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.72 php4/ext/pgsql/pgsql.c:1.73 --- php4/ext/pgsql/pgsql.c:1.72 Tue Sep 12 16:19:58 2000 +++ php4/ext/pgsql/pgsql.c Tue Sep 12 21:13:36 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.72 2000/09/12 23:19:58 hirokawa Exp $ */ +/* $Id: pgsql.c,v 1.73 2000/09/13 04:13:36 andi Exp $ */ #include <stdlib.h> @@ -78,11 +78,11 @@ 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 @@ #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 @@ } /* }}} */ -/* {{{ 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; Index: php4/ext/pgsql/php_pgsql.h diff -u php4/ext/pgsql/php_pgsql.h:1.21 php4/ext/pgsql/php_pgsql.h:1.22 --- php4/ext/pgsql/php_pgsql.h:1.21 Tue Sep 12 16:19:58 2000 +++ php4/ext/pgsql/php_pgsql.h Tue Sep 12 21:13:36 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pgsql.h,v 1.21 2000/09/12 23:19:58 hirokawa Exp $ */ +/* $Id: php_pgsql.h,v 1.22 2000/09/13 04:13:36 andi Exp $ */ #ifndef PHP_PGSQL_H #define PHP_PGSQL_H @@ -88,8 +88,8 @@ 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);