Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/6d8b9a9bb42c9455cf168715aa0ceb50fcbc86e7
...commit
http://git.netsurf-browser.org/netsurf.git/commit/6d8b9a9bb42c9455cf168715aa0ceb50fcbc86e7
...tree
http://git.netsurf-browser.org/netsurf.git/tree/6d8b9a9bb42c9455cf168715aa0ceb50fcbc86e7
The branch, master has been updated
via 6d8b9a9bb42c9455cf168715aa0ceb50fcbc86e7 (commit)
from af158650d82360a6c9d6d7f120372240e2c31a88 (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=6d8b9a9bb42c9455cf168715aa0ceb50fcbc86e7
commit 6d8b9a9bb42c9455cf168715aa0ceb50fcbc86e7
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
fs_backing_store: Do not use %jx because amigaos3 can't render it properly
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 7c10498..802a19e 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -1609,24 +1609,24 @@ static nserror store_write_block(struct store_state
*state,
offst = (unsigned int)bi << log2_block_size[elem_idx];
wr = nsu_pwrite(state->blocks[elem_idx][bf].fd,
- bse->elem[elem_idx].data,
- bse->elem[elem_idx].size,
- offst);
+ bse->elem[elem_idx].data,
+ bse->elem[elem_idx].size,
+ offst);
if (wr != (ssize_t)bse->elem[elem_idx].size) {
NSLOG(netsurf, ERROR,
- "Write failed %"PRIssizet" of %d bytes from %p at 0x%jx
block %d errno %d",
+ "Write failed %"PRIssizet" of %d bytes from %p at
0x%"PRIsizet"x block %d errno %d",
wr,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
- (uintmax_t)offst,
+ (size_t)offst,
bse->elem[elem_idx].block,
errno);
return NSERROR_SAVE_FAILED;
}
NSLOG(netsurf, INFO,
- "Wrote %"PRIssizet" bytes from %p at 0x%jx block %d", wr,
- bse->elem[elem_idx].data, (uintmax_t)offst,
+ "Wrote %"PRIssizet" bytes from %p at 0x%"PRIsizet"x block %d", wr,
+ bse->elem[elem_idx].data, (size_t)offst,
bse->elem[elem_idx].block);
return NSERROR_OK;
@@ -1779,24 +1779,24 @@ static nserror store_read_block(struct store_state
*state,
offst = (unsigned int)bi << log2_block_size[elem_idx];
rd = nsu_pread(state->blocks[elem_idx][bf].fd,
- bse->elem[elem_idx].data,
- bse->elem[elem_idx].size,
- offst);
+ bse->elem[elem_idx].data,
+ bse->elem[elem_idx].size,
+ offst);
if (rd != (ssize_t)bse->elem[elem_idx].size) {
NSLOG(netsurf, ERROR,
- "Failed reading %"PRIssizet" of %d bytes into %p from
0x%jx block %d errno %d",
+ "Failed reading %"PRIssizet" of %d bytes into %p from
0x%"PRIsizet"x block %d errno %d",
rd,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
- (uintmax_t)offst,
+ (size_t)offst,
bse->elem[elem_idx].block,
errno);
return NSERROR_SAVE_FAILED;
}
NSLOG(netsurf, DEEPDEBUG,
- "Read %"PRIssizet" bytes into %p from 0x%jx block %d", rd,
- bse->elem[elem_idx].data, (uintmax_t)offst,
+ "Read %"PRIssizet" bytes into %p from 0x%"PRIsizet"x block %d",
rd,
+ bse->elem[elem_idx].data, (size_t)offst,
bse->elem[elem_idx].block);
return NSERROR_OK;
-----------------------------------------------------------------------
Summary of changes:
content/fs_backing_store.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 7c10498..802a19e 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -1609,24 +1609,24 @@ static nserror store_write_block(struct store_state
*state,
offst = (unsigned int)bi << log2_block_size[elem_idx];
wr = nsu_pwrite(state->blocks[elem_idx][bf].fd,
- bse->elem[elem_idx].data,
- bse->elem[elem_idx].size,
- offst);
+ bse->elem[elem_idx].data,
+ bse->elem[elem_idx].size,
+ offst);
if (wr != (ssize_t)bse->elem[elem_idx].size) {
NSLOG(netsurf, ERROR,
- "Write failed %"PRIssizet" of %d bytes from %p at 0x%jx
block %d errno %d",
+ "Write failed %"PRIssizet" of %d bytes from %p at
0x%"PRIsizet"x block %d errno %d",
wr,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
- (uintmax_t)offst,
+ (size_t)offst,
bse->elem[elem_idx].block,
errno);
return NSERROR_SAVE_FAILED;
}
NSLOG(netsurf, INFO,
- "Wrote %"PRIssizet" bytes from %p at 0x%jx block %d", wr,
- bse->elem[elem_idx].data, (uintmax_t)offst,
+ "Wrote %"PRIssizet" bytes from %p at 0x%"PRIsizet"x block %d", wr,
+ bse->elem[elem_idx].data, (size_t)offst,
bse->elem[elem_idx].block);
return NSERROR_OK;
@@ -1779,24 +1779,24 @@ static nserror store_read_block(struct store_state
*state,
offst = (unsigned int)bi << log2_block_size[elem_idx];
rd = nsu_pread(state->blocks[elem_idx][bf].fd,
- bse->elem[elem_idx].data,
- bse->elem[elem_idx].size,
- offst);
+ bse->elem[elem_idx].data,
+ bse->elem[elem_idx].size,
+ offst);
if (rd != (ssize_t)bse->elem[elem_idx].size) {
NSLOG(netsurf, ERROR,
- "Failed reading %"PRIssizet" of %d bytes into %p from
0x%jx block %d errno %d",
+ "Failed reading %"PRIssizet" of %d bytes into %p from
0x%"PRIsizet"x block %d errno %d",
rd,
bse->elem[elem_idx].size,
bse->elem[elem_idx].data,
- (uintmax_t)offst,
+ (size_t)offst,
bse->elem[elem_idx].block,
errno);
return NSERROR_SAVE_FAILED;
}
NSLOG(netsurf, DEEPDEBUG,
- "Read %"PRIssizet" bytes into %p from 0x%jx block %d", rd,
- bse->elem[elem_idx].data, (uintmax_t)offst,
+ "Read %"PRIssizet" bytes into %p from 0x%"PRIsizet"x block %d",
rd,
+ bse->elem[elem_idx].data, (size_t)offst,
bse->elem[elem_idx].block);
return NSERROR_OK;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
