com php-src: fix datatype mismatch warns: TSRM/tsrm_win32 .c
| From: | Anatol Belski | Date: | Wed, 29 Oct 2014 14:30:03 +0000 |
| Subject: | com php-src: fix datatype mismatch warns: TSRM/tsrm_win32 .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82862@lists.php.net to get a copy of this message | ||
Commit: 20f8f533e115e6f3c206335328411c5c570d08ee
Author: Anatol Belski <ab@php.net> Tue, 28 Oct 2014 19:32:51 +0100
Parents: 842a98ef3213107c2e3746e54623c271f99114d9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=20f8f533e115e6f3c206335328411c5c570d08ee
Log:
fix datatype mismatch warns
Changed paths:
M TSRM/tsrm_win32.c
Diff:
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index faa186a..9936320 100644
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -279,14 +279,14 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
if (CWDG(realpath_cache_size_limit)) {
t = time(0);
- bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
+ bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t TSRMLS_CC);
if(bucket == NULL && real_path == NULL) {
/* We used the pathname directly. Call tsrm_realpath */
/* so that entry is created in realpath cache */
real_path = (char *)malloc(MAX_PATH);
if(tsrm_realpath(pathname, real_path TSRMLS_CC) != NULL) {
pathname = real_path;
- bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
+ bucket = realpath_cache_lookup(pathname, (int)strlen(pathname), t TSRMLS_CC);
}
}
}
@@ -477,7 +477,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
}
/*The following two checks can be removed once we drop XP support */
- type_len = strlen(type);
+ type_len = (int)strlen(type);
if (type_len <1 || type_len > 2) {
return NULL;
}