mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
first shot remove TSRMLS_* things
This commit is contained in:
Anatol Belski
parent
bb66f385d0
commit
bdeb220f48
786 changed files with 27049 additions and 27411 deletions
114
main/SAPI.h
114
main/SAPI.h
|
|
@ -151,9 +151,9 @@ extern SAPI_API sapi_globals_struct sapi_globals;
|
|||
|
||||
SAPI_API void sapi_startup(sapi_module_struct *sf);
|
||||
SAPI_API void sapi_shutdown(void);
|
||||
SAPI_API void sapi_activate(TSRMLS_D);
|
||||
SAPI_API void sapi_deactivate(TSRMLS_D);
|
||||
SAPI_API void sapi_initialize_empty_request(TSRMLS_D);
|
||||
SAPI_API void sapi_activate(void);
|
||||
SAPI_API void sapi_deactivate(void);
|
||||
SAPI_API void sapi_initialize_empty_request(void);
|
||||
END_EXTERN_C()
|
||||
|
||||
/*
|
||||
|
|
@ -182,40 +182,40 @@ typedef enum { /* Parameter: */
|
|||
} sapi_header_op_enum;
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC);
|
||||
SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg);
|
||||
|
||||
/* Deprecated functions. Use sapi_header_op instead. */
|
||||
SAPI_API int sapi_add_header_ex(char *header_line, uint header_line_len, zend_bool duplicate, zend_bool replace TSRMLS_DC);
|
||||
#define sapi_add_header(a, b, c) sapi_add_header_ex((a),(b),(c),1 TSRMLS_CC)
|
||||
SAPI_API int sapi_add_header_ex(char *header_line, uint header_line_len, zend_bool duplicate, zend_bool replace);
|
||||
#define sapi_add_header(a, b, c) sapi_add_header_ex((a),(b),(c),1)
|
||||
|
||||
|
||||
SAPI_API int sapi_send_headers(TSRMLS_D);
|
||||
SAPI_API int sapi_send_headers(void);
|
||||
SAPI_API void sapi_free_header(sapi_header_struct *sapi_header);
|
||||
SAPI_API void sapi_handle_post(void *arg TSRMLS_DC);
|
||||
SAPI_API int sapi_read_post_block(char *buffer, size_t buflen TSRMLS_DC);
|
||||
SAPI_API int sapi_register_post_entries(sapi_post_entry *post_entry TSRMLS_DC);
|
||||
SAPI_API int sapi_register_post_entry(sapi_post_entry *post_entry TSRMLS_DC);
|
||||
SAPI_API void sapi_unregister_post_entry(sapi_post_entry *post_entry TSRMLS_DC);
|
||||
SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D) TSRMLS_DC);
|
||||
SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC) TSRMLS_DC);
|
||||
SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, size_t val_len, size_t *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC);
|
||||
SAPI_API void sapi_handle_post(void *arg);
|
||||
SAPI_API int sapi_read_post_block(char *buffer, size_t buflen);
|
||||
SAPI_API int sapi_register_post_entries(sapi_post_entry *post_entry);
|
||||
SAPI_API int sapi_register_post_entry(sapi_post_entry *post_entry);
|
||||
SAPI_API void sapi_unregister_post_entry(sapi_post_entry *post_entry);
|
||||
SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(void));
|
||||
SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray));
|
||||
SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, size_t val_len, size_t *new_val_len), unsigned int (*input_filter_init)(void));
|
||||
|
||||
SAPI_API int sapi_flush(TSRMLS_D);
|
||||
SAPI_API zend_stat_t *sapi_get_stat(TSRMLS_D);
|
||||
SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC);
|
||||
SAPI_API int sapi_flush(void);
|
||||
SAPI_API zend_stat_t *sapi_get_stat(void);
|
||||
SAPI_API char *sapi_getenv(char *name, size_t name_len);
|
||||
|
||||
SAPI_API char *sapi_get_default_content_type(TSRMLS_D);
|
||||
SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header TSRMLS_DC);
|
||||
SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len TSRMLS_DC);
|
||||
SAPI_API void sapi_activate_headers_only(TSRMLS_D);
|
||||
SAPI_API char *sapi_get_default_content_type(void);
|
||||
SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header);
|
||||
SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len);
|
||||
SAPI_API void sapi_activate_headers_only(void);
|
||||
|
||||
SAPI_API int sapi_get_fd(int *fd TSRMLS_DC);
|
||||
SAPI_API int sapi_force_http_10(TSRMLS_D);
|
||||
SAPI_API int sapi_get_fd(int *fd);
|
||||
SAPI_API int sapi_force_http_10(void);
|
||||
|
||||
SAPI_API int sapi_get_target_uid(uid_t * TSRMLS_DC);
|
||||
SAPI_API int sapi_get_target_gid(gid_t * TSRMLS_DC);
|
||||
SAPI_API double sapi_get_request_time(TSRMLS_D);
|
||||
SAPI_API void sapi_terminate_process(TSRMLS_D);
|
||||
SAPI_API int sapi_get_target_uid(uid_t *);
|
||||
SAPI_API int sapi_get_target_gid(gid_t *);
|
||||
SAPI_API double sapi_get_request_time(void);
|
||||
SAPI_API void sapi_terminate_process(void);
|
||||
END_EXTERN_C()
|
||||
|
||||
struct _sapi_module_struct {
|
||||
|
|
@ -225,63 +225,63 @@ struct _sapi_module_struct {
|
|||
int (*startup)(struct _sapi_module_struct *sapi_module);
|
||||
int (*shutdown)(struct _sapi_module_struct *sapi_module);
|
||||
|
||||
int (*activate)(TSRMLS_D);
|
||||
int (*deactivate)(TSRMLS_D);
|
||||
int (*activate)(void);
|
||||
int (*deactivate)(void);
|
||||
|
||||
size_t (*ub_write)(const char *str, size_t str_length TSRMLS_DC);
|
||||
void (*flush)(void *server_context TSRMLS_DC);
|
||||
zend_stat_t *(*get_stat)(TSRMLS_D);
|
||||
char *(*getenv)(char *name, size_t name_len TSRMLS_DC);
|
||||
size_t (*ub_write)(const char *str, size_t str_length);
|
||||
void (*flush)(void *server_context);
|
||||
zend_stat_t *(*get_stat)(void);
|
||||
char *(*getenv)(char *name, size_t name_len);
|
||||
|
||||
void (*sapi_error)(int type, const char *error_msg, ...);
|
||||
|
||||
int (*header_handler)(sapi_header_struct *sapi_header, sapi_header_op_enum op, sapi_headers_struct *sapi_headers TSRMLS_DC);
|
||||
int (*send_headers)(sapi_headers_struct *sapi_headers TSRMLS_DC);
|
||||
void (*send_header)(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC);
|
||||
int (*header_handler)(sapi_header_struct *sapi_header, sapi_header_op_enum op, sapi_headers_struct *sapi_headers);
|
||||
int (*send_headers)(sapi_headers_struct *sapi_headers);
|
||||
void (*send_header)(sapi_header_struct *sapi_header, void *server_context);
|
||||
|
||||
size_t (*read_post)(char *buffer, size_t count_bytes TSRMLS_DC);
|
||||
char *(*read_cookies)(TSRMLS_D);
|
||||
size_t (*read_post)(char *buffer, size_t count_bytes);
|
||||
char *(*read_cookies)(void);
|
||||
|
||||
void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
|
||||
void (*log_message)(char *message TSRMLS_DC);
|
||||
double (*get_request_time)(TSRMLS_D);
|
||||
void (*terminate_process)(TSRMLS_D);
|
||||
void (*register_server_variables)(zval *track_vars_array);
|
||||
void (*log_message)(char *message);
|
||||
double (*get_request_time)(void);
|
||||
void (*terminate_process)(void);
|
||||
|
||||
char *php_ini_path_override;
|
||||
|
||||
void (*block_interruptions)(void);
|
||||
void (*unblock_interruptions)(void);
|
||||
|
||||
void (*default_post_reader)(TSRMLS_D);
|
||||
void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC);
|
||||
void (*default_post_reader)(void);
|
||||
void (*treat_data)(int arg, char *str, zval *destArray);
|
||||
char *executable_location;
|
||||
|
||||
int php_ini_ignore;
|
||||
int php_ini_ignore_cwd; /* don't look for php.ini in the current directory */
|
||||
|
||||
int (*get_fd)(int *fd TSRMLS_DC);
|
||||
int (*get_fd)(int *fd);
|
||||
|
||||
int (*force_http_10)(TSRMLS_D);
|
||||
int (*force_http_10)(void);
|
||||
|
||||
int (*get_target_uid)(uid_t * TSRMLS_DC);
|
||||
int (*get_target_gid)(gid_t * TSRMLS_DC);
|
||||
int (*get_target_uid)(uid_t *);
|
||||
int (*get_target_gid)(gid_t *);
|
||||
|
||||
unsigned int (*input_filter)(int arg, char *var, char **val, size_t val_len, size_t *new_val_len TSRMLS_DC);
|
||||
unsigned int (*input_filter)(int arg, char *var, char **val, size_t val_len, size_t *new_val_len);
|
||||
|
||||
void (*ini_defaults)(HashTable *configuration_hash);
|
||||
int phpinfo_as_text;
|
||||
|
||||
char *ini_entries;
|
||||
const zend_function_entry *additional_functions;
|
||||
unsigned int (*input_filter_init)(TSRMLS_D);
|
||||
unsigned int (*input_filter_init)(void);
|
||||
};
|
||||
|
||||
|
||||
struct _sapi_post_entry {
|
||||
char *content_type;
|
||||
uint content_type_len;
|
||||
void (*post_reader)(TSRMLS_D);
|
||||
void (*post_handler)(char *content_type_dup, void *arg TSRMLS_DC);
|
||||
void (*post_reader)(void);
|
||||
void (*post_handler)(char *content_type_dup, void *arg);
|
||||
};
|
||||
|
||||
/* header_handler() constants */
|
||||
|
|
@ -296,11 +296,11 @@ struct _sapi_post_entry {
|
|||
#define SAPI_DEFAULT_CHARSET PHP_DEFAULT_CHARSET
|
||||
#define SAPI_PHP_VERSION_HEADER "X-Powered-By: PHP/" PHP_VERSION
|
||||
|
||||
#define SAPI_POST_READER_FUNC(post_reader) void post_reader(TSRMLS_D)
|
||||
#define SAPI_POST_HANDLER_FUNC(post_handler) void post_handler(char *content_type_dup, void *arg TSRMLS_DC)
|
||||
#define SAPI_POST_READER_FUNC(post_reader) void post_reader(void)
|
||||
#define SAPI_POST_HANDLER_FUNC(post_handler) void post_handler(char *content_type_dup, void *arg)
|
||||
|
||||
#define SAPI_TREAT_DATA_FUNC(treat_data) void treat_data(int arg, char *str, zval* destArray TSRMLS_DC)
|
||||
#define SAPI_INPUT_FILTER_FUNC(input_filter) unsigned int input_filter(int arg, char *var, char **val, size_t val_len, size_t *new_val_len TSRMLS_DC)
|
||||
#define SAPI_TREAT_DATA_FUNC(treat_data) void treat_data(int arg, char *str, zval* destArray)
|
||||
#define SAPI_INPUT_FILTER_FUNC(input_filter) unsigned int input_filter(int arg, char *var, char **val, size_t val_len, size_t *new_val_len)
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue