Created
August 18, 2011 09:10
-
-
Save pierrejoye/1153703 to your computer and use it in GitHub Desktop.
int64 usage
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: branches/PHP_5_4/sapi/cli/php_http_parser.c | |
| =================================================================== | |
| --- branches/PHP_5_4/sapi/cli/php_http_parser.c (revision 315059) | |
| +++ branches/PHP_5_4/sapi/cli/php_http_parser.c (working copy) | |
| @@ -323,12 +323,12 @@ | |
| { | |
| char c, ch; | |
| const char *p = data, *pe; | |
| - int64_t to_read; | |
| + size_t to_read; | |
| enum state state = (enum state) parser->state; | |
| enum header_states header_state = (enum header_states) parser->header_state; | |
| - uint64_t index = parser->index; | |
| - uint64_t nread = parser->nread; | |
| + uint32_t index = parser->index; | |
| + uint32_t nread = parser->nread; | |
| /* technically we could combine all of these (except for url_mark) into one | |
| variable, saving stack space, but it seems more clear to have them | |
| @@ -1425,7 +1425,7 @@ | |
| } | |
| case s_body_identity: | |
| - to_read = MIN(pe - p, (int64_t)parser->content_length); | |
| + to_read = MIN(pe - p, (size_t)parser->content_length); | |
| if (to_read > 0) { | |
| if (settings->on_body) settings->on_body(parser, p, to_read); | |
| p += to_read - 1; | |
| @@ -1510,7 +1510,7 @@ | |
| { | |
| assert(parser->flags & F_CHUNKED); | |
| - to_read = MIN(pe - p, (int64_t)(parser->content_length)); | |
| + to_read = MIN(pe - p, (size_t)(parser->content_length)); | |
| if (to_read > 0) { | |
| if (settings->on_body) settings->on_body(parser, p, to_read); | |
| Index: branches/PHP_5_4/sapi/cli/php_http_parser.h | |
| =================================================================== | |
| --- branches/PHP_5_4/sapi/cli/php_http_parser.h (revision 315062) | |
| +++ branches/PHP_5_4/sapi/cli/php_http_parser.h (working copy) | |
| @@ -112,7 +112,7 @@ | |
| unsigned char index; | |
| uint32_t nread; | |
| - int64_t content_length; | |
| + size_t content_length; | |
| /** READ-ONLY **/ | |
| unsigned short http_major; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment