diff options
Diffstat (limited to 'media/libjpeg/jerror.c')
| -rw-r--r-- | media/libjpeg/jerror.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/media/libjpeg/jerror.c b/media/libjpeg/jerror.c index c31acd9ef0..d544702937 100644 --- a/media/libjpeg/jerror.c +++ b/media/libjpeg/jerror.c @@ -3,8 +3,8 @@ * * This file was part of the Independent JPEG Group's software: * Copyright (C) 1991-1998, Thomas G. Lane. - * It was modified by The libjpeg-turbo Project to include only code relevant - * to libjpeg-turbo. + * libjpeg-turbo Modifications: + * Copyright (C) 2022, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -44,7 +44,7 @@ * want to refer to it directly. */ -#define JMESSAGE(code,string) string , +#define JMESSAGE(code, string) string, const char * const jpeg_std_message_table[] = { #include "jerror.h" @@ -66,7 +66,7 @@ const char * const jpeg_std_message_table[] = { */ METHODDEF(void) -error_exit (j_common_ptr cinfo) +error_exit(j_common_ptr cinfo) { /* Always display the message */ (*cinfo->err->output_message) (cinfo); @@ -94,7 +94,7 @@ error_exit (j_common_ptr cinfo) */ METHODDEF(void) -output_message (j_common_ptr cinfo) +output_message(j_common_ptr cinfo) { char buffer[JMSG_LENGTH_MAX]; @@ -124,7 +124,7 @@ output_message (j_common_ptr cinfo) */ METHODDEF(void) -emit_message (j_common_ptr cinfo, int msg_level) +emit_message(j_common_ptr cinfo, int msg_level) { struct jpeg_error_mgr *err = cinfo->err; @@ -153,7 +153,7 @@ emit_message (j_common_ptr cinfo, int msg_level) */ METHODDEF(void) -format_message (j_common_ptr cinfo, char *buffer) +format_message(j_common_ptr cinfo, char *buffer) { struct jpeg_error_mgr *err = cinfo->err; int msg_code = err->msg_code; @@ -189,13 +189,13 @@ format_message (j_common_ptr cinfo, char *buffer) /* Format the message into the passed buffer */ if (isstring) - sprintf(buffer, msgtext, err->msg_parm.s); + snprintf(buffer, JMSG_LENGTH_MAX, msgtext, err->msg_parm.s); else - sprintf(buffer, msgtext, - err->msg_parm.i[0], err->msg_parm.i[1], - err->msg_parm.i[2], err->msg_parm.i[3], - err->msg_parm.i[4], err->msg_parm.i[5], - err->msg_parm.i[6], err->msg_parm.i[7]); + snprintf(buffer, JMSG_LENGTH_MAX, msgtext, + err->msg_parm.i[0], err->msg_parm.i[1], + err->msg_parm.i[2], err->msg_parm.i[3], + err->msg_parm.i[4], err->msg_parm.i[5], + err->msg_parm.i[6], err->msg_parm.i[7]); } @@ -208,7 +208,7 @@ format_message (j_common_ptr cinfo, char *buffer) */ METHODDEF(void) -reset_error_mgr (j_common_ptr cinfo) +reset_error_mgr(j_common_ptr cinfo) { cinfo->err->num_warnings = 0; /* trace_level is not reset since it is an application-supplied parameter */ @@ -227,7 +227,7 @@ reset_error_mgr (j_common_ptr cinfo) */ GLOBAL(struct jpeg_error_mgr *) -jpeg_std_error (struct jpeg_error_mgr *err) +jpeg_std_error(struct jpeg_error_mgr *err) { err->error_exit = error_exit; err->emit_message = emit_message; @@ -241,7 +241,7 @@ jpeg_std_error (struct jpeg_error_mgr *err) /* Initialize message table pointers */ err->jpeg_message_table = jpeg_std_message_table; - err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1; + err->last_jpeg_message = (int)JMSG_LASTMSGCODE - 1; err->addon_message_table = NULL; err->first_addon_message = 0; /* for safety */ |