com php-src: size_t part for win32/: win32/ registry.c win32/sendmail.c win32/winutil.c win32/winutil.h

Commit: d5daea505f852e211ed097f1acbaf13fdf4d59b8 Author: Anatol Belski <ab@php.net> Wed, 18 Dec 2013 14:50:32 -0800 Parents: b1abe4ca21e10b04a8bae2d00e8113f4b2b02567 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d5daea505f852e211ed097f1acbaf13fdf4d59b8 Log: size_t part for win32/ Changed paths: M win32/registry.c M win32/sendmail.c M win32/winutil.c M win32/winutil.h Diff: diff --git a/win32/registry.c b/win32/registry.c index 66ee096..c95cdb0 100644 --- a/win32/registry.c +++ b/win32/registry.c @@ -100,7 +100,7 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_ if (parent_ht) { HashPosition pos; char *index; - zend_str_size_uint index_len; + php_size_t index_len; zend_uint_t num; zval **tmpdata; @@ -172,7 +172,7 @@ static void delete_internal_hashtable(void *data) void UpdateIniFromRegistry(char *path TSRMLS_DC) { char *p, *orig_path; - zend_str_size_int path_len; + php_size_t path_len; HashTable **pht; if(!path) { @@ -253,7 +253,7 @@ void UpdateIniFromRegistry(char *path TSRMLS_DC) HashTable *ht = *pht; HashPosition pos; char *index; - zend_str_size_uint index_len; + php_size_t index_len; zend_uint_t num; zval **data; diff --git a/win32/sendmail.c b/win32/sendmail.c index da33651..22730ee 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -157,7 +157,7 @@ static char *php_win32_mail_trim_header(char *header TSRMLS_DC) #if HAVE_PCRE || HAVE_BUNDLED_PCRE char *result, *result2; - zend_str_size_int result_len; + php_size_t result_len; zval *replace; if (!header) { @@ -388,7 +388,7 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char char *server_response = NULL; char *stripped_header = NULL; char *data_cln; - zend_str_size_int data_cln_len; + php_size_t data_cln_len; /* check for NULL parameters */ if (data == NULL) diff --git a/win32/winutil.c b/win32/winutil.c index 000d923..08d0993 100644 --- a/win32/winutil..c +++ b/win32/winutil.c @@ -34,7 +34,7 @@ PHPAPI char *php_win32_error_to_msg(HRESULT error) return (buf ? (char *) buf : ""); } -int php_win32_check_trailing_space(const char * path, const zend_str_size_int path_len) { +int php_win32_check_trailing_space(const char * path, const php_size_t path_len) { if (path_len < 1) { return 1; } diff --git a/win32/winutil.h b/win32/winutil.h index b9707da..54d1ef5 100644 --- a/win32/winutil.h +++ b/win32/winutil.h @@ -19,7 +19,7 @@ PHPAPI char *php_win32_error_to_msg(HRESULT error); #define php_win_err() php_win32_error_to_msg(GetLastError()) -int php_win32_check_trailing_space(const char * path, const zend_str_size_int path_len); +int php_win32_check_trailing_space(const char * path, const php_size_t path_len); PHPAPI php_win32_get_random_bytes(unsigned char *buf, size_t size); #ifdef ZTS