libdtsvc: Compiler warning prevention

diff --git a/cde/lib/DtSvc/DtUtil1/ActionDb.c b/cde/lib/DtSvc/DtUtil1/ActionDb.c
index 37078fe2995b300db7e6a038139bb17e749716ce..ebde6c9f897d460fc71fd1a7c4e224f1d4f2ebf1 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/ActionDb.c
+++ b/cde/lib/DtSvc/DtUtil1/ActionDb.c
@@ -681,9 +681,10 @@ _DtActCheckRecord(
        int     i;
        char    *s;
        char argnFieldName[
-               sizeof(_DtACTION_TTN_ARG) +      /* ARGn prefix */
+               sizeof(_DtACTION_TTN_ARG) +     /* ARGn prefix */
                3 +                             /* space for 3 decimal digits */
-               sizeof(_DtACTION_TTN_REP_TYPE)]; /* space for longest suffix */
+               sizeof(_DtACTION_TTN_REP_TYPE)  /* space for longest suffix */
+               + 8];                           /* addition space for warning prevention incase the digits are more than 3 */
        char *buf;
 
        myassert(actionType);   /* actionType should never be NULL */

diff --git a/cde/lib/DtSvc/DtUtil1/inttab.c b/cde/lib/DtSvc/DtUtil1/inttab.c
index 98e43668bee7768776c7ea30a01e467555af26ac..fc35c364bb5fe09e34be2b19758217947173aa9e 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/inttab.c
+++ b/cde/lib/DtSvc/DtUtil1/inttab.c
@@ -34,6 +34,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -103,7 +104,7 @@ _DtShmProtoAddInttab(DtShmProtoInttab intlist, unsigned int keyin, int datain)
   intlist_t * ptr = (intlist_t *) intlist;
   int ** data;
 
-  data = (int**)_DtUtilGetHash(ptr->tbl, (unsigned char *)keyin);
+  data = (int**)_DtUtilGetHash(ptr->tbl, (unsigned char *) (intptr_t) keyin);
 
   if(!*data) /* new */ {
     *data = (int *) malloc(sizeof(int));

diff --git a/cde/lib/DtSvc/DtUtil1/strtab.c b/cde/lib/DtSvc/DtUtil1/strtab.c
index a1628d3a9ed255f07a4066e57c800130deb1fbec..afe904671a22bd14882e3e2744b61165da249268 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/strtab.c
+++ b/cde/lib/DtSvc/DtUtil1/strtab.c
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -174,7 +175,7 @@ _DtShmProtoAddStrtab(DtShmProtoStrtab strlist, const char * string, int * isnew)
     unsigned char ** sptr;
     *isnew = 1;
     *bucket = ret = ptr->sl_charcount;
-    sptr = (unsigned char**)_DtUtilGetHash(ptr->sl_bosons, (const unsigned char *)ret);
+    sptr = (unsigned char**)_DtUtilGetHash(ptr->sl_bosons, (const unsigned char *) (intptr_t) ret);
     *sptr = (unsigned char*)strdup(string);
     ptr->sl_charcount += strlen(string) + 1;
   } 
@@ -193,7 +194,7 @@ _DtShmProtoLookUpStrtab (DtShmProtoStrtab prototab, DtShmBoson boson)
   strlist_t * ptr = (strlist_t *) prototab;
   unsigned char ** sptr;
   
-  sptr = (unsigned char **) _DtUtilFindHash(ptr->sl_bosons, (const unsigned char *) boson);
+  sptr = (unsigned char **) _DtUtilFindHash(ptr->sl_bosons, (const unsigned char *) (intptr_t) boson);
 
   return(sptr?((const char *)*sptr):NULL);
 }