cvs: php4 /ext/pgsql pgsql.c
| From: | Jouni Ahto | Date: | Mon, 11 Sep 2000 18:34:06 +0000 |
| Subject: | cvs: php4 /ext/pgsql pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1711@lists.php.net to get a copy of this message | ||
jah Mon Sep 11 11:34:06 2000 EDT
Modified files:
/php4/ext/pgsql pgsql.c
Log:
- Use the same check for existence of a valid link as the other functions.
- Return TRUE if everything went OK.
- Fixed the number of arguments to pg_endcopy.
- Removed unused variables.
- Indentation, changed spaces to tabs.
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.69 php4/ext/pgsql/pgsql.c:1.70
--- php4/ext/pgsql/pgsql.c:1.69 Mon Sep 11 08:34:14 2000
+++ php4/ext/pgsql/pgsql.c Mon Sep 11 11:34:06 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.69 2000/09/11 15:34:14 derick Exp $ */
+/* $Id: pgsql.c,v 1.70 2000/09/11 18:34:06 jah Exp $ */
#include <stdlib.h>
@@ -651,42 +651,36 @@
Sync with backend. Completes the Copy command */
PHP_FUNCTION(pg_endcopy)
{
- zval **query, **pgsql_link;
- int id = -1;
- PGconn *pgsql;
- int result = 0;
- ExecStatusType status;
- pgsql_result_handle *pg_result;
- PGLS_FETCH();
-
- switch(ZEND_NUM_ARGS()) {
- case 1:
- if (zend_get_parameters_ex(1, &query)==FAILURE) {
- RETURN_FALSE;
- }
- id = PGG(default_link);
- break;
- case 2:
- if (zend_get_parameters_ex(2, &pgsql_link, &query)==FAILURE) {
- RETURN_FALSE;
- }
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
- }
+ zval **pgsql_link = NULL;
+ int id = -1;
+ PGconn *pgsql;
+ int result = 0;
+ PGLS_FETCH();
- ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL link", le_link,
le_plink);
+ switch(ZEND_NUM_ARGS()) {
+ case 0:
+ id = PGG(default_link);
+ CHECK_DEFAULT_LINK(id);
+ break;
+ case 1:
+ if (zend_get_parameters_ex(1, &pgsql_link)==FAILURE) {
+ RETURN_FALSE;
+ }
+ break;
+ default:
+ WRONG_PARAM_COUNT;
+ break;
+ }
- convert_to_string_ex(query);
- result = PQendcopy(pgsql);
+ ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL link", le_link,
le_plink);
+
+ result = PQendcopy(pgsql);
-/* if (result!=0)
- {
- php_error(E_WARNING, "PostgreSQL query failed: %s", PQerrorMessage(pgsql));
- RETURN_FALSE;
- } */
- RETURN_FALSE;
+ if (result!=0) {
+ php_error(E_WARNING, "PostgreSQL query failed: %s", PQerrorMessage(pgsql));
+ RETURN_FALSE;
+ }
+ RETURN_TRUE;
}
/* }}} */
@@ -694,42 +688,40 @@
Send null-terminated string to backend server*/
PHP_FUNCTION(pg_putline)
{
- zval **query, **pgsql_link;
- int id = -1;
- PGconn *pgsql;
- int result = 0;
- ExecStatusType status;
- pgsql_result_handle *pg_result;
- PGLS_FETCH();
-
- switch(ZEND_NUM_ARGS()) {
- case 1:
- if (zend_get_parameters_ex(1, &query)==FAILURE) {
- RETURN_FALSE;
- }
- id = PGG(default_link);
- break;
- case 2:
- if (zend_get_parameters_ex(2, &pgsql_link, &query)==FAILURE) {
- RETURN_FALSE;
- }
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
- }
+ zval **query, **pgsql_link = NULL;
+ int id = -1;
+ PGconn *pgsql;
+ int result = 0;
+ PGLS_FETCH();
- ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL link", le_link,
le_plink);
+ switch(ZEND_NUM_ARGS()) {
+ case 1:
+ if (zend_get_parameters_ex(1, &query)==FAILURE) {
+ RETURN_FALSE;
+ }
+ id = PGG(default_link);
+ CHECK_DEFAULT_LINK(id);
+ break;
+ case 2:
+ if (zend_get_parameters_ex(2, &pgsql_link, &query)==FAILURE) {
+ RETURN_FALSE;
+ }
+ break;
+ default:
+ WRONG_PARAM_COUNT;
+ break;
+ }
- convert_to_string_ex(query);
- result = PQputline(pgsql, Z_STRVAL_PP(query));
+ ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL link", le_link,
le_plink);
- if (result==EOF)
- {
- php_error(E_WARNING, "PostgreSQL query failed: %s", PQerrorMessage(pgsql));
- RETURN_FALSE;
- }
- RETURN_FALSE;
+ convert_to_string_ex(query);
+ result = PQputline(pgsql, Z_STRVAL_PP(query));
+
+ if (result==EOF) {
+ php_error(E_WARNING, "PostgreSQL query failed: %s", PQerrorMessage(pgsql));
+ RETURN_FALSE;
+ }
+ RETURN_TRUE;
}
/* }}} */
#define PHP_PG_NUM_ROWS 1