From f89f7192efc43daa64c1fb591d0cfcc098b82c82 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 7 Sep 2017 21:08:02 +0100 Subject: fix size+t formatting in logging --- frontends/gtk/layout_pango.c | 5 +++-- render/layout.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c index 9e17c3b1c..a5964eb37 100644 --- a/frontends/gtk/layout_pango.c +++ b/frontends/gtk/layout_pango.c @@ -30,6 +30,7 @@ #include "utils/log.h" #include "utils/nsoption.h" +#include "netsurf/inttypes.h" #include "netsurf/layout.h" #include "netsurf/plot_style.h" @@ -85,8 +86,8 @@ nsfont_width(const plot_font_style_t *fstyle, pango_layout_get_pixel_size(nsfont_pango_layout, width, 0); NSLOG(netsurf, DEEPDEBUG, - "fstyle: %p string:\"%.*s\", length: %u, width: %dpx", - fstyle, length, string, length, *width); + "fstyle: %p string:\"%.*s\", length: %" PRIsizet ", width: %dpx", + fstyle, (int)length, string, length, *width); return NSERROR_OK; diff --git a/render/layout.c b/render/layout.c index ba1d8e150..8c3374bcf 100644 --- a/render/layout.c +++ b/render/layout.c @@ -47,6 +47,7 @@ #include "utils/talloc.h" #include "utils/utils.h" #include "utils/nsoption.h" +#include "netsurf/inttypes.h" #include "netsurf/content.h" #include "netsurf/browser_window.h" #include "netsurf/layout.h" @@ -2442,7 +2443,7 @@ static bool layout_block_object(struct box *block) block->type == BOX_TABLE_CELL); assert(block->object); - NSLOG(layout, DEBUG, "block %p, object %s, width %i", block, + NSLOG(layout, DEBUG, "block %p, object %p, width %i", block, hlcache_handle_get_url(block->object), block->width); if (content_get_type(block->object) == CONTENT_HTML) { @@ -3888,12 +3889,17 @@ layout_text_box_split(html_content *content, c2->parent->last = c2; NSLOG(layout, DEBUG, - "split_box %p len: %u \"%.*s\"", - split_box, split_box->length, split_box->length, + "split_box %p len: %" PRIsizet " \"%.*s\"", + split_box, + split_box->length, + (int)split_box->length, split_box->text); NSLOG(layout, DEBUG, - " new_box %p len: %u \"%.*s\"", c2, - c2->length, c2->length, c2->text); + " new_box %p len: %" PRIsizet " \"%.*s\"", + c2, + c2->length, + (int)c2->length, + c2->text); return true; } -- cgit v1.2.3