diff options
| author | twosee <twose@qq.com> | 2020-06-07 17:01:19 +0800 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-08 10:38:45 +0200 |
| commit | 88355dd338835f7a59415ecb2e7e970658f3867f (patch) | |
| tree | f203c58d7656c341273565e2d6fb84d89837bad2 /TSRM | |
| parent | f6db43fec8da3d3c0c7def077e9f493ce6129c45 (diff) | |
| download | php-git-88355dd338835f7a59415ecb2e7e970658f3867f.tar.gz | |
Constify char * arguments of APIs
Closes GH-5676.
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.c | 4 | ||||
| -rw-r--r-- | TSRM/TSRM.h | 4 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.c | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c index 1074c6b251..cd340035a2 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -116,7 +116,7 @@ TSRM_TLS uint8_t in_main_thread = 0; TSRM_TLS uint8_t is_thread_shutdown = 0; /* Startup TSRM (call once for the entire process) */ -TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename) +TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, const char *debug_filename) {/*{{{*/ #ifdef TSRM_WIN32 tls_key = TlsAlloc(); @@ -698,7 +698,7 @@ int tsrm_error(int level, const char *format, ...) #endif -void tsrm_error_set(int level, char *debug_filename) +void tsrm_error_set(int level, const char *debug_filename) {/*{{{*/ tsrm_error_level = level; diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 661c873292..6978b49732 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -79,7 +79,7 @@ extern "C" { #endif /* startup/shutdown */ -TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename); +TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, const char *debug_filename); TSRM_API void tsrm_shutdown(void); /* environ lock API */ @@ -115,7 +115,7 @@ typedef void (*tsrm_shutdown_func_t)(void); TSRM_API int tsrm_error(int level, const char *format, ...); -TSRM_API void tsrm_error_set(int level, char *debug_filename); +TSRM_API void tsrm_error_set(int level, const char *debug_filename); /* utility functions */ TSRM_API THREAD_T tsrm_thread_id(void); diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 15659ba546..23cb31c2fe 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -443,7 +443,7 @@ TSRM_API FILE *popen(const char *command, const char *type) return popen_ex(command, type, NULL, NULL); }/*}}}*/ -TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env) +TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, const char *env) {/*{{{*/ FILE *stream = NULL; int fno, type_len, read, mode; diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h index e002032218..0f5c003abd 100644 --- a/TSRM/tsrm_win32.h +++ b/TSRM/tsrm_win32.h @@ -94,7 +94,7 @@ const char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_l TSRM_API void tsrm_win32_startup(void); TSRM_API void tsrm_win32_shutdown(void); -TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env); +TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, const 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); |