libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-03-02 04:55:35 +08:00
Code Issues Projects Releases Wiki Activity

* mmap.cc: Use proper format specifiers for _off64_t and size_t in

Browse Source 
format strings passed to syscall_printf () and debug_printf ()
	throughout.
This commit is contained in:
Corinna Vinschen 2003-07-21 13:06:49 +00:00
parent 522483e4f6
commit d432ac751b
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-21 Pavel Tsekov <ptsekov@gmx.net>
* mmap.cc: Use proper format specifiers for _off64_t and size_t in
format strings passed to syscall_printf () and debug_printf ()
throughout.
2003-07-18 Pierre Humblet <pierre.humblet@ieee.org> 2003-07-18 Pierre Humblet <pierre.humblet@ieee.org>
* security.cc (verify_token): Fix white space and style. * security.cc (verify_token): Fix white space and style.

18
winsup/cygwin/mmap.cc
View File

@ -123,12 +123,12 @@ mmap_record::alloc_map (_off64_t off, DWORD len)
len = PAGE_CNT (len) * getpagesize (); len = PAGE_CNT (len) * getpagesize ();
if (off > 0 && if (off > 0 &&
!VirtualProtect (base_address_, off, PAGE_NOACCESS, &old_prot)) !VirtualProtect (base_address_, off, PAGE_NOACCESS, &old_prot))
syscall_printf ("VirtualProtect(%x,%d) failed: %E", base_address_, off); syscall_printf ("VirtualProtect(%x,%D) failed: %E", base_address_, off);
if (off + len < size_to_map_ if (off + len < size_to_map_
&& !VirtualProtect (base_address_ + off + len, && !VirtualProtect (base_address_ + off + len,
size_to_map_ - len - off, size_to_map_ - len - off,
PAGE_NOACCESS, &old_prot)) PAGE_NOACCESS, &old_prot))
syscall_printf ("VirtualProtect(%x,%d) failed: %E", syscall_printf ("VirtualProtect(%x,%D) failed: %E",
base_address_ + off + len, size_to_map_ - len - off); base_address_ + off + len, size_to_map_ - len - off);
off /= getpagesize (); off /= getpagesize ();
len /= getpagesize (); len /= getpagesize ();
@ -158,7 +158,7 @@ mmap_record::map_map (_off64_t off, DWORD len)
break; break;
} }
debug_printf ("map_map (fd=%d, off=%D, len=%d)", fdesc_, off, len); debug_printf ("map_map (fd=%d, off=%D, len=%u)", fdesc_, off, len);
len = PAGE_CNT (len); len = PAGE_CNT (len);
if ((off = find_empty (len)) == (DWORD)-1) if ((off = find_empty (len)) == (DWORD)-1)
@ -435,7 +435,7 @@ static map *mmapped_areas;
extern "C" caddr_t extern "C" caddr_t
mmap64 (caddr_t addr, size_t len, int prot, int flags, int fd, _off64_t off) mmap64 (caddr_t addr, size_t len, int prot, int flags, int fd, _off64_t off)
{ {
syscall_printf ("addr %x, len %d, prot %x, flags %x, fd %d, off %D", syscall_printf ("addr %x, len %u, prot %x, flags %x, fd %d, off %D",
addr, len, prot, flags, fd, off); addr, len, prot, flags, fd, off);
static DWORD granularity; static DWORD granularity;
@ -618,7 +618,7 @@ mmap (caddr_t addr, size_t len, int prot, int flags, int fd, _off_t off)
extern "C" int extern "C" int
munmap (caddr_t addr, size_t len) munmap (caddr_t addr, size_t len)
{ {
syscall_printf ("munmap (addr %x, len %d)", addr, len); syscall_printf ("munmap (addr %x, len %u)", addr, len);
/* Error conditions according to SUSv3 */ /* Error conditions according to SUSv3 */
if (!addr || ((DWORD)addr % getpagesize ()) || !len if (!addr || ((DWORD)addr % getpagesize ()) || !len
@ -675,7 +675,7 @@ munmap (caddr_t addr, size_t len)
extern "C" int extern "C" int
msync (caddr_t addr, size_t len, int flags) msync (caddr_t addr, size_t len, int flags)
{ {
syscall_printf ("addr = %x, len = %d, flags = %x", syscall_printf ("addr = %x, len = %u, flags = %x",
addr, len, flags); addr, len, flags);
/* However, check flags for validity. */ /* However, check flags for validity. */
@ -843,7 +843,7 @@ fhandler_disk_file::mmap (caddr_t *addr, size_t len, DWORD access,
if (!base && !(flags & MAP_FIXED)) if (!base && !(flags & MAP_FIXED))
base = MapViewOfFileEx (h, access, high, low, len, NULL); base = MapViewOfFileEx (h, access, high, low, len, NULL);
debug_printf ("%x = MapViewOfFileEx (h:%x, access:%x, 0, off:%D, " debug_printf ("%x = MapViewOfFileEx (h:%x, access:%x, 0, off:%D, "
"len:%d, addr:%x)", base, h, access, off, len, *addr); "len:%u, addr:%x)", base, h, access, off, len, *addr);
if (!base || ((flags & MAP_FIXED) && base != *addr)) if (!base || ((flags & MAP_FIXED) && base != *addr))
{ {
if (!base) if (!base)
@ -907,7 +907,7 @@ mprotect (caddr_t addr, size_t len, int prot)
DWORD old_prot; DWORD old_prot;
DWORD new_prot = 0; DWORD new_prot = 0;
syscall_printf ("mprotect (addr %x, len %d, prot %x)", addr, len, prot); syscall_printf ("mprotect (addr %x, len %u, prot %x)", addr, len, prot);
if (!wincap.virtual_protect_works_on_shared_pages () if (!wincap.virtual_protect_works_on_shared_pages ()
&& addr >= (caddr_t)0x80000000 && addr <= (caddr_t)0xBFFFFFFF) && addr >= (caddr_t)0x80000000 && addr <= (caddr_t)0xBFFFFFFF)
@ -985,7 +985,7 @@ fixup_mmaps_after_fork (HANDLE parent)
{ {
mmap_record *rec = map_list->recs + li; mmap_record *rec = map_list->recs + li;
debug_printf ("fd %d, h %x, access %x, offset %d, size %d, address %p", debug_printf ("fd %d, h %x, access %x, offset %D, size %u, address %p",
rec->get_fd (), rec->get_handle (), rec->get_access (), rec->get_fd (), rec->get_handle (), rec->get_access (),
rec->get_offset (), rec->get_size (), rec->get_address ()); rec->get_offset (), rec->get_size (), rec->get_address ());