From cc668dc7e65aec51fee19bcc7b1791b317cee0fb Mon Sep 17 00:00:00 2001 From: Frederic Koehler Date: Sat, 11 Aug 2012 18:38:59 -0400 Subject: [PATCH 2/2] tt (tooltalk): Kill some warnings Includes some potentially bad pointer/int conversions --- cde/lib/tt/mini_isam/isam_impl.h | 2 +- cde/lib/tt/mini_isam/isdatconv.c | 2 +- cde/lib/tt/mini_isam/isdiskbufs2.c | 2 +- cde/lib/tt/mini_isam/isstart.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cde/lib/tt/mini_isam/isam_impl.h b/cde/lib/tt/mini_isam/isam_impl.h index 2e851c0..f708b3c 100644 --- a/cde/lib/tt/mini_isam/isam_impl.h +++ b/cde/lib/tt/mini_isam/isam_impl.h @@ -371,7 +371,7 @@ typedef struct maphdr { /* * Macro to get pointer to structure if pointer to some element is known */ -#define GETBASE(p,s,e) ((struct s *) ((char *)(p) - (int)&((struct s *)0)->e)) +#define GETBASE(p,s,e) ((struct s *) ((char *)(p) - (char *)&((struct s *)0)->e)) /* In memory sorting object */ typedef struct issort { diff --git a/cde/lib/tt/mini_isam/isdatconv.c b/cde/lib/tt/mini_isam/isdatconv.c index 1f7e3de..32ba169 100644 --- a/cde/lib/tt/mini_isam/isdatconv.c +++ b/cde/lib/tt/mini_isam/isdatconv.c @@ -194,7 +194,7 @@ ldchar2(src, len, dst) /* Load the entire string. */ memcpy((void *) dst, (const void *) src, len); - *(dst + len) = NULL; + *(dst + len) = '\0'; } int diff --git a/cde/lib/tt/mini_isam/isdiskbufs2.c b/cde/lib/tt/mini_isam/isdiskbufs2.c index 99277a4..ee9de43 100644 --- a/cde/lib/tt/mini_isam/isdiskbufs2.c +++ b/cde/lib/tt/mini_isam/isdiskbufs2.c @@ -51,7 +51,7 @@ extern struct dlink *_isdln_next(), *_isdln_first(); #define ISHASHHDRS 256 /* Must be a power of two */ #define ISHASHMASK (ISHASHHDRS-1) -#define __hashblkno(fcb,blkno) (((int)(fcb)+(blkno)) & ISHASHMASK) +#define __hashblkno(fcb,blkno) (((size_t)(fcb)+(blkno)) & ISHASHMASK) #define base ((char *)0) diff --git a/cde/lib/tt/mini_isam/isstart.c b/cde/lib/tt/mini_isam/isstart.c index 1204ba4..84f0fad 100644 --- a/cde/lib/tt/mini_isam/isstart.c +++ b/cde/lib/tt/mini_isam/isstart.c @@ -42,6 +42,7 @@ static char sccsid[] = "@(#)isstart.c 1.9 89/07/17 Copyr 1988 Sun Micro"; #include "isam_impl.h" #include +#include static int _amstart(); @@ -591,7 +592,7 @@ _amstart(isfhandle, record, reclen, readmode, /* Clean-up work. */ if (newcrp != NULL) - free((char *)newcrp); + free(newcrp); _isdisk_commit(); /* This will only check * that we unfixed all fixed -- 1.7.11.2