com php-src: C89 compat: main/streams/plain_wrapper.c
| From: | Anatol Belski | Date: | Mon, 01 Dec 2014 07:24:44 +0000 |
| Subject: | com php-src: C89 compat: main/streams/plain_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83454@lists.php.net to get a copy of this message | ||
Commit: f4a0e601ee69b5821129b3ae94014ccda354b6d3
Author: Anatol Belski <ab@php.net> Mon, 1 Dec 2014 08:24:44 +0100
Parents: 85e2e6c1fdcdf314c17d20321a0fec0bca1b0215
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f4a0e601ee69b5821129b3ae94014ccda354b6d3
Log:
C89 compat
Changed paths:
M main/streams/plain_wrapper.c
Diff:
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index aae2f6d..a75c2d0 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -1257,15 +1257,12 @@ static int php_plain_files_rmdir(php_stream_wrapper *wrapper, char *url, int
opt
url += sizeof("file://") - 1;
}
-#if PHP_WIN32
- int url_len = strlen(url);
-#endif
if (php_check_open_basedir(url TSRMLS_CC)) {
return 0;
}
#if PHP_WIN32
- if (!php_win32_check_trailing_space(url, url_len)) {
+ if (!php_win32_check_trailing_space(url, (int)strlen(url))) {
php_error_docref1(NULL TSRMLS_CC, url, E_WARNING, "%s", strerror(ENOENT));
return 0;
}