tt (tooltalk): Kill some warnings

Includes some potentially bad pointer/int conversions

diff --git a/cde/lib/tt/mini_isam/isam_impl.h b/cde/lib/tt/mini_isam/isam_impl.h
index 2e851c03d99de43e11074f2ccba114d573eb53bf..f708b3c22f15711beef1b6f0926c4015486f2a72 100644 (file)
--- 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 1f7e3de483c1f3629b9dc9c59dda83bdf9f6d381..32ba1696eafaf31863b6259804f5a59321f2ca61 100644 (file)
--- 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 99277a4bcc83bb954f8a1c04943d3b15121f3652..ee9de43f891fb1890c9023669af0be197ceea9ad 100644 (file)
--- 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 1204ba453cae63ff8859401e3f2fb3c1a06dba83..84f0fad8bf8bc06bf5138db5ef382165d1efb6fd 100644 (file)
--- 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 <sys/time.h>
+#include <stdlib.h>
 
 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