archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix datatype mismatches

Browse source
This commit is contained in:
Anatol Belski 2014-12-02 09:14:22 +01:00
parent 1bcc7d919c
commit b35555f6cd
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/php_ini.c
View file

@ -802,7 +802,7 @@ PHPAPI int php_ini_has_per_dir_config(void)
/* {{{ php_ini_activate_per_dir_config /* {{{ php_ini_activate_per_dir_config
*/ */
PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC) PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len TSRMLS_DC)
{ {
zval *tmp2; zval *tmp2;
char *ptr; char *ptr;
@ -853,7 +853,7 @@ PHPAPI int php_ini_has_per_host_config(void)
/* {{{ php_ini_activate_per_host_config /* {{{ php_ini_activate_per_host_config
*/ */
PHPAPI void php_ini_activate_per_host_config(const char *host, uint host_len TSRMLS_DC) PHPAPI void php_ini_activate_per_host_config(const char *host, size_t host_len TSRMLS_DC)
{ {
zval *tmp; zval *tmp;
@ -876,7 +876,7 @@ PHPAPI zval *cfg_get_entry_ex(zend_string *name)
/* {{{ cfg_get_entry /* {{{ cfg_get_entry
*/ */
PHPAPI zval *cfg_get_entry(const char *name, uint name_length) PHPAPI zval *cfg_get_entry(const char *name, size_t name_length)
{ {
return zend_hash_str_find(&configuration_hash, name, name_length); return zend_hash_str_find(&configuration_hash, name, name_length);
} }

6
main/php_ini.h
View file

@ -29,7 +29,7 @@ int php_init_config(TSRMLS_D);
int php_shutdown_config(void); int php_shutdown_config(void);
void php_ini_register_extensions(TSRMLS_D); void php_ini_register_extensions(TSRMLS_D);
PHPAPI zval *cfg_get_entry_ex(zend_string *name); PHPAPI zval *cfg_get_entry_ex(zend_string *name);
PHPAPI zval *cfg_get_entry(const char *name, uint name_length); PHPAPI zval *cfg_get_entry(const char *name, size_t name_length);
PHPAPI int cfg_get_long(const char *varname, zend_long *result); PHPAPI int cfg_get_long(const char *varname, zend_long *result);
PHPAPI int cfg_get_double(const char *varname, double *result); PHPAPI int cfg_get_double(const char *varname, double *result);
PHPAPI int cfg_get_string(const char *varname, char **result); PHPAPI int cfg_get_string(const char *varname, char **result);
@ -37,8 +37,8 @@ PHPAPI int php_parse_user_ini_file(const char *dirname, char *ini_filename, Hash
PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int stage TSRMLS_DC); PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int stage TSRMLS_DC);
PHPAPI int php_ini_has_per_dir_config(void); PHPAPI int php_ini_has_per_dir_config(void);
PHPAPI int php_ini_has_per_host_config(void); PHPAPI int php_ini_has_per_host_config(void);
PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC); PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len TSRMLS_DC);
PHPAPI void php_ini_activate_per_host_config(const char *host, uint host_len TSRMLS_DC); PHPAPI void php_ini_activate_per_host_config(const char *host, size_t host_len TSRMLS_DC);
PHPAPI HashTable* php_ini_get_configuration_hash(void); PHPAPI HashTable* php_ini_get_configuration_hash(void);
END_EXTERN_C() END_EXTERN_C()

10
sapi/cgi/cgi_main.c
View file

@ -752,7 +752,7 @@ static void sapi_cgi_log_message(char *message TSRMLS_DC)
/* {{{ php_cgi_ini_activate_user_config /* {{{ php_cgi_ini_activate_user_config
*/ */
static void php_cgi_ini_activate_user_config(char *path, int path_len, const char *doc_root, int doc_root_len, int start TSRMLS_DC) static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const char *doc_root, size_t doc_root_len, int start TSRMLS_DC)
{ {
char *ptr; char *ptr;
user_config_cache_entry *new_entry, *entry; user_config_cache_entry *new_entry, *entry;
@ -770,9 +770,9 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha
/* Check whether cache entry has expired and rescan if it is */ /* Check whether cache entry has expired and rescan if it is */
if (request_time > entry->expires) { if (request_time > entry->expires) {
char *real_path = NULL; char *real_path = NULL;
int real_path_len; size_t real_path_len;
char *s1, *s2; char *s1, *s2;
int s_len; size_t s_len;
/* Clear the expired config */ /* Clear the expired config */
zend_hash_clean(entry->user_config); zend_hash_clean(entry->user_config);
@ -831,7 +831,7 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha
static int sapi_cgi_activate(TSRMLS_D) static int sapi_cgi_activate(TSRMLS_D)
{ {
char *path, *doc_root, *server_name; char *path, *doc_root, *server_name;
uint path_len, doc_root_len, server_name_len; size_t path_len, doc_root_len, server_name_len;
/* PATH_TRANSLATED should be defined at this stage but better safe than sorry :) */ /* PATH_TRANSLATED should be defined at this stage but better safe than sorry :) */
if (!SG(request_info).path_translated) { if (!SG(request_info).path_translated) {
@ -898,7 +898,7 @@ static int sapi_cgi_activate(TSRMLS_D)
doc_root = estrndup(doc_root, doc_root_len); doc_root = estrndup(doc_root, doc_root_len);
zend_str_tolower(doc_root, doc_root_len); zend_str_tolower(doc_root, doc_root_len);
#endif #endif
php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, doc_root_len - 1 TSRMLS_CC); php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, (doc_root_len > 0 && (doc_root_len - 1)) TSRMLS_CC);
#ifdef PHP_WIN32 #ifdef PHP_WIN32
efree(doc_root); efree(doc_root);