[libpng17] Simplified error message code in pngunknown. The simplification has
the useful side effect of avoiding a bogus warning generated by the latest
version of the Intel C compiler (it objects to
condition ? string-literal : string-literal).
diff --git a/ANNOUNCE b/ANNOUNCE
index a790d7f..a65865d 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -391,6 +391,10 @@
Cleaned up (char*) casts of zlib messages. The latest version of the Intel C
compiler complains about casting a string literal as (char*), so copied the
treatment of z_const from the library code into pngfix.c
+ Simplified error message code in pngunknown. The simplification has the
+ useful side effect of avoiding a bogus warning generated by the latest
+ version of the Intel C compiler (it objects to
+ condition ? string-literal : string-literal).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index e9cbfc4..181e443 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4680,6 +4680,10 @@
Cleaned up (char*) casts of zlib messages. The latest version of the Intel C
compiler complains about casting a string literal as (char*), so copied the
treatment of z_const from the library code into pngfix.c
+ Simplified error message code in pngunknown. The simplification has the
+ useful side effect of avoiding a bogus warning generated by the latest
+ version of the Intel C compiler (it objects to
+ condition ? string-literal : string-literal).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/contrib/libtests/pngunknown.c b/contrib/libtests/pngunknown.c
index 8a9862b..a21c9d7 100644
--- a/contrib/libtests/pngunknown.c
+++ b/contrib/libtests/pngunknown.c
@@ -866,13 +866,6 @@
const char *type;
const char *errorx = NULL;
-# ifdef PNG_READ_USER_CHUNKS_SUPPORTED
- const char *callback = (set_callback ? ",callback" : "");
-# else
-# define callback ""
- UNUSED(set_callback)
-# endif
-
if (chunk_info[i].unknown)
{
if (keep == PNG_HANDLE_CHUNK_AS_DEFAULT)
@@ -970,7 +963,8 @@
if (errorx != NULL)
{
++(d->error_count);
- fprintf(stderr, "%s(%s%s): %s %s %s: %s\n", d->file, d->test, callback,
+ fprintf(stderr, "%s(%s%s): %s %s %s: %s\n", d->file, d->test,
+ set_callback ? ",callback" : "",
type, chunk_info[i].name, position, errorx);
}
