Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/5f1defd4a7700f8f39f8b30c25fada31c8bb1b71
...commit
http://git.netsurf-browser.org/netsurf.git/commit/5f1defd4a7700f8f39f8b30c25fada31c8bb1b71
...tree
http://git.netsurf-browser.org/netsurf.git/tree/5f1defd4a7700f8f39f8b30c25fada31c8bb1b71
The branch, master has been updated
via 5f1defd4a7700f8f39f8b30c25fada31c8bb1b71 (commit)
from a6c595f4f305c43d9da825ad31c0011fe02d0684 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5f1defd4a7700f8f39f8b30c25fada31c8bb1b71
commit 5f1defd4a7700f8f39f8b30c25fada31c8bb1b71
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix size_t format specifiers
diff --git a/content/handlers/html/layout.c b/content/handlers/html/layout.c
index ee12128..d52dbf8 100644
--- a/content/handlers/html/layout.c
+++ b/content/handlers/html/layout.c
@@ -3617,8 +3617,8 @@ layout_line(struct box *first,
NSLOG(layout, DEBUG,
- "splitting: split_box %p \"%.*s\", spilt %zu, w %i, "
- "left %p, right %p, inline_count %u",
+ "splitting: split_box %p \"%.*s\", spilt %"PRIsizet
+ ", w %i, left %p, right %p, inline_count %u",
split_box,
(int)split_box->length,
split_box->text,
@@ -3689,7 +3689,8 @@ layout_line(struct box *first,
/* fit as many words as possible */
assert(split != 0);
- NSLOG(layout, DEBUG, "'%.*s' %i %zu %i",
+ NSLOG(layout, DEBUG,
+ "'%.*s' %i %"PRIsizet" %i",
(int)split_box->length, split_box->text,
x1 - x0, split, w);
diff --git a/content/llcache.c b/content/llcache.c
index 84f202a..5aa8a9a 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -2696,9 +2696,10 @@ static void llcache_persist(void *p)
total_elapsed += elapsed;
total_bandwidth = (total_written * 1000) / total_elapsed;
- NSLOG(llcache, DEBUG, "Wrote %zd bytes in %lums bw:%lu %s",
- written, elapsed, (written * 1000) / elapsed,
- nsurl_access(lst[idx]->url) );
+ NSLOG(llcache, DEBUG,
+ "Wrote %"PRIssizet" bytes in %lums bw:%lu %s",
+ written, elapsed, (written * 1000) / elapsed,
+ nsurl_access(lst[idx]->url) );
/* check to for the time quantum or the size
* (bandwidth) for this run being exceeded.
@@ -2763,8 +2764,9 @@ static void llcache_persist(void *p)
llcache->total_written += total_written;
llcache->total_elapsed += total_elapsed;
- NSLOG(llcache, DEBUG, "writeout size:%zd time:%lu bandwidth:%lubytes/s",
- total_written, total_elapsed, total_bandwidth);
+ NSLOG(llcache, DEBUG,
+ "writeout size:%"PRIssizet" time:%lu bandwidth:%lubytes/s",
+ total_written, total_elapsed, total_bandwidth);
NSLOG(llcache, DEBUG, "Rescheduling writeout in %dms", next);
guit->misc->schedule(next, llcache_persist, NULL);
@@ -3431,9 +3433,9 @@ void llcache_clean(bool purge)
llcache_size -= object->source_len;
- NSLOG(llcache, DEBUG, "Freeing source data for %p
len:%zd",
- object,
- object->source_len);
+ NSLOG(llcache, DEBUG,
+ "Freeing source data for %p len:%"PRIssizet,
+ object, object->source_len);
}
}
@@ -3452,7 +3454,7 @@ void llcache_clean(bool purge)
(object->store_state == LLCACHE_STATE_DISC) &&
(object->source_data == NULL)) {
NSLOG(llcache, DEBUG,
- "discarding backed object len:%zd age:%ld (%p) %s",
+ "discarding backed object len:%"PRIssizet" age:%ld
(%p) %s",
object->source_len,
(long)(time(NULL) - object->last_used),
object,
@@ -3483,7 +3485,7 @@ void llcache_clean(bool purge)
(object->fetch.outstanding_query == false) &&
(object->store_state == LLCACHE_STATE_RAM)) {
NSLOG(llcache, DEBUG,
- "discarding fresh object len:%zd age:%ld (%p) %s",
+ "discarding fresh object len:%"PRIssizet" age:%ld
(%p) %s",
object->source_len,
(long)(time(NULL) - object->last_used),
object,
diff --git a/utils/nsurl/parse.c b/utils/nsurl/parse.c
index 7ce1e45..3e3c521 100644
--- a/utils/nsurl/parse.c
+++ b/utils/nsurl/parse.c
@@ -37,6 +37,8 @@
#include <string.h>
#include <strings.h>
+#include "netsurf/inttypes.h"
+
#include "utils/ascii.h"
#include "utils/corestrings.h"
#include "utils/errors.h"
@@ -460,19 +462,29 @@ static void nsurl__get_string_markers(const char * const
url_s,
marker.fragment = marker.end;
}
- NSLOG(netsurf, DEEPDEBUG, "marker.start: %zu", marker.start);
- NSLOG(netsurf, DEEPDEBUG, "marker.scheme_end: %zu", marker.scheme_end);
- NSLOG(netsurf, DEEPDEBUG, "marker.authority: %zu", marker.authority);
-
- NSLOG(netsurf, DEEPDEBUG, "marker.colon_first: %zu",
marker.colon_first);
- NSLOG(netsurf, DEEPDEBUG, "marker.at: %zu", marker.at);
- NSLOG(netsurf, DEEPDEBUG, "marker.colon_last: %zu", marker.colon_last);
-
- NSLOG(netsurf, DEEPDEBUG, "marker.path: %zu", marker.path);
- NSLOG(netsurf, DEEPDEBUG, "marker.query: %zu", marker.query);
- NSLOG(netsurf, DEEPDEBUG, "marker.fragment: %zu", marker.fragment);
-
- NSLOG(netsurf, DEEPDEBUG, "marker.end: %zu", marker.end);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.start: %"PRIsizet, marker.start);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.scheme_end: %"PRIsizet, marker.scheme_end);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.authority: %"PRIsizet, marker.authority);
+
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.colon_first: %"PRIsizet, marker.colon_first);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.at: %"PRIsizet, marker.at);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.colon_last: %"PRIsizet, marker.colon_last);
+
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.path: %"PRIsizet, marker.path);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.query: %"PRIsizet, marker.query);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.fragment: %"PRIsizet, marker.fragment);
+
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.end: %"PRIsizet, marker.end);
/* Got all the URL components pegged out now */
*markers = marker;
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/layout.c | 7 ++++---
content/llcache.c | 22 ++++++++++++----------
utils/nsurl/parse.c | 38 +++++++++++++++++++++++++-------------
3 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/content/handlers/html/layout.c b/content/handlers/html/layout.c
index ee12128..d52dbf8 100644
--- a/content/handlers/html/layout.c
+++ b/content/handlers/html/layout.c
@@ -3617,8 +3617,8 @@ layout_line(struct box *first,
NSLOG(layout, DEBUG,
- "splitting: split_box %p \"%.*s\", spilt %zu, w %i, "
- "left %p, right %p, inline_count %u",
+ "splitting: split_box %p \"%.*s\", spilt %"PRIsizet
+ ", w %i, left %p, right %p, inline_count %u",
split_box,
(int)split_box->length,
split_box->text,
@@ -3689,7 +3689,8 @@ layout_line(struct box *first,
/* fit as many words as possible */
assert(split != 0);
- NSLOG(layout, DEBUG, "'%.*s' %i %zu %i",
+ NSLOG(layout, DEBUG,
+ "'%.*s' %i %"PRIsizet" %i",
(int)split_box->length, split_box->text,
x1 - x0, split, w);
diff --git a/content/llcache.c b/content/llcache.c
index 84f202a..5aa8a9a 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -2696,9 +2696,10 @@ static void llcache_persist(void *p)
total_elapsed += elapsed;
total_bandwidth = (total_written * 1000) / total_elapsed;
- NSLOG(llcache, DEBUG, "Wrote %zd bytes in %lums bw:%lu %s",
- written, elapsed, (written * 1000) / elapsed,
- nsurl_access(lst[idx]->url) );
+ NSLOG(llcache, DEBUG,
+ "Wrote %"PRIssizet" bytes in %lums bw:%lu %s",
+ written, elapsed, (written * 1000) / elapsed,
+ nsurl_access(lst[idx]->url) );
/* check to for the time quantum or the size
* (bandwidth) for this run being exceeded.
@@ -2763,8 +2764,9 @@ static void llcache_persist(void *p)
llcache->total_written += total_written;
llcache->total_elapsed += total_elapsed;
- NSLOG(llcache, DEBUG, "writeout size:%zd time:%lu bandwidth:%lubytes/s",
- total_written, total_elapsed, total_bandwidth);
+ NSLOG(llcache, DEBUG,
+ "writeout size:%"PRIssizet" time:%lu bandwidth:%lubytes/s",
+ total_written, total_elapsed, total_bandwidth);
NSLOG(llcache, DEBUG, "Rescheduling writeout in %dms", next);
guit->misc->schedule(next, llcache_persist, NULL);
@@ -3431,9 +3433,9 @@ void llcache_clean(bool purge)
llcache_size -= object->source_len;
- NSLOG(llcache, DEBUG, "Freeing source data for %p
len:%zd",
- object,
- object->source_len);
+ NSLOG(llcache, DEBUG,
+ "Freeing source data for %p len:%"PRIssizet,
+ object, object->source_len);
}
}
@@ -3452,7 +3454,7 @@ void llcache_clean(bool purge)
(object->store_state == LLCACHE_STATE_DISC) &&
(object->source_data == NULL)) {
NSLOG(llcache, DEBUG,
- "discarding backed object len:%zd age:%ld (%p) %s",
+ "discarding backed object len:%"PRIssizet" age:%ld
(%p) %s",
object->source_len,
(long)(time(NULL) - object->last_used),
object,
@@ -3483,7 +3485,7 @@ void llcache_clean(bool purge)
(object->fetch.outstanding_query == false) &&
(object->store_state == LLCACHE_STATE_RAM)) {
NSLOG(llcache, DEBUG,
- "discarding fresh object len:%zd age:%ld (%p) %s",
+ "discarding fresh object len:%"PRIssizet" age:%ld
(%p) %s",
object->source_len,
(long)(time(NULL) - object->last_used),
object,
diff --git a/utils/nsurl/parse.c b/utils/nsurl/parse.c
index 7ce1e45..3e3c521 100644
--- a/utils/nsurl/parse.c
+++ b/utils/nsurl/parse.c
@@ -37,6 +37,8 @@
#include <string.h>
#include <strings.h>
+#include "netsurf/inttypes.h"
+
#include "utils/ascii.h"
#include "utils/corestrings.h"
#include "utils/errors.h"
@@ -460,19 +462,29 @@ static void nsurl__get_string_markers(const char * const
url_s,
marker.fragment = marker.end;
}
- NSLOG(netsurf, DEEPDEBUG, "marker.start: %zu", marker.start);
- NSLOG(netsurf, DEEPDEBUG, "marker.scheme_end: %zu", marker.scheme_end);
- NSLOG(netsurf, DEEPDEBUG, "marker.authority: %zu", marker.authority);
-
- NSLOG(netsurf, DEEPDEBUG, "marker.colon_first: %zu",
marker.colon_first);
- NSLOG(netsurf, DEEPDEBUG, "marker.at: %zu", marker.at);
- NSLOG(netsurf, DEEPDEBUG, "marker.colon_last: %zu", marker.colon_last);
-
- NSLOG(netsurf, DEEPDEBUG, "marker.path: %zu", marker.path);
- NSLOG(netsurf, DEEPDEBUG, "marker.query: %zu", marker.query);
- NSLOG(netsurf, DEEPDEBUG, "marker.fragment: %zu", marker.fragment);
-
- NSLOG(netsurf, DEEPDEBUG, "marker.end: %zu", marker.end);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.start: %"PRIsizet, marker.start);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.scheme_end: %"PRIsizet, marker.scheme_end);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.authority: %"PRIsizet, marker.authority);
+
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.colon_first: %"PRIsizet, marker.colon_first);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.at: %"PRIsizet, marker.at);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.colon_last: %"PRIsizet, marker.colon_last);
+
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.path: %"PRIsizet, marker.path);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.query: %"PRIsizet, marker.query);
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.fragment: %"PRIsizet, marker.fragment);
+
+ NSLOG(netsurf, DEEPDEBUG,
+ "marker.end: %"PRIsizet, marker.end);
/* Got all the URL components pegged out now */
*markers = marker;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
