static PHP_MINIT_FUNCTION(regex)
{
#ifdef ZTS
- reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), php_reg_init_globals, NULL);
+ reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL);
#else
php_reg_init_globals(®_globals);
#endif
#ifdef ZTS
pcre_globals_id = ts_allocate_id(
sizeof(php_pcre_globals),
- _php_pcre_init_globals,
- _php_pcre_shutdown_globals);
+ (ts_allocate_ctor) _php_pcre_init_globals,
+ (ts_allocate_dtor) _php_pcre_shutdown_globals);
#else
zend_hash_init(&PCRE_G(pcre_cache), 0, NULL, _php_free_pcre_cache, 1);
#endif
ELS_FETCH();
#ifdef ZTS
- pgsql_globals_id = ts_allocate_id(sizeof(php_pgsql_globals), php_pgsql_init_globals, NULL);
+ pgsql_globals_id = ts_allocate_id(sizeof(php_pgsql_globals), (ts_allocate_ctor) php_pgsql_init_globals, NULL);
#else
php_pgsql_init_globals(PGLS_C);
#endif
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
int type;
- PGLS_FETCH();
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
WRONG_PARAM_COUNT;
char hashed_oid_key[32];
list_entry *field_type;
char *ret=NULL;
- PGLS_FETCH();
/* try to lookup the type in the resource list */
snprintf(hashed_oid_key,31,"pgsql_oid_%d",(int) oid);
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
int type;
- PGLS_FETCH();
if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &field)==FAILURE) {
WRONG_PARAM_COUNT;
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
int type;
- PGLS_FETCH();
if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &field)==FAILURE) {
WRONG_PARAM_COUNT;
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
int type,field_offset;
- PGLS_FETCH();
if (ARG_COUNT(ht)!=3 || getParameters(ht, 3, &result, &row, &field)==FAILURE) {
WRONG_PARAM_COUNT;
char *element,*field_name;
uint element_len;
PLS_FETCH();
- PGLS_FETCH();
switch (ARG_COUNT(ht)) {
case 2:
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
int type,field_offset;
- PGLS_FETCH();
if (ARG_COUNT(ht)!=3 || getParameters(ht, 3, &result, &row, &field)==FAILURE) {
WRONG_PARAM_COUNT;
pval *result;
pgsql_result_handle *pg_result;
int type;
- PGLS_FETCH();
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
WRONG_PARAM_COUNT;
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
int type;
- PGLS_FETCH();
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
WRONG_PARAM_COUNT;
pval *pgsql_lofp;
int id, type;
pgLofp *pgsql;
- PGLS_FETCH();
switch(ARG_COUNT(ht)) {
case 1:
int id, buf_len, type, nbytes;
char *buf;
pgLofp *pgsql;
- PGLS_FETCH();
switch(ARG_COUNT(ht)) {
case 2:
int id, buf_len, nbytes, type;
char *buf;
pgLofp *pgsql;
- PGLS_FETCH();
switch(ARG_COUNT(ht)) {
case 2:
char buf[8192];
pgLofp *pgsql;
int output=1;
- PGLS_FETCH();
switch(ARG_COUNT(ht)) {
case 1:
static void php_rinit_session_globals(PSLS_D)
{
- ELS_FETCH();
-
PS(mod) = _php_find_ps_module(INI_STR("session.save_handler") PSLS_CC);
PS(serializer) = \
_php_find_ps_serializer(INI_STR("session.serialize_handler") PSLS_CC);
PHP_RINIT_FUNCTION(session)
{
PSLS_FETCH();
- PLS_FETCH();
php_rinit_session_globals(PSLS_C);
dir_class_entry_ptr = register_internal_class(&dir_class_entry);
#ifdef ZTS
- dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), php_dir_init_globals, NULL);
+ dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), (ts_allocate_ctor) php_dir_init_globals, NULL);
#else
DIR(default_dir) = 0;
#endif
le_uploads = register_list_destructors(_file_upload_dtor, NULL);
#ifdef ZTS
- file_globals_id = ts_allocate_id(sizeof(php_file_globals), php_file_init_globals, NULL);
+ file_globals_id = ts_allocate_id(sizeof(php_file_globals), (ts_allocate_ctor) php_file_init_globals, NULL);
#else
FIL(fgetss_state) = 0;
FIL(pclose_ret) = 0;
PHP_MINIT_FUNCTION(fsock)
{
#ifdef ZTS
- fsock_globals_id = ts_allocate_id(sizeof(php_fsock_globals), fsock_globals_ctor, fsock_globals_dtor);
+ fsock_globals_id = ts_allocate_id(sizeof(php_fsock_globals), (ts_allocate_ctor) fsock_globals_ctor, (ts_allocate_dtor) fsock_globals_dtor);
#else
fsock_globals_ctor(FLS_C);
#endif
static int php_minit_lcg(INIT_FUNC_ARGS)
{
#ifdef ZTS
- lcg_globals_id = ts_allocate_id(sizeof(php_lcg_globals), lcg_init_globals, NULL);
+ lcg_globals_id = ts_allocate_id(sizeof(php_lcg_globals), (ts_allocate_ctor) lcg_init_globals, NULL);
#else
lcg_init_globals();
#endif
static PHP_MINIT_FUNCTION(regex)
{
#ifdef ZTS
- reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), php_reg_init_globals, NULL);
+ reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL);
#else
php_reg_init_globals(®_globals);
#endif
module_global_startup_modules();
}
-SAPI_API void sapi_shutdown()
+SAPI_API void sapi_shutdown(void)
{
module_global_shutdown_modules();
zend_hash_destroy(&known_post_content_types);
}
-static void php_unset_timeout()
+static void php_unset_timeout(void)
{
#if WIN32|WINNT
#else
}
-int return_one(void *p)
+static int return_one(void *p)
{
return 1;
}
}
-static int php3_config_ini_startup()
+static int php3_config_ini_startup(void)
{
if (php3_init_config() == FAILURE) {
php_printf("PHP: Unable to parse configuration file.\n");
return SUCCESS;
}
-static void php3_config_ini_shutdown()
+static void php3_config_ini_shutdown(void)
{
php3_shutdown_config();
}
#ifdef ZTS
tsrm_set_new_thread_end_handler(php_new_thread_end_handler);
executor_globals = ts_resource(executor_globals_id);
- core_globals_id = ts_allocate_id(sizeof(php_core_globals), core_globals_ctor, NULL);
+ core_globals_id = ts_allocate_id(sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, NULL);
core_globals = ts_resource(core_globals_id);
#endif
EG(error_reporting) = E_ALL & ~E_NOTICE;
/*
* Split raw mime stream up into appropriate components
*/
-void php_mime_split(char *buf, int cnt, char *boundary)
+static void php_mime_split(char *buf, int cnt, char *boundary)
{
char *ptr, *loc, *loc2, *s, *name, *filename, *u, *fn;
int len, state = 0, Done = 0, rem, urem;
}
-void define_command_line_ini_entry(char *arg)
+static void define_command_line_ini_entry(char *arg)
{
char *name, *value;