com php-src: fix datatype mismatch warnings: ext/standard/dir.c
| From: | Anatol Belski | Date: | Wed, 22 Oct 2014 18:46:30 +0000 |
| Subject: | com php-src: fix datatype mismatch warnings: ext/standard/dir.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82449@lists.php.net to get a copy of this message | ||
Commit: 1a727e519b246bc3dc612d87ab96888bf487b0bc
Author: Anatol Belski <ab@php.net> Wed, 22 Oct 2014 19:46:51 +0200
Parents: b80853d942d5e919c70554d0553516d6a94018f3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a727e519b246bc3dc612d87ab96888bf487b0bc
Log:
fix datatype mismatch warnings
Changed paths:
M ext/standard/dir.c
Diff:
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 7b4ab1c..a822ac4 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -87,7 +87,7 @@ static zend_class_entry *dir_class_entry_ptr;
} \
ZEND_FETCH_RESOURCE(dirp, php_stream *, tmp, -1, "Directory", php_file_le_stream()); \
} else { \
- ZEND_FETCH_RESOURCE(dirp, php_stream *, 0, DIRG(default_dir)->handle, "Directory",
php_file_le_stream()); \
+ ZEND_FETCH_RESOURCE(dirp, php_stream *, 0, (int)DIRG(default_dir)->handle,
"Directory", php_file_le_stream()); \
} \
} else { \
dirp = (php_stream *) zend_fetch_resource(id TSRMLS_CC, -1, "Directory", NULL, 1,
php_file_le_stream()); \
@@ -463,7 +463,7 @@ PHP_FUNCTION(glob)
cwd[2] = '\0';
}
#endif
- cwd_skip = strlen(cwd)+1;
+ cwd_skip = (int)strlen(cwd)+1;
snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, pattern);
pattern = work_pattern;