pajoye Fri, 17 Sep 2010 09:27:19 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303455
Log:
- drop tsrmls_fetch in tsrm_win32_access
Changed paths:
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.h
U php/php-src/trunk/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.h
U php/php-src/trunk/UPGRADING.INTERNALS
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-09-17 08:42:12 UTC (rev
303454)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-09-17 09:27:19 UTC (rev
303455)
@@ -1433,7 +1433,7 @@
}
#if defined(TSRM_WIN32)
- ret = tsrm_win32_access(new_state.cwd, mode);
+ ret = tsrm_win32_access(new_state.cwd, mode TSRMLS_CC);
#else
ret = access(new_state.cwd, mode);
#endif
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.h
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.h 2010-09-17 08:42:12 UTC (rev
303454)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.h 2010-09-17 09:27:19 UTC (rev
303455)
@@ -310,7 +310,7 @@
#define VCWD_OPENDIR(pathname) opendir(pathname)
#define VCWD_POPEN(command, type) popen(command, type)
#if defined(TSRM_WIN32)
-#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode)
+#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode TSRMLS_CC)
#else
#define VCWD_ACCESS(pathname, mode) access(pathname, mode)
#endif
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_win32.c 2010-09-17 08:42:12 UTC (rev 303454)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2010-09-17 09:27:19 UTC (rev 303455)
@@ -190,7 +190,7 @@
return NULL;
}
-TSRM_API int tsrm_win32_access(const char *pathname, int mode)
+TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
{
time_t t;
HANDLE thread_token;
@@ -208,8 +208,6 @@
realpath_cache_bucket * bucket = NULL;
char * real_path = NULL;
- TSRMLS_FETCH();
-
if (mode == 1 /*X_OK*/) {
DWORD type;
return GetBinaryType(pathname, &type) ? 0 : -1;
Modified: php/php-src/trunk/TSRM/tsrm_win32.h
===================================================================
--- php/php-src/trunk/TSRM/tsrm_win32.h 2010-09-17 08:42:12 UTC (rev 303454)
+++ php/php-src/trunk/TSRM/tsrm_win32.h 2010-09-17 09:27:19 UTC (rev 303455)
@@ -98,7 +98,7 @@
TSRM_API FILE *popen_ex(const char *command, const char *type, const char
*cwd, char *env);
TSRM_API FILE *popen(const char *command, const char *type);
TSRM_API int pclose(FILE *stream);
-TSRM_API int tsrm_win32_access(const char *pathname, int mode);
+TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC);
TSRM_API int win32_utime(const char *filename, struct utimbuf *buf);
TSRM_API int shmget(int key, int size, int flags);
Modified: php/php-src/trunk/UPGRADING.INTERNALS
===================================================================
--- php/php-src/trunk/UPGRADING.INTERNALS 2010-09-17 08:42:12 UTC (rev
303454)
+++ php/php-src/trunk/UPGRADING.INTERNALS 2010-09-17 09:27:19 UTC (rev
303455)
@@ -91,3 +91,5 @@
. sapi_register_input_filter
SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int
arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len
TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC);
+. tsrm_win32_access
+ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
