ext/standard/scanf: drop checking of php_sscanf_internal as it always throws on error

Author: Girgias

ext/spl/spl_directory.c

@@ -2494,12 +2494,7 @@ PHP_METHOD(SplFileObject, fscanf)
 		RETURN_THROWS();
 	}
 
-	int result = php_sscanf_internal(ZSTR_VAL(intern->u.file.current_line), ZSTR_VAL(format_str), (int)num_varargs, varargs, 0, return_value);
-
-	if (SCAN_ERROR_WRONG_PARAM_COUNT == result) {
-		zend_wrong_param_count();
-		RETURN_THROWS();
-	}
+	php_sscanf_internal(ZSTR_VAL(intern->u.file.current_line), ZSTR_VAL(format_str), (int)num_varargs, varargs, 0, return_value);
 }
 /* }}} */
 

ext/standard/file.c

@@ -928,7 +928,7 @@ PHPAPI PHP_FUNCTION(fgetc)
 /* {{{ Implements a mostly ANSI compatible fscanf() */
 PHP_FUNCTION(fscanf)
 {
-	int result, argc = 0;
+	int argc = 0;
 	size_t format_len;
 	zval *args = NULL;
 	zval *file_handle;
@@ -956,14 +956,9 @@ PHP_FUNCTION(fscanf)
 		RETURN_FALSE;
 	}
 
-	result = php_sscanf_internal(buf, format, argc, args, 0, return_value);
+	php_sscanf_internal(buf, format, argc, args, 0, return_value);
 
 	efree(buf);
-
-	if (SCAN_ERROR_WRONG_PARAM_COUNT == result) {
-		zend_wrong_param_count();
-		RETURN_THROWS();
-	}
 }
 /* }}} */
 

ext/standard/scanf.h

@@ -28,7 +28,6 @@
 									/* can be caused by bad parameters or format*/
 									/* string.									*/
 #define SCAN_ERROR_INVALID_FORMAT		(SCAN_ERROR_EOF - 1)
-#define SCAN_ERROR_WRONG_PARAM_COUNT	(SCAN_ERROR_INVALID_FORMAT - 1)
 
 /*
  * The following are here solely for the benefit of the scanf type functions

ext/standard/string.c

@@ -5862,20 +5862,16 @@ PHP_FUNCTION(sscanf)
 	zval *args = NULL;
 	char *str, *format;
 	size_t str_len, format_len;
-	int result, num_args = 0;
+	int num_args = 0;
 
 	ZEND_PARSE_PARAMETERS_START(2, -1)
 		Z_PARAM_STRING(str, str_len)
 		Z_PARAM_STRING(format, format_len)
 		Z_PARAM_VARIADIC('*', args, num_args)
 	ZEND_PARSE_PARAMETERS_END();
 
-	result = php_sscanf_internal(str, format, num_args, args, 0, return_value);
+	php_sscanf_internal(str, format, num_args, args, 0, return_value);
 
-	if (SCAN_ERROR_WRONG_PARAM_COUNT == result) {
-		zend_wrong_param_count();
-		RETURN_THROWS();
-	}
 }
 /* }}} */