[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c

[Ilia Alshanetsky]

iliaa           Tue Aug 21 23:51:34 2007 UTC

  Modified files:              
    /php-src/ext/pgsql  pgsql.c 
  Log:
  Fixed bug #42368 (Incorrect error message displayed by pg_escape_string)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.368&r2=1.369&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.368 php-src/ext/pgsql/pgsql.c:1.369
--- php-src/ext/pgsql/pgsql.c:1.368     Sun Jul 15 19:50:06 2007
+++ php-src/ext/pgsql/pgsql.c   Tue Aug 21 23:51:34 2007
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: pgsql.c,v 1.368 2007/07/15 19:50:06 jani Exp $ */
+/* $Id: pgsql.c,v 1.369 2007/08/21 23:51:34 iliaa Exp $ */
 
 #include <stdlib.h>
 
@@ -3545,11 +3545,20 @@
        int from_len;
        int id = -1;
 
-       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 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&pgsql_link, &from, &from_len) == FAILURE) {
-               return;
+       switch (ZEND_NUM_ARGS()) {
+               case 1:
+                       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
"s", &from, &from_len) == FAILURE) {
+                               return;
+                       }
+                       pgsql_link = NULL;
+                       id = PGG(default_link);
+                       break;
+
+               default:
+                       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
"rs", &pgsql_link, &from, &from_len) == FAILURE) {
+                               return;
+                       }
+                       break;
        }
 
        to = (char *) safe_emalloc(from_len, 2, 1);
@@ -3578,11 +3587,20 @@
 #endif
        zval *pgsql_link;
 
-       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 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&pgsql_link, &from, &from_len) == FAILURE) {
-               return;
+       switch (ZEND_NUM_ARGS()) {
+               case 1:
+                       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
"s", &from, &from_len) == FAILURE) {
+                               return;
+                       }
+                       pgsql_link = NULL;
+                       id = PGG(default_link);
+                       break;
+
+               default:
+                       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
"rs", &pgsql_link, &from, &from_len) == FAILURE) {
+                               return;
+                       }
+                       break;
        }
 
 #ifdef HAVE_PQESCAPE_BYTEA_CONN

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php