From: Hannes Magnusson <bjori@php.net>
Date: Thu, 5 Oct 2006 16:08:12 +0000 (+0000)
Subject: MFB:
X-Git-Tag: RELEASE_1_0_0RC1~1406
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34fb6fc12e763d2dd6e27b794da03026cb51aacf;p=php

MFB:
- nuke unused variable
- "prefer" two arguments
- only print "wrong parameter count" once
---

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index a057cb999f..ca6c253e86 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -3540,18 +3540,18 @@ PHP_FUNCTION(pg_escape_string)
 {
 	char *from = NULL, *to = NULL;
 	zval *pgsql_link;
+#ifdef HAVE_PQESCAPE_CONN
 	PGconn *pgsql;
+#endif
 	int to_len;
 	int from_len;
-	int id;
+	int id = -1;
 
-	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "rs", &pgsql_link, &from, &from_len) == SUCCESS) {
-		id = -1;
-	} else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &from, &from_len) == SUCCESS) {
+	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s", &from, &from_len) == SUCCESS) {
 		pgsql_link = NULL;
 		id = PGG(default_link);
-	} else {
-		WRONG_PARAM_COUNT;
+	} else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &pgsql_link, &from, &from_len) == FAILURE) {
+		return;
 	}
 
 	to = (char *) safe_emalloc(from_len, 2, 1);