projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
native_client
/
src
/
trusted
/
service_runtime
/
sys_memory.c
diff --git
a/src/native_client/src/trusted/service_runtime/sys_memory.c
b/src/native_client/src/trusted/service_runtime/sys_memory.c
index
440fe11
..
92b0dc6
100644
(file)
--- a/
src/native_client/src/trusted/service_runtime/sys_memory.c
+++ b/
src/native_client/src/trusted/service_runtime/sys_memory.c
@@
-337,8
+337,8
@@
int32_t NaClSysMmapIntern(struct NaClApp *nap,
*/
if (offset < 0) {
NaClLog(1, /* application bug */
*/
if (offset < 0) {
NaClLog(1, /* application bug */
- "NaClSysMmap: negative file offset: %"NACL_PRId
NACL_OFF
"\n",
- offset);
+ "NaClSysMmap: negative file offset: %"NACL_PRId
64
"\n",
+
(int64_t)
offset);
map_result = -NACL_ABI_EINVAL;
goto cleanup;
}
map_result = -NACL_ABI_EINVAL;
goto cleanup;
}
@@
-423,9
+423,6
@@
int32_t NaClSysMmapIntern(struct NaClApp *nap,
}
file_bytes = file_size - offset;
}
file_bytes = file_size - offset;
- NaClLog(4,
- "NaClSysMmapIntern: file_bytes 0x%016"NACL_PRIxNACL_OFF"\n",
- file_bytes);
if ((nacl_off64_t) kMaxUsableFileSize < file_bytes) {
host_rounded_file_bytes = kMaxUsableFileSize;
} else {
if ((nacl_off64_t) kMaxUsableFileSize < file_bytes) {
host_rounded_file_bytes = kMaxUsableFileSize;
} else {
@@
-973,7
+970,7
@@
int32_t NaClSysMmap(struct NaClAppThread *natp,
}
offset = *(nacl_abi_off_t volatile *) sysaddr;
}
offset = *(nacl_abi_off_t volatile *) sysaddr;
- NaClLog(4, " offset = 0x%08"NACL_PRIx
NACL_OFF"\n",
offset);
+ NaClLog(4, " offset = 0x%08"NACL_PRIx
64"\n", (uint64_t)
offset);
retval = NaClSysMmapIntern(nap, start, length, prot, flags, d, offset);
cleanup:
retval = NaClSysMmapIntern(nap, start, length, prot, flags, d, offset);
cleanup: