com php-src: Don't add a new line to undefined tags in EXIF_DEBUG mode: ext/exif/exif.c
| From: | Kalle Sommer Nielsen | Date: | Thu, 13 Jul 2017 23:17:34 +0000 |
| Subject: | com php-src: Don't add a new line to undefined tags in EXIF_DEBUG mode: ext/exif/exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98549@lists.php.net to get a copy of this message | ||
Commit: bf7f6f9078b535ffa70808d9700d7bed121b230d
Author: Kalle Sommer Nielsen <kalle@php.net> Fri, 14 Jul 2017 01:17:34 +0200
Parents: 9cf586cdfb6385753e477dbe8b2db11501c3a960
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf7f6f9078b535ffa70808d9700d7bed121b230d
Log:
Don't add a new line to undefined tags in EXIF_DEBUG mode
Changed paths:
M ext/exif/exif.c
Diff:
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 63b23d2..cc42abd 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -49,6 +49,8 @@
*/
#undef EXIF_DEBUG
+#define EXIF_DEBUG 1
+
#ifdef EXIF_DEBUG
#define EXIFERR_DC , const char *_file, size_t _line
#define EXIFERR_CC , __FILE__, __LINE__
@@ -1552,7 +1554,7 @@ char * exif_dump_data(int *dump_free, int format, int components, int length,
in
return value_ptr ? value_ptr : "<no data>";
}
if (format == TAG_FMT_UNDEFINED) {
- return "<undefined>\n";
+ return "<undefined>";
}
if (format == TAG_FMT_IFD) {
return "";