Skip to content

Commit a95f8db

Browse files
weltlingweltling
committed
fixes for types to ext/standard with types ... some stuff is broken now
1 parent 88960bb commit a95f8db

25 files changed

+165
-162
lines changed

‎Zend/zend_highlight.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ZEND_API void zend_html_putc(char c)
5454
}
5555

5656

57-
ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC)
57+
ZEND_API void zend_html_puts(const char *s, zend_str_size_uint len TSRMLS_DC)
5858
{
5959
const unsigned char *ptr = (const unsigned char*)s, *end = ptr + len;
6060
unsigned char *filtered;

‎Zend/zend_highlight.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ZEND_API void zend_strip(TSRMLS_D);
4444
ZEND_API int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC);
4545
ZEND_API int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, char *str_name TSRMLS_DC);
4646
ZEND_API void zend_html_putc(char c);
47-
ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC);
47+
ZEND_API void zend_html_puts(const char *s, zend_str_size_uint len TSRMLS_DC);
4848
END_EXTERN_C()
4949

5050
extern zend_syntax_highlighter_ini syntax_highlighter_ini;

‎ext/standard/dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ PHP_NAMED_FUNCTION(php_if_readdir)
424424
Find pathnames matching a pattern */
425425
PHP_FUNCTION(glob)
426426
{
427-
int cwd_skip = 0;
427+
zend_str_size_int cwd_skip = 0;
428428
#ifdef ZTS
429429
char cwd[MAXPATHLEN];
430430
char work_pattern[MAXPATHLEN];

‎ext/standard/dl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now TSRMLS_DC)
129129
}
130130
libpath = estrdup(filename);
131131
} else if (extension_dir && extension_dir[0]) {
132-
int extension_dir_len = strlen(extension_dir);
132+
zend_str_size_int extension_dir_len = strlen(extension_dir);
133133

134134
if (IS_SLASH(extension_dir[extension_dir_len-1])) {
135135
spprintf(&libpath, 0, "%s%s", extension_dir, filename); /* SAFE */

‎ext/standard/file.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ PHPAPI PHP_FUNCTION(fwrite)
11691169
zval *arg1;
11701170
char *arg2;
11711171
zend_str_size arg2len;
1172-
int ret;
1172+
zend_str_size_int ret;
11731173
zend_str_size num_bytes;
11741174
long arg3 = 0;
11751175
char *buffer = NULL;
@@ -1810,7 +1810,7 @@ PHP_FUNCTION(fputcsv)
18101810
const char escape_char = '\\';
18111811
php_stream *stream;
18121812
zval *fp = NULL, *fields = NULL;
1813-
int ret;
1813+
zend_str_size_int ret;
18141814
char *delimiter_str = NULL, *enclosure_str = NULL;
18151815
zend_str_size delimiter_str_len = 0, enclosure_str_len = 0;
18161816

@@ -1852,9 +1852,10 @@ PHP_FUNCTION(fputcsv)
18521852
/* }}} */
18531853

18541854
/* {{{ PHPAPI int php_fputcsv(php_stream *stream, zval *fields, char delimiter, char enclosure, char escape_char TSRMLS_DC) */
1855-
PHPAPI int php_fputcsv(php_stream *stream, zval *fields, char delimiter, char enclosure, char escape_char TSRMLS_DC)
1855+
PHPAPI zend_str_size_int php_fputcsv(php_stream *stream, zval *fields, char delimiter, char enclosure, char escape_char TSRMLS_DC)
18561856
{
1857-
int count, i = 0, ret;
1857+
int count, i = 0;
1858+
zend_str_size_int ret;
18581859
zval **field_tmp = NULL, field;
18591860
smart_str csvline = {0};
18601861
HashPosition pos;

‎ext/standard/file.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ PHPAPI int php_copy_file_ctx(char *src, char *dest, int src_chk, php_stream_cont
8080
PHPAPI int php_mkdir_ex(char *dir, long mode, int options TSRMLS_DC);
8181
PHPAPI int php_mkdir(char *dir, long mode TSRMLS_DC);
8282
PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char escape_char, size_t buf_len, char *buf, zval *return_value TSRMLS_DC);
83-
PHPAPI int php_fputcsv(php_stream *stream, zval *fields, char delimiter, char enclosure, char escape_char TSRMLS_DC);
83+
PHPAPI zend_str_size_int php_fputcsv(php_stream *stream, zval *fields, char delimiter, char enclosure, char escape_char TSRMLS_DC);
8484

8585
#define META_DEF_BUFSIZE 8192
8686

‎ext/standard/formatted_print.c

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static char HEXCHARS[] = "0123456789ABCDEF";
5252

5353
/* php_spintf_appendchar() {{{ */
5454
inline static void
55-
php_sprintf_appendchar(char **buffer, int *pos, int *size, char add TSRMLS_DC)
55+
php_sprintf_appendchar(char **buffer, zend_str_size_int *pos, zend_str_size_int *size, char add TSRMLS_DC)
5656
{
5757
if ((*pos + 1) >= *size) {
5858
*size <<= 1;
@@ -66,22 +66,18 @@ php_sprintf_appendchar(char **buffer, int *pos, int *size, char add TSRMLS_DC)
6666

6767
/* php_spintf_appendstring() {{{ */
6868
inline static void
69-
php_sprintf_appendstring(char **buffer, int *pos, int *size, char *add,
70-
int min_width, int max_width, char padding,
71-
int alignment, int len, int neg, int expprec, int always_sign)
69+
php_sprintf_appendstring(char **buffer, zend_str_size_int *pos, zend_str_size_int *size, char *add,
70+
zend_str_size_int min_width, zend_str_size_int max_width, char padding,
71+
zend_str_size_int alignment, zend_str_size_int len, int neg, int expprec, int always_sign)
7272
{
73-
register int npad;
74-
int req_size;
75-
int copy_len;
76-
int m_width;
73+
register zend_str_size_int npad;
74+
zend_str_size_int req_size;
75+
zend_str_size_int copy_len;
76+
zend_str_size_int m_width;
7777

7878
copy_len = (expprec ? MIN(max_width, len) : len);
79-
npad = min_width - copy_len;
79+
npad = (min_width >= copy_len) ? (min_width - copy_len) : 0;
8080

81-
if (npad < 0) {
82-
npad = 0;
83-
}
84-
8581
PRINTF_DEBUG(("sprintf: appendstring(%x, %d, %d, \"%s\", %d, '%c', %d)\n",
8682
*buffer, *pos, *size, add, min_width, padding, alignment));
8783
m_width = MAX(min_width, copy_len);
@@ -126,8 +122,8 @@ php_sprintf_appendstring(char **buffer, int *pos, int *size, char *add,
126122

127123
/* php_spintf_appendint() {{{ */
128124
inline static void
129-
php_sprintf_appendint(char **buffer, int *pos, int *size, long number,
130-
int width, char padding, int alignment,
125+
php_sprintf_appendint(char **buffer, zend_str_size_int *pos, zend_str_size_int *size, long number,
126+
zend_str_size_int width, char padding, zend_str_size_int alignment,
131127
int always_sign)
132128
{
133129
char numbuf[NUM_BUF_SIZE];
@@ -170,9 +166,9 @@ php_sprintf_appendint(char **buffer, int *pos, int *size, long number,
170166

171167
/* php_spintf_appenduint() {{{ */
172168
inline static void
173-
php_sprintf_appenduint(char **buffer, int *pos, int *size,
169+
php_sprintf_appenduint(char **buffer, zend_str_size_int *pos, zend_str_size_int *size,
174170
unsigned long number,
175-
int width, char padding, int alignment)
171+
zend_str_size_int width, char padding, zend_str_size_int alignment)
176172
{
177173
char numbuf[NUM_BUF_SIZE];
178174
register unsigned long magn, nmagn;
@@ -202,17 +198,18 @@ php_sprintf_appenduint(char **buffer, int *pos, int *size,
202198

203199
/* php_spintf_appenddouble() {{{ */
204200
inline static void
205-
php_sprintf_appenddouble(char **buffer, int *pos,
206-
int *size, double number,
207-
int width, char padding,
208-
int alignment, int precision,
201+
php_sprintf_appenddouble(char **buffer, zend_str_size_int *pos,
202+
zend_str_size_int *size, double number,
203+
zend_str_size_int width, char padding,
204+
zend_str_size_int alignment, int precision,
209205
int adjust, char fmt,
210206
int always_sign
211207
TSRMLS_DC)
212208
{
213209
char num_buf[NUM_BUF_SIZE];
214210
char *s = NULL;
215-
int s_len = 0, is_negative = 0;
211+
zend_str_size_int s_len = 0;
212+
int is_negative = 0;
216213
#ifdef HAVE_LOCALE_H
217214
struct lconv *lconv;
218215
#endif
@@ -293,8 +290,8 @@ php_sprintf_appenddouble(char **buffer, int *pos,
293290

294291
/* php_spintf_appendd2n() {{{ */
295292
inline static void
296-
php_sprintf_append2n(char **buffer, int *pos, int *size, long number,
297-
int width, char padding, int alignment, int n,
293+
php_sprintf_append2n(char **buffer, zend_str_size_int *pos, zend_str_size_int *size, long number,
294+
zend_str_size_int width, char padding, zend_str_size_int alignment, int n,
298295
char *chartable, int expprec)
299296
{
300297
char numbuf[NUM_BUF_SIZE];
@@ -324,11 +321,11 @@ php_sprintf_append2n(char **buffer, int *pos, int *size, long number,
324321

325322
/* php_spintf_getnumber() {{{ */
326323
inline static int
327-
php_sprintf_getnumber(char *buffer, int *pos)
324+
php_sprintf_getnumber(char *buffer, zend_str_size_int *pos)
328325
{
329326
char *endptr;
330327
register long num = strtol(&buffer[*pos], &endptr, 10);
331-
register int i = 0;
328+
register zend_str_size_int i = 0;
332329

333330
if (endptr != NULL) {
334331
i = (endptr - &buffer[*pos]);
@@ -369,10 +366,11 @@ php_sprintf_getnumber(char *buffer, int *pos)
369366
*
370367
*/
371368
static char *
372-
php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC)
369+
php_formatted_print(int ht, zend_str_size_int *len, int use_array, int format_offset TSRMLS_DC)
373370
{
374371
zval ***args, **z_format;
375-
int argc, size = 240, inpos = 0, outpos = 0, temppos;
372+
int argc;
373+
zend_str_size_int size = 240, inpos = 0, outpos = 0, temppos;
376374
int alignment, currarg, adjusting, argnum, width, precision;
377375
char *format, *result, padding;
378376
int always_sign;
@@ -666,7 +664,7 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC
666664
PHP_FUNCTION(user_sprintf)
667665
{
668666
char *result;
669-
int len;
667+
zend_str_size_int len;
670668

671669
if ((result=php_formatted_print(ht, &len, 0, 0 TSRMLS_CC))==NULL) {
672670
RETURN_FALSE;
@@ -680,7 +678,7 @@ PHP_FUNCTION(user_sprintf)
680678
PHP_FUNCTION(vsprintf)
681679
{
682680
char *result;
683-
int len;
681+
zend_str_size_int len;
684682

685683
if ((result=php_formatted_print(ht, &len, 1, 0 TSRMLS_CC))==NULL) {
686684
RETURN_FALSE;
@@ -694,7 +692,7 @@ PHP_FUNCTION(vsprintf)
694692
PHP_FUNCTION(user_printf)
695693
{
696694
char *result;
697-
int len, rlen;
695+
zend_str_size_int len, rlen;
698696

699697
if ((result=php_formatted_print(ht, &len, 0, 0 TSRMLS_CC))==NULL) {
700698
RETURN_FALSE;
@@ -710,7 +708,7 @@ PHP_FUNCTION(user_printf)
710708
PHP_FUNCTION(vprintf)
711709
{
712710
char *result;
713-
int len, rlen;
711+
zend_str_size_int len, rlen;
714712

715713
if ((result=php_formatted_print(ht, &len, 1, 0 TSRMLS_CC))==NULL) {
716714
RETURN_FALSE;
@@ -728,7 +726,7 @@ PHP_FUNCTION(fprintf)
728726
php_stream *stream;
729727
zval *arg1;
730728
char *result;
731-
int len;
729+
zend_str_size_int len;
732730

733731
if (ZEND_NUM_ARGS() < 2) {
734732
WRONG_PARAM_COUNT;
@@ -759,7 +757,7 @@ PHP_FUNCTION(vfprintf)
759757
php_stream *stream;
760758
zval *arg1;
761759
char *result;
762-
int len;
760+
zend_str_size_int len;
763761

764762
if (ZEND_NUM_ARGS() != 3) {
765763
WRONG_PARAM_COUNT;

‎ext/standard/ftp_fopen_wrapper.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,11 @@ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, char *path
135135
{
136136
php_stream *stream = NULL, *reuseid = NULL;
137137
php_url *resource = NULL;
138-
int result, use_ssl, use_ssl_on_data = 0, tmp_len;
138+
int result, use_ssl, use_ssl_on_data = 0;
139+
zend_str_size_int tmp_len;
139140
char tmp_line[512];
140141
char *transport;
141-
int transport_len;
142+
zend_str_size_int transport_len;
142143

143144
resource = php_url_parse(path);
144145
if (resource == NULL || resource->path == NULL) {
@@ -425,7 +426,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
425426
int allow_overwrite = 0;
426427
int read_write = 0;
427428
char *transport;
428-
int transport_len;
429+
zend_str_size_int transport_len;
429430

430431
tmp_line[0] = '\0';
431432

‎ext/standard/head.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ PHPAPI int php_header(TSRMLS_D)
7373
}
7474

7575

76-
PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, time_t expires, char *path, int path_len, char *domain, int domain_len, int secure, int url_encode, int httponly TSRMLS_DC)
76+
PHPAPI int php_setcookie(char *name, zend_str_size_int name_len, char *value, zend_str_size_int value_len, time_t expires, char *path, zend_str_size_int path_len, char *domain, zend_str_size_int domain_len, int secure, int url_encode, int httponly TSRMLS_DC)
7777
{
7878
char *cookie, *encoded_value = NULL;
79-
int len=sizeof("Set-Cookie: ");
79+
zend_str_size_int len=sizeof("Set-Cookie: ");
8080
char *dt;
8181
sapi_header_line ctr = {0};
8282
int result;
@@ -93,7 +93,7 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t
9393

9494
len += name_len;
9595
if (value && url_encode) {
96-
int encoded_value_len;
96+
zend_str_size_int encoded_value_len;
9797

9898
encoded_value = php_url_encode(value, value_len, &encoded_value_len);
9999
len += encoded_value_len;

‎ext/standard/head.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ PHP_FUNCTION(headers_list);
3131
PHP_FUNCTION(http_response_code);
3232

3333
PHPAPI int php_header(TSRMLS_D);
34-
PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, time_t expires, char *path, int path_len, char *domain, int domain_len, int secure, int url_encode, int httponly TSRMLS_DC);
34+
PHPAPI int php_setcookie(char *name, zend_str_size_int name_len, char *value, zend_str_size_int value_len, time_t expires, char *path, zend_str_size_int path_len, char *domain, zend_str_size_int domain_len, int secure, int url_encode, int httponly TSRMLS_DC);
3535

3636
#endif

‎ext/standard/http.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@
2626

2727
/* {{{ php_url_encode_hash */
2828
PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
29-
const char *num_prefix, int num_prefix_len,
30-
const char *key_prefix, int key_prefix_len,
31-
const char *key_suffix, int key_suffix_len,
29+
const char *num_prefix, zend_str_size_int num_prefix_len,
30+
const char *key_prefix, zend_str_size_int key_prefix_len,
31+
const char *key_suffix, zend_str_size_int key_suffix_len,
3232
zval *type, char *arg_sep, int enc_type TSRMLS_DC)
3333
{
3434
char *key = NULL;
3535
char *ekey, *newprefix, *p;
36-
int arg_sep_len, ekey_len, key_type, newprefix_len;
36+
zend_str_size_int arg_sep_len, ekey_len, newprefix_len;
37+
int key_type;
3738
zend_str_size_uint key_len;
3839
ulong idx;
3940
zval **zdata = NULL, *copyzval;

‎ext/standard/http_fopen_wrapper.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
9494
char *tmp = NULL;
9595
char *ua_str = NULL;
9696
zval **ua_zval = NULL, **tmpzval = NULL;
97-
int scratch_len = 0;
97+
zend_str_size_int scratch_len = 0;
9898
int body = 0;
9999
char location[HTTP_HEADER_BLOCK_SIZE];
100100
zval *response_header = NULL;
@@ -104,9 +104,9 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
104104
size_t chunk_size = 0, file_size = 0;
105105
int eol_detect = 0;
106106
char *transport_string, *errstr = NULL;
107-
int transport_len, have_header = 0, request_fulluri = 0, ignore_errors = 0;
107+
zend_str_size_int transport_len, have_header = 0, request_fulluri = 0, ignore_errors = 0;
108108
char *protocol_version = NULL;
109-
int protocol_version_len = 3; /* Default: "1.0" */
109+
zend_str_size_int protocol_version_len = 3; /* Default: "1.0" */
110110
struct timeval timeout;
111111
char *user_headers = NULL;
112112
int header_init = ((flags & HTTP_WRAPPER_HEADER_INIT) != 0);
@@ -426,13 +426,13 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
426426
char *s;
427427

428428
if (!header_init) { /* Remove post headers for redirects */
429-
int l = strlen(tmp);
429+
zend_str_size_int l = strlen(tmp);
430430
char *s2, *tmp_c = estrdup(tmp);
431431

432432
php_strtolower(tmp_c, l);
433433
if ((s = strstr(tmp_c, "content-length:"))) {
434434
if ((s2 = memchr(s, '\n', tmp_c + l - s))) {
435-
int b = tmp_c + l - 1 - s2;
435+
zend_str_size_int b = tmp_c + l - 1 - s2;
436436
memmove(tmp, tmp + (s2 + 1 - tmp_c), b);
437437
memmove(tmp_c, s2 + 1, b);
438438

0 commit comments

Comments
 (0)