com php-src: Fix zpp in pg_last_notice: ext/pgsql/pgsql .c
| From: | Nikita Popov | Date: | Sun, 14 Feb 2016 13:48:26 +0000 |
| Subject: | com php-src: Fix zpp in pg_last_notice: ext/pgsql/pgsql .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91011@lists.php.net to get a copy of this message | ||
Commit: 420c7979d5743a4621b334f569c7ae8686f4f85f
Author: Nikita Popov <nikic@php.net> Sun, 14 Feb 2016 14:48:26 +0100
Parents: 2d605e5f2448e0bc7141ca5d5cb27cb4d9f99aa9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=420c7979d5743a4621b334f569c7ae8686f4f85f
Log:
Fix zpp in pg_last_notice
Changed paths:
M ext/pgsql/pgsql.c
Diff:
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index d7ef097..a502066 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -2319,7 +2319,7 @@ PHP_FUNCTION(pg_last_notice)
zval *pgsql_link = NULL;
zval *notice, *notices;
PGconn *pg_link;
- long option = PGSQL_NOTICE_LAST;
+ zend_long option = PGSQL_NOTICE_LAST;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &pgsql_link, &option) ==
FAILURE) {
return;
@@ -2358,7 +2358,8 @@ PHP_FUNCTION(pg_last_notice)
RETURN_TRUE;
break;
default:
- php_error_docref(NULL, E_WARNING, "Invalid option specified (%d)", option);
+ php_error_docref(NULL, E_WARNING,
+ "Invalid option specified (" ZEND_LONG_FMT ")", option);
}
RETURN_FALSE;
}