walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 64bit issues with debug prints

This commit is contained in:
Behdad Esfahbod 2010-07-15 11:21:34 -07:00
parent fd56ae4963
commit 17e9ff938b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-blob.c
View File

@ -247,15 +247,15 @@ _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
return FALSE; return FALSE;
} }
if (HB_DEBUG_BLOB) if (HB_DEBUG_BLOB)
fprintf (stderr, "%p %s: pagesize is %u\n", blob, __FUNCTION__, pagesize); fprintf (stderr, "%p %s: pagesize is %lu\n", blob, __FUNCTION__, (unsigned long) pagesize);
mask = ~(pagesize-1); mask = ~(pagesize-1);
addr = (const char *) (((uintptr_t) blob->data) & mask); addr = (const char *) (((uintptr_t) blob->data) & mask);
length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask) - addr; length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask) - addr;
if (HB_DEBUG_BLOB) if (HB_DEBUG_BLOB)
fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%d bytes)\n", fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%lu bytes)\n",
blob, __FUNCTION__, blob, __FUNCTION__,
addr, addr+length, length); addr, addr+length, (unsigned long) length);
if (-1 == mprotect ((void *) addr, length, PROT_READ | PROT_WRITE)) { if (-1 == mprotect ((void *) addr, length, PROT_READ | PROT_WRITE)) {
if (HB_DEBUG_BLOB) if (HB_DEBUG_BLOB)
fprintf (stderr, "%p %s: %s\n", blob, __FUNCTION__, strerror (errno)); fprintf (stderr, "%p %s: %s\n", blob, __FUNCTION__, strerror (errno));
@ -263,9 +263,9 @@ _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
} }
if (HB_DEBUG_BLOB) if (HB_DEBUG_BLOB)
fprintf (stderr, "%p %s: successfully made [%p..%p] (%d bytes) writable\n", fprintf (stderr, "%p %s: successfully made [%p..%p] (%lu bytes) writable\n",
blob, __FUNCTION__, blob, __FUNCTION__,
addr, addr+length, length); addr, addr+length, (unsigned long) length);
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;

5
src/hb-open-type-private.hh
View File

@ -191,8 +191,9 @@ struct hb_sanitize_context_t
this->debug_depth = 0; this->debug_depth = 0;
if (HB_DEBUG_SANITIZE) if (HB_DEBUG_SANITIZE)
fprintf (stderr, "sanitize %p init [%p..%p] (%u bytes)\n", fprintf (stderr, "sanitize %p init [%p..%p] (%lu bytes)\n",
this->blob, this->start, this->end, this->end - this->start); this->blob, this->start, this->end,
(unsigned long) (this->end - this->start));
} }
inline void finish (void) inline void finish (void)