com php-src: fix zpp: ext/standard/dir.c ext/standard/syslog.c
| From: | Anatol Belski | Date: | Thu, 21 Aug 2014 13:32:17 +0000 |
| Subject: | com php-src: fix zpp: ext/standard/dir.c ext/standard/syslog.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80705@lists.php.net to get a copy of this message | ||
Commit: daa0f094cf370900ab2c27242398a0a6a6c718c1
Author: Anatol Belski <ab@php.net> Thu, 21 Aug 2014 15:32:17 +0200
Parents: f7c8213741cb3e19b8f8e7889c760491843fc13f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=daa0f094cf370900ab2c27242398a0a6a6c718c1
Log:
fix zpp
Changed paths:
M ext/standard/dir.c
M ext/standard/syslog.c
Diff:
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 3e65f72..bf79a39 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -430,13 +430,13 @@ PHP_FUNCTION(glob)
#endif
char *pattern = NULL;
int pattern_len;
- long flags = 0;
+ php_int_t flags = 0;
glob_t globbuf;
int n;
int ret;
zend_bool basedir_limit = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|l", &pattern,
&pattern_len, &flags) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|i", &pattern,
&pattern_len, &flags) == FAILURE) {
return;
}
@@ -553,13 +553,13 @@ PHP_FUNCTION(scandir)
{
char *dirn;
int dirn_len;
- long flags = 0;
+ php_int_t flags = 0;
zend_string **namelist;
int n, i;
zval *zcontext = NULL;
php_stream_context *context = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|lr", &dirn, &dirn_len,
&flags, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|ir", &dirn, &dirn_len,
&flags, &zcontext) == FAILURE) {
return;
}
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index 05c4439..65dda06 100644
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -135,10 +135,10 @@ PHP_MSHUTDOWN_FUNCTION(syslog)
PHP_FUNCTION(openlog)
{
char *ident;
- long option, facility;
+ php_int_t option, facility;
int ident_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll", &ident,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sii", &ident,
&ident_len, &option, &facility) == FAILURE) {
return;
}
@@ -175,11 +175,11 @@ PHP_FUNCTION(closelog)
Generate a system log message */
PHP_FUNCTION(syslog)
{
- long priority;
+ php_int_t priority;
char *message;
int message_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls", &priority,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "is", &priority,
&message, &message_len) == FAILURE) {
return;
}