Commit 5e2d4a30 authored by Paul Eggert's avatar Paul Eggert
Browse files

* image.c (tiff_error_handler, tiff_warning_handler): Mark as

printf-like functions.
(tiff_load): Add casts to remove these marks before passing them
to system-supplied API.
parent 583f48b9
......@@ -2,6 +2,11 @@
 
Fix more problems found by GCC 4.6.0's static checks.
 
* image.c (tiff_error_handler, tiff_warning_handler): Mark as
printf-like functions.
(tiff_load): Add casts to remove these marks before passing them
to system-supplied API.
* eval.c (Fsignal): Remove excess argument to 'fatal'.
 
* coding.c (EMIT_ONE_BYTE, EMIT_TWO_BYTES): Use unsigned, not int.
......@@ -6714,6 +6714,8 @@ tiff_size_of_memory (thandle_t data)
}
static void tiff_error_handler (const char *, const char *, va_list)
ATTRIBUTE_FORMAT_PRINTF (2, 0);
static void
tiff_error_handler (const char *title, const char *format, va_list ap)
{
......@@ -6726,6 +6728,8 @@ tiff_error_handler (const char *title, const char *format, va_list ap)
}
static void tiff_warning_handler (const char *, const char *, va_list)
ATTRIBUTE_FORMAT_PRINTF (2, 0);
static void
tiff_warning_handler (const char *title, const char *format, va_list ap)
{
......@@ -6757,8 +6761,8 @@ tiff_load (struct frame *f, struct image *img)
specified_file = image_spec_value (img->spec, QCfile, NULL);
specified_data = image_spec_value (img->spec, QCdata, NULL);
fn_TIFFSetErrorHandler (tiff_error_handler);
fn_TIFFSetWarningHandler (tiff_warning_handler);
fn_TIFFSetErrorHandler ((TIFFErrorHandler) tiff_error_handler);
fn_TIFFSetWarningHandler ((TIFFErrorHandler) tiff_warning_handler);
if (NILP (specified_data))
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment