ext/fileinfo: Use magic_setflags() directly

The only way this function returns -1 is if:
> magic_setflags() returns -1 on systems that don't support utime(3), or utimes(2) when MAGIC_PRESERVE_ATIME is set.

This is extremely unlikely and if this would happen we currently have a return type violation.

Author: Girgias

ext/fileinfo/fileinfo.c

@@ -94,14 +94,6 @@ PHP_FILEINFO_API zend_object *finfo_objects_new(zend_class_entry *class_type)
 }
 /* }}} */
 
-#define FINFO_SET_OPTION(magic, options) \
-	if (magic_setflags(magic, options) == -1) { \
-		php_error_docref(NULL, E_WARNING, "Failed to set option '" ZEND_LONG_FMT "' %d:%s", \
-				options, magic_errno(magic), magic_error(magic)); \
-		RETURN_FALSE; \
-	}
-/* }}} */
-
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(finfo)
 {
@@ -276,7 +268,7 @@ PHP_FUNCTION(finfo_set_flags)
 	}
 	FILEINFO_FROM_OBJECT(finfo, self);
 
-	FINFO_SET_OPTION(finfo->magic, options)
+	magic_setflags(finfo->magic, options);
 	finfo->options = options;
 
 	RETURN_TRUE;
@@ -337,7 +329,7 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
 
 	/* Set options for the current file/buffer. */
 	if (options) {
-		FINFO_SET_OPTION(magic, options)
+		magic_setflags(magic, options);
 	}
 
 	switch (mode) {
@@ -436,9 +428,8 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
 
 	/* Restore options */
 	if (options) {
-		FINFO_SET_OPTION(magic, finfo->options)
+		magic_setflags(magic, options);
 	}
-	return;
 }
 /* }}} */
 

ext/fileinfo/tests/finfo_file_basic.phpt

@@ -24,5 +24,5 @@ try {
 *** Testing finfo_file() : basic functionality ***
 string(28) "text/x-php; charset=us-ascii"
 string(22) "PHP script, ASCII text"
-string(29) "text/x-file; charset=us-ascii"
+string(43) "magic text file for file(1) cmd, ASCII text"
 finfo_file(): Argument #2 ($filename) must not contain any null bytes