Return void from php_jpeg_emit_message()

nikic · nikic · commit ca48129caefa · 2020-06-19T16:59:29.000+02:00
Instead of returning long and then casting to void. This fixes a build warning on Ubuntu 20.04. Closes GH-5742.
diff --git a/ext/gd/libgd/gd_jpeg.c b/ext/gd/libgd/gd_jpeg.c
@@ -47,7 +47,7 @@ typedef struct _jmpbuf_wrapper
 	int ignore_warning;
 } jmpbuf_wrapper;
 
-static long php_jpeg_emit_message(j_common_ptr jpeg_info, int level)
+static void php_jpeg_emit_message(j_common_ptr jpeg_info, int level)
 {
 	char message[JMSG_LENGTH_MAX];
 	jmpbuf_wrapper *jmpbufw;
@@ -81,11 +81,9 @@ static long php_jpeg_emit_message(j_common_ptr jpeg_info, int level)
 			}
 		}
 	}
-	return 1;
 }
 
 
-
 /* Called by the IJG JPEG library upon encountering a fatal error */
 static void fatal_jpeg_error (j_common_ptr cinfo)
 {
@@ -356,8 +354,7 @@ gdImagePtr gdImageCreateFromJpegCtxEx (gdIOCtx * infile, int ignore_warning)
 
 	cinfo.err = jpeg_std_error (&jerr);
 	cinfo.client_data = &jmpbufw;
-
-	cinfo.err->emit_message = (void (*)(j_common_ptr,int)) php_jpeg_emit_message;
+	cinfo.err->emit_message = php_jpeg_emit_message;
 
 	if (setjmp (jmpbufw.jmpbuf) != 0) {
 		/* we're here courtesy of longjmp */

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ typedef struct _jmpbuf_wrapper`
`47`	`47`	`int ignore_warning;`
`48`	`48`	`} jmpbuf_wrapper;`
`49`	`49`
`50`		`-static long php_jpeg_emit_message(j_common_ptr jpeg_info, int level)`
	`50`	`+static void php_jpeg_emit_message(j_common_ptr jpeg_info, int level)`
`51`	`51`	`{`
`52`	`52`	`char message[JMSG_LENGTH_MAX];`
`53`	`53`	`jmpbuf_wrapper *jmpbufw;`
`@@ -81,11 +81,9 @@ static long php_jpeg_emit_message(j_common_ptr jpeg_info, int level)`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`}`
`84`		`- return 1;`
`85`	`84`	`}`
`86`	`85`
`87`	`86`
`88`		`-`
`89`	`87`	`/* Called by the IJG JPEG library upon encountering a fatal error */`
`90`	`88`	`static void fatal_jpeg_error (j_common_ptr cinfo)`
`91`	`89`	`{`
`@@ -356,8 +354,7 @@ gdImagePtr gdImageCreateFromJpegCtxEx (gdIOCtx * infile, int ignore_warning)`
`356`	`354`
`357`	`355`	`cinfo.err = jpeg_std_error (&jerr);`
`358`	`356`	`cinfo.client_data = &jmpbufw;`
`359`		`-`
`360`		`- cinfo.err->emit_message = (void (*)(j_common_ptr,int)) php_jpeg_emit_message;`
	`357`	`+ cinfo.err->emit_message = php_jpeg_emit_message;`
`361`	`358`
`362`	`359`	`if (setjmp (jmpbufw.jmpbuf) != 0) {`
`363`	`360`	`/* we're here courtesy of longjmp */`