From 613ec39d49add3b1b70909c8bc51542f14a14ef4 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Tue, 20 Jan 2009 20:01:18 +0000 Subject: [PATCH] ebl Use intptr_t instead of long to be sure to handle 64bit pointer git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8389 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/lib/message.c | 4 ++-- bacula/src/lib/smartall.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c index 24a25f32d8..2ca4ab6322 100644 --- a/bacula/src/lib/message.c +++ b/bacula/src/lib/message.c @@ -370,10 +370,10 @@ static void make_unique_mail_filename(JCR *jcr, POOLMEM *&name, DEST *d) { if (jcr) { Mmsg(name, "%s/%s.%s.%d.mail", working_directory, my_name, - jcr->Job, (int)(long)d); + jcr->Job, (int)(intptr_t)d); } else { Mmsg(name, "%s/%s.%s.%d.mail", working_directory, my_name, - my_name, (int)(long)d); + my_name, (int)(intptr_t)d); } Dmsg1(850, "mailname=%s\n", name); } diff --git a/bacula/src/lib/smartall.c b/bacula/src/lib/smartall.c index a0a57d278b..acc27295ae 100644 --- a/bacula/src/lib/smartall.c +++ b/bacula/src/lib/smartall.c @@ -134,7 +134,7 @@ static void *smalloc(const char *fname, int lineno, unsigned int nbytes) head->ablineno = (sm_ushort)lineno; head->abin_use = true; /* Emplace end-clobber detector at end of buffer */ - buf[nbytes - 1] = (uint8_t)((((long) buf) & 0xFF) ^ 0xC5); + buf[nbytes - 1] = (uint8_t)((((intptr_t) buf) & 0xFF) ^ 0xC5); buf += HEAD_SIZE; /* Increment to user data start */ if (++sm_buffers > sm_max_buffers) { sm_max_buffers = sm_buffers; @@ -212,7 +212,7 @@ void sm_free(const char *file, int line, void *fp) allocated space in the buffer by comparing the end of buffer checksum with the address of the buffer. */ - if (((unsigned char *)cp)[head->ablen - 1] != ((((long) cp) & 0xFF) ^ 0xC5)) { + if (((unsigned char *)cp)[head->ablen - 1] != ((((intptr_t) cp) & 0xFF) ^ 0xC5)) { V(mutex); Emsg2(M_ABORT, 0, _("Buffer overrun called from %s:%d\n"), file, line); } @@ -463,7 +463,7 @@ int sm_check_rtn(const char *fname, int lineno, bool bufdump) bad |= 0x2; } if (((unsigned char *) ap)[((struct abufhead *)ap)->ablen - 1] != - ((((long) ap) & 0xFF) ^ 0xC5)) { + ((((intptr_t) ap) & 0xFF) ^ 0xC5)) { bad |= 0x4; } } else { -- 2.39.5