diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-05-28 16:08:46 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-05-28 16:08:46 +0100 |
| commit | c105738fa36bb2400adc47399c5b878d252d1c86 (patch) | |
| tree | 138eeb449e1bf51ee1726b5f820740aada0ccd0b /image/png.c | |
| parent | 20f2c86a511f7913cf858e7bd3668b0b59663ba0 (diff) | |
| download | netsurf-c105738fa36bb2400adc47399c5b878d252d1c86.tar.gz netsurf-c105738fa36bb2400adc47399c5b878d252d1c86.tar.bz2 | |
Change LOG() macro to be varadic
This changes the LOG macro to be varadic removing the need for all
callsites to have double bracketing and allows for future improvement
on how we use the logging macros.
The callsites were changed with coccinelle and the changes checked by
hand. Compile tested for several frontends but not all.
A formatting annotation has also been added which allows the compiler
to check the parameters and types passed to the logging.
Diffstat (limited to 'image/png.c')
| -rw-r--r-- | image/png.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/image/png.c b/image/png.c index ecb7e3c65..5d68d2f8a 100644 --- a/image/png.c +++ b/image/png.c @@ -71,7 +71,7 @@ enum nspng_cberr { */ static void nspng_warning(png_structp png_ptr, png_const_charp warning_message) { - LOG(("%s", warning_message)); + LOG("%s", warning_message); } /** @@ -79,7 +79,7 @@ static void nspng_warning(png_structp png_ptr, png_const_charp warning_message) */ static void nspng_error(png_structp png_ptr, png_const_charp error_message) { - LOG(("%s", error_message)); + LOG("%s", error_message); longjmp(png_jmpbuf(png_ptr), CBERR_LIBPNG); } @@ -172,8 +172,7 @@ static void info_callback(png_structp png_s, png_infop info) png_c->rowbytes = png_get_rowbytes(png_s, info); png_c->interlace = (interlace == PNG_INTERLACE_ADAM7); - LOG(("size %li * %li, rowbytes %zu", (unsigned long)width, - (unsigned long)height, png_c->rowbytes)); + LOG("size %li * %li, rowbytes %zu", (unsigned long)width, (unsigned long)height, png_c->rowbytes); } static void row_callback(png_structp png_s, png_bytep new_row, @@ -261,7 +260,7 @@ static nserror nspng_create_png_data(nspng_content *png_c) if (setjmp(png_jmpbuf(png_c->png))) { png_destroy_read_struct(&png_c->png, &png_c->info, 0); - LOG(("Failed to set callbacks")); + LOG("Failed to set callbacks"); png_c->png = NULL; png_c->info = NULL; @@ -349,7 +348,7 @@ static bool nspng_process_data(struct content *c, const char *data, * up png conversion and signal the content * error */ - LOG(("Fatal PNG error during header, error content")); + LOG("Fatal PNG error during header, error content"); png_destroy_read_struct(&png_c->png, &png_c->info, 0); png_c->png = NULL; |