com php-src: after merge fix and more revamp on ext\session: ext/session/mod_user.c ext/session/php_session.h ex t/session/session.c

Commit: ff42d2a6447498697fc9617ed8c650b808356978 Author: Anatol Belski <ab@php.net> Wed, 22 Jan 2014 09:54:04 +0100 Parents: 8a43325b387d89fefc0c13b1593329d63bfa2f2e Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ff42d2a6447498697fc9617ed8c650b808356978 Log: after merge fix and more revamp on ext\session Changed paths: M ext/session/mod_user.c M ext/session/php_session.h M ext/session/session.c Diff: diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index 2e75fc8..f984a2d 100644 --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@ -64,7 +64,7 @@ static zval *ps_call_handler(zval *func, int argc, zval **argv TSRMLS_DC) #define STDVARS \ zval *retval = NULL; \ - int ret = FAILURE + php_int_t ret = FAILURE #define PSF(a) PS(mod_user_names).name.ps_##a diff --git a/ext/session/php_session.h b/ext/session/php_session.h index 3af6944..81186f9 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -45,24 +45,24 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS); typedef struct ps_module_struct { const char *s_name; - int (*s_open)(PS_OPEN_ARGS); - int (*s_close)(PS_CLOSE_ARGS); - int (*s_read)(PS_READ_ARGS); - int (*s_write)(PS_WRITE_ARGS); - int (*s_destroy)(PS_DESTROY_ARGS); - int (*s_gc)(PS_GC_ARGS); + php_int_t (*s_open)(PS_OPEN_ARGS); + php_int_t (*s_close)(PS_CLOSE_ARGS); + php_int_t (*s_read)(PS_READ_ARGS); + php_int_t (*s_write)(PS_WRITE_ARGS); + php_int_t (*s_destroy)(PS_DESTROY_ARGS); + php_int_t (*s_gc)(PS_GC_ARGS); char *(*s_create_sid)(PS_CREATE_SID_ARGS); } ps_module; #define PS_GET_MOD_DATA() *mod_data #define PS_SET_MOD_DATA(a) *mod_data = (a) -#define PS_OPEN_FUNC(x) int ps_open_##x(PS_OPEN_ARGS) -#define PS_CLOSE_FUNC(x) int ps_close_##x(PS_CLOSE_ARGS) -#define PS_READ_FUNC(x) int ps_read_##x(PS_READ_ARGS) -#define PS_WRITE_FUNC(x) int ps_write_##x(PS_WRITE_ARGS) -#define PS_DESTROY_FUNC(x) int ps_delete_##x(PS_DESTROY_ARGS) -#define PS_GC_FUNC(x) int ps_gc_##x(PS_GC_ARGS) +#define PS_OPEN_FUNC(x) php_int_t ps_open_##x(PS_OPEN_ARGS) +#define PS_CLOSE_FUNC(x) php_int_t ps_close_##x(PS_CLOSE_ARGS) +#define PS_READ_FUNC(x) php_int_t ps_read_##x(PS_READ_ARGS) +#define PS_WRITE_FUNC(x) php_int_t ps_write_##x(PS_WRITE_ARGS) +#define PS_DESTROY_FUNC(x) php_int_t ps_delete_##x(PS_DESTROY_ARGS) +#define PS_GC_FUNC(x) php_int_t ps_gc_##x(PS_GC_ARGS) #define PS_CREATE_SID_FUNC(x) char *ps_create_sid_##x(PS_CREATE_SID_ARGS) #define PS_FUNCS(x) \ diff --git a/ext/session/session.c b/ext/session/session.c index 72ffdb1..dfe394b 100644 --- a/ext/session/session..c +++ b/ext/session/session.c @@ -289,7 +289,7 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */ void *hash_context = NULL; #endif unsigned char *digest; - int digest_len; + php_size_t digest_len; int j; char *buf, *outid; struct timeval tv; @@ -537,7 +537,7 @@ static void php_session_initialize(TSRMLS_D) /* {{{ */ static void php_session_save_current_state(TSRMLS_D) /* {{{ */ { - int ret = FAILURE; + php_int_t ret = FAILURE; IF_SESSION_VARS() { if (PS(mod_data) || PS(mod_user_implemented)) {