cvs: php4 /ext/pgsql config.m4 pgsql.c

sas Tue Jul 11 05:38:06 2000 EDT Modified files: /php4/ext/pgsql config.m4 pgsql.c Log: The official product name is PostgreSQL, so s/PostgresSQL/PostgreSQL/ Index: php4/ext/pgsql/config.m4 diff -u php4/ext/pgsql/config.m4:1.14 php4/ext/pgsql/config.m4:1.15 --- php4/ext/pgsql/config.m4:1.14 Wed Jul 5 14:28:16 2000 +++ php4/ext/pgsql/config.m4 Tue Jul 11 05:38:06 2000 @@ -1,9 +1,9 @@ -dnl $Id: config.m4,v 1.14 2000/07/05 21:28:16 jah Exp $ +dnl $Id: config.m4,v 1.15 2000/07/11 12:38:06 sas Exp $ AC_DEFUN(PGSQL_INC_CHK,[if test -r $i$1/libpq-fe.h; then PGSQL_DIR=$i; PGSQL_INCDIR=$i$1]) -PHP_ARG_WITH(pgsql,for PostgresSQL support, -[ --with-pgsql[=DIR] Include PostgresSQL support. DIR is the PostgresSQL +PHP_ARG_WITH(pgsql,for PostgreSQL support, +[ --with-pgsql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL base install directory, defaults to /usr/local/pgsql. Set DIR to "shared" to build as a dl, or "shared,DIR" to build as a dl and still specify DIR.]) Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.63 php4/ext/pgsql/pgsql.c:1.64 --- php4/ext/pgsql/pgsql.c:1.63 Wed Jul 5 15:17:30 2000 +++ php4/ext/pgsql/pgsql.c Tue Jul 11 05:38:06 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.63 2000/07/05 22:17:30 jah Exp $ */ +/* $Id: pgsql.c,v 1.64 2000/07/11 12:38:06 sas Exp $ */ #include <stdlib.h> @@ -298,12 +298,12 @@ list_entry new_le; if (PGG(max_links)!=-1 && PGG(num_links)>=PGG(max_links)) { - php_error(E_WARNING,"PostgresSQL: Too many open links (%d)",PGG(num_links)); + php_error(E_WARNING,"PostgreSQL: Too many open links (%d)",PGG(num_links)); efree(hashed_details); RETURN_FALSE; } if (PGG(max_persistent)!=-1 && PGG(num_persistent)>=PGG(max_persistent)) { - php_error(E_WARNING,"PostgresSQL: Too many open persistent links (%d)",PGG(num_persistent)); + php_error(E_WARNING,"PostgreSQL: Too many open persistent links (%d)",PGG(num_persistent)); efree(hashed_details); RETURN_FALSE; } @@ -315,7 +315,7 @@ pgsql=PQsetdb(host,port,options,tty,dbname); } if (pgsql==NULL || PQstatus(pgsql)==CONNECTION_BAD) { - php_error(E_WARNING,"Unable to connect to PostgresSQL server: %s",PQerrorMessage(pgsql)); + php_error(E_WARNING,"Unable to connect to PostgreSQL server: %s",PQerrorMessage(pgsql)); efree(hashed_details); RETURN_FALSE; } @@ -341,7 +341,7 @@ le->ptr=PQsetdb(host,port,options,tty,dbname); } if (le->ptr==NULL || PQstatus(le->ptr)==CONNECTION_BAD) { - php_error(E_WARNING,"PostgresSQL link lost, unable to reconnect"); + php_error(E_WARNING,"PostgreSQL link lost, unable to reconnect"); zend_hash_del(&EG(persistent_list),hashed_details,hashed_details_length+1); efree(hashed_details); RETURN_FALSE; @@ -378,7 +378,7 @@ } } if (PGG(max_links)!=-1 && PGG(num_links)>=PGG(max_links)) { - php_error(E_WARNING,"PostgresSQL: Too many open links (%d)",PGG(num_links)); + php_error(E_WARNING,"PostgreSQL: Too many open links (%d)",PGG(num_links)); efree(hashed_details); RETURN_FALSE; } @@ -388,7 +388,7 @@ pgsql = PQsetdb(host,port,options,tty,dbname); } if (pgsql==NULL || PQstatus(pgsql)==CONNECTION_BAD) { - php_error(E_WARNING,"Unable to connect to PostgresSQL server: %s",PQerrorMessage(pgsql)); + php_error(E_WARNING,"Unable to connect to PostgreSQL server: %s",PQerrorMessage(pgsql)); efree(hashed_details); RETURN_FALSE; }