Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/8b88e440905708ad9354fb72afff206d6208a760
...commit
http://git.netsurf-browser.org/netsurf.git/commit/8b88e440905708ad9354fb72afff206d6208a760
...tree
http://git.netsurf-browser.org/netsurf.git/tree/8b88e440905708ad9354fb72afff206d6208a760
The branch, master has been updated
via 8b88e440905708ad9354fb72afff206d6208a760 (commit)
via b525293a95026fb581e311d4646dfe63e83eee3e (commit)
from 9c93ed1bca859e5b5cb3c018be327fb91213c558 (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=8b88e440905708ad9354fb72afff206d6208a760
commit 8b88e440905708ad9354fb72afff206d6208a760
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix time_t logging
diff --git a/content/llcache.c b/content/llcache.c
index fd2a528..d48a31b 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -3327,7 +3327,7 @@ void llcache_clean(bool purge)
NSLOG(llcache, DEBUG,
"discarding fresh object len:%zd age:%ld (%p) %s",
object->source_len,
- time(NULL) - object->last_used,
+ (long)(time(NULL) - object->last_used),
object,
nsurl_access(object->url));
diff --git a/frontends/monkey/schedule.c b/frontends/monkey/schedule.c
index d3e442a..3d76997 100644
--- a/frontends/monkey/schedule.c
+++ b/frontends/monkey/schedule.c
@@ -185,7 +185,7 @@ int monkey_schedule_run(void)
timersub(&nexttime, &tv, &rettime);
NSLOG(schedule, DEBUG, "returning time to next event as %ldms",
- (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000));
+ (long)((rettime.tv_sec * 1000) + (rettime.tv_usec / 1000)));
/* return next event time in milliseconds (24days max wait) */
return (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=b525293a95026fb581e311d4646dfe63e83eee3e
commit b525293a95026fb581e311d4646dfe63e83eee3e
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Fix up log call parameters
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index 9c050a4..90d0768 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -1922,10 +1922,19 @@ nserror win32_window_set_scroll(struct gui_window *gw,
const struct rect *rect)
r.bottom = gw->height + 1;
r.left = 0;
r.right = gw->width + 1;
- ScrollWindowEx(gw->drawingarea, - gw->requestscrollx, -
gw->requestscrolly, &r, NULL, NULL, &redraw, SW_INVALIDATE);
+ ScrollWindowEx(gw->drawingarea,
+ - gw->requestscrollx,
+ - gw->requestscrolly,
+ &r,
+ NULL,
+ NULL,
+ &redraw,
+ SW_INVALIDATE);
NSLOG(netsurf, DEEPDEBUG,
"ScrollWindowEx %d, %d",
- - w->requestscrollx, - w->requestscrolly);
+ - gw->requestscrollx,
+ - gw->requestscrolly);
+
gw->scrolly += gw->requestscrolly;
gw->scrollx += gw->requestscrollx;
gw->requestscrollx = 0;
-----------------------------------------------------------------------
Summary of changes:
content/llcache.c | 2 +-
frontends/monkey/schedule.c | 2 +-
frontends/windows/window.c | 13 +++++++++++--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/content/llcache.c b/content/llcache.c
index fd2a528..d48a31b 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -3327,7 +3327,7 @@ void llcache_clean(bool purge)
NSLOG(llcache, DEBUG,
"discarding fresh object len:%zd age:%ld (%p) %s",
object->source_len,
- time(NULL) - object->last_used,
+ (long)(time(NULL) - object->last_used),
object,
nsurl_access(object->url));
diff --git a/frontends/monkey/schedule.c b/frontends/monkey/schedule.c
index d3e442a..3d76997 100644
--- a/frontends/monkey/schedule.c
+++ b/frontends/monkey/schedule.c
@@ -185,7 +185,7 @@ int monkey_schedule_run(void)
timersub(&nexttime, &tv, &rettime);
NSLOG(schedule, DEBUG, "returning time to next event as %ldms",
- (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000));
+ (long)((rettime.tv_sec * 1000) + (rettime.tv_usec / 1000)));
/* return next event time in milliseconds (24days max wait) */
return (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000);
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index 9c050a4..90d0768 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -1922,10 +1922,19 @@ nserror win32_window_set_scroll(struct gui_window *gw,
const struct rect *rect)
r.bottom = gw->height + 1;
r.left = 0;
r.right = gw->width + 1;
- ScrollWindowEx(gw->drawingarea, - gw->requestscrollx, -
gw->requestscrolly, &r, NULL, NULL, &redraw, SW_INVALIDATE);
+ ScrollWindowEx(gw->drawingarea,
+ - gw->requestscrollx,
+ - gw->requestscrolly,
+ &r,
+ NULL,
+ NULL,
+ &redraw,
+ SW_INVALIDATE);
NSLOG(netsurf, DEEPDEBUG,
"ScrollWindowEx %d, %d",
- - w->requestscrollx, - w->requestscrolly);
+ - gw->requestscrollx,
+ - gw->requestscrolly);
+
gw->scrolly += gw->requestscrolly;
gw->scrollx += gw->requestscrollx;
gw->requestscrollx = 0;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
