int to size_t

Author: juan-morales

ext/json/json.c

@@ -181,12 +181,12 @@ static const char *php_json_get_error_msg(php_json_error_code error_code) /* {{{
 }
 /* }}} */
 
-static zend_string *php_json_get_error_msg_with_location(php_json_error_code error_code, int line, int column) /* {{{ */
+static zend_string *php_json_get_error_msg_with_location(php_json_error_code error_code, size_t line, size_t column) /* {{{ */
 {
 	const char *base_msg = php_json_get_error_msg(error_code);
 
 	if (line > 0 && column > 0) {
-		return zend_strpprintf(0, "%s near location %d,%d", base_msg, line, column);
+		return zend_strpprintf(0, "%s near location %u,%u", base_msg, line, column);
 	}
 
 	return zend_string_init(base_msg, strlen(base_msg), 0);
@@ -201,8 +201,8 @@ PHP_JSON_API zend_result php_json_decode_ex(zval *return_value, const char *str,
 
 	if (php_json_yyparse(&parser)) {
 		php_json_error_code error_code = php_json_parser_error_code(&parser);
-		int error_line = php_json_parser_error_line(&parser);
-		int error_column = php_json_parser_error_column(&parser);
+		size_t error_line = php_json_parser_error_line(&parser);
+		size_t error_column = php_json_parser_error_column(&parser);
 
 		if (!(options & PHP_JSON_THROW_ON_ERROR)) {
 			JSON_G(error_code) = error_code;
@@ -231,8 +231,8 @@ PHP_JSON_API bool php_json_validate_ex(const char *str, size_t str_len, zend_lon
 
 	if (php_json_yyparse(&parser)) {
 		php_json_error_code error_code = php_json_parser_error_code(&parser);
-		int error_line = php_json_parser_error_line(&parser);
-		int error_column = php_json_parser_error_column(&parser);
+		size_t error_line = php_json_parser_error_line(&parser);
+		size_t error_column = php_json_parser_error_column(&parser);
 
 		JSON_G(error_code) = error_code;
 		JSON_G(error_line) = error_line;

ext/json/json_parser.y

@@ -318,12 +318,12 @@ PHP_JSON_API php_json_error_code php_json_parser_error_code(const php_json_parse
 	return parser->scanner.errcode;
 }
 
-PHP_JSON_API int php_json_parser_error_line(const php_json_parser *parser)
+PHP_JSON_API size_t php_json_parser_error_line(const php_json_parser *parser)
 {
 	return parser->scanner.errloc.first_line;
 }
 
-PHP_JSON_API int php_json_parser_error_column(const php_json_parser *parser)
+PHP_JSON_API size_t php_json_parser_error_column(const php_json_parser *parser)
 {
 	return parser->scanner.errloc.first_column;
 }

ext/json/json_scanner.re

@@ -270,22 +270,22 @@ std:
 		return PHP_JSON_T_ERROR;
 	}
 	<STR_P1>UTF16_1          {
-		PHP_JSON_TOKEN_LOCATION(last_column) += 1; //6
+		PHP_JSON_TOKEN_LOCATION(last_column) += 1;
 		s->str_esc += 5;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
 	<STR_P1>UTF16_2          {
-		PHP_JSON_TOKEN_LOCATION(last_column) += 1; //6
+		PHP_JSON_TOKEN_LOCATION(last_column) += 1;
 		s->str_esc += 4;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
 	<STR_P1>UTF16_3          {
-		PHP_JSON_TOKEN_LOCATION(last_column) += 1; //6
+		PHP_JSON_TOKEN_LOCATION(last_column) += 1;
 		s->str_esc += 3;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
 	<STR_P1>UTF16_4          {
-		PHP_JSON_TOKEN_LOCATION(last_column) += 1; //12
+		PHP_JSON_TOKEN_LOCATION(last_column) += 1;
 		s->str_esc += 8;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
@@ -329,15 +329,15 @@ std:
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
 	<STR_P1>UTF8_2           {
-		PHP_JSON_TOKEN_LOCATION(last_column) += 1; //2
+		PHP_JSON_TOKEN_LOCATION(last_column) += 1;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
 	<STR_P1>UTF8_3           {
-		PHP_JSON_TOKEN_LOCATION(last_column) += 1; //3
+		PHP_JSON_TOKEN_LOCATION(last_column) += 1;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
 	<STR_P1>UTF8_4           {
-		PHP_JSON_TOKEN_LOCATION(last_column) += 1; //4
+		PHP_JSON_TOKEN_LOCATION(last_column) += 1;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
 	<STR_P1>ANY              {

ext/json/php_json.h

@@ -86,8 +86,8 @@ ZEND_BEGIN_MODULE_GLOBALS(json)
 	int encoder_depth;
 	int encode_max_depth;
 	php_json_error_code error_code;
-	int error_line;
-	int error_column;
+	size_t error_line;
+	size_t error_column;
 ZEND_END_MODULE_GLOBALS(json)
 
 PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json)

ext/json/php_json_parser.h

@@ -51,10 +51,10 @@ typedef struct _php_json_parser_methods {
 } php_json_parser_methods;
 
  typedef struct _php_json_parser_location {
-	int first_line;
-	int first_column;
-	int last_line;
-	int last_column;
+	size_t first_line;
+	size_t first_column;
+	size_t last_line;
+	size_t last_column;
 } php_json_parser_location;
 
 struct _php_json_parser {
@@ -85,9 +85,9 @@ PHP_JSON_API void php_json_parser_init(
 
 PHP_JSON_API php_json_error_code php_json_parser_error_code(const php_json_parser *parser);
 
-PHP_JSON_API int php_json_parser_error_line(const php_json_parser *parser);
+PHP_JSON_API size_t php_json_parser_error_line(const php_json_parser *parser);
 
-PHP_JSON_API int php_json_parser_error_column(const php_json_parser *parser);
+PHP_JSON_API size_t php_json_parser_error_column(const php_json_parser *parser);
 
 PHP_JSON_API int php_json_parse(php_json_parser *parser);