archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Zend: Voidify virtual_cwd_(de)activate() (#15554)

Browse source 
It always returned 0
This commit is contained in:
Gina Peter Banyard 2024-08-23 15:28:37 +01:00 • committed by GitHub
parent 8fcf34d598
commit d9695401e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend_virtual_cwd.c
View file

@ -230,22 +230,20 @@ CWD_API void virtual_cwd_shutdown(void) /* {{{ */
} }
/* }}} */ /* }}} */
CWD_API int virtual_cwd_activate(void) /* {{{ */ CWD_API void virtual_cwd_activate(void) /* {{{ */
{ {
if (CWDG(cwd).cwd == NULL) { if (CWDG(cwd).cwd == NULL) {
CWD_STATE_COPY(&CWDG(cwd), &main_cwd_state); CWD_STATE_COPY(&CWDG(cwd), &main_cwd_state);
} }
return 0;
} }
/* }}} */ /* }}} */
CWD_API int virtual_cwd_deactivate(void) /* {{{ */ CWD_API void virtual_cwd_deactivate(void) /* {{{ */
{ {
if (CWDG(cwd).cwd != NULL) { if (CWDG(cwd).cwd != NULL) {
CWD_STATE_FREE(&CWDG(cwd)); CWD_STATE_FREE(&CWDG(cwd));
CWDG(cwd).cwd = NULL; CWDG(cwd).cwd = NULL;
} }
return 0;
} }
/* }}} */ /* }}} */

4
Zend/zend_virtual_cwd.h
View file

@ -168,8 +168,8 @@ typedef int (*verify_path_func)(const cwd_state *);
CWD_API void virtual_cwd_startup(void); CWD_API void virtual_cwd_startup(void);
CWD_API void virtual_cwd_shutdown(void); CWD_API void virtual_cwd_shutdown(void);
CWD_API int virtual_cwd_activate(void); CWD_API void virtual_cwd_activate(void);
CWD_API int virtual_cwd_deactivate(void); CWD_API void virtual_cwd_deactivate(void);
CWD_API char *virtual_getcwd_ex(size_t *length); CWD_API char *virtual_getcwd_ex(size_t *length);
CWD_API char *virtual_getcwd(char *buf, size_t size); CWD_API char *virtual_getcwd(char *buf, size_t size);
CWD_API zend_result virtual_chdir(const char *path); CWD_API zend_result virtual_chdir(const char *path);