libDtHelp: Resolve 11 compiler warnings.

diff --git a/cde/lib/DtHelp/AccessCCDF.c b/cde/lib/DtHelp/AccessCCDF.c
index e7c5d152ad0646c653c650bac79df2960eb93229..6f729d36ecf9952f7bac1eaa454c06907de56cdf 100644 (file)
--- a/cde/lib/DtHelp/AccessCCDF.c
+++ b/cde/lib/DtHelp/AccessCCDF.c
@@ -1377,7 +1377,7 @@ _DtHelpCeGetCcdfDocStamp (
            *ret_time = (char *) malloc (sizeof(time_t) * 3 + 1);
            if (*ret_time != NULL)
              {
-               sprintf(*ret_time, "%u", buf.st_mtime);
+               sprintf(*ret_time, "%u", (unsigned) buf.st_mtime);
                return -2;
              }
          }

diff --git a/cde/lib/DtHelp/Environ_c.c b/cde/lib/DtHelp/Environ_c.c
index 4ffb05f6ff32d3d24e3ad6061048e002691575b3..07da371a5497ef02ff956a6ae41ad0f53a12b5bb 100644 (file)
--- a/cde/lib/DtHelp/Environ_c.c
+++ b/cde/lib/DtHelp/Environ_c.c
@@ -88,7 +88,10 @@ char * _DtCliSrvGetDtUserSession()
          return NULL;
        }
        *display = 0;
-       fgets(display, BUFSIZ, pp);
+       if(NULL == fgets(display, BUFSIZ, pp)) {
+          perror("fgets() failed to read");
+          return NULL; 
+       }
        while (isspace(display[strlen(display)-1]))
          display[strlen(display)-1] = 0;
        pclose(pp);

diff --git a/cde/lib/DtHelp/GlobSearch.c b/cde/lib/DtHelp/GlobSearch.c
index 5b60a89afb032ae5e54b65e5784664b6d86e865b..c4a65709846af60dcb0b682c1a8209b478d40a14 100644 (file)
--- a/cde/lib/DtHelp/GlobSearch.c
+++ b/cde/lib/DtHelp/GlobSearch.c
@@ -1074,7 +1074,7 @@ done:
    }
    /* WARNING: depends on pointers and integers the same size */
 #ifdef __LP64__
-   return (NULL == ((int64_t)hit|(int64_t)posFile|(int64_t)locationIdList)) ? -1 : 0;
+   return (0 == ((int64_t)hit|(int64_t)posFile|(int64_t)locationIdList)) ? -1 : 0;
 #else
    return (0 == ((int)hit|(int)posFile|(int)locationIdList)) ? -1 : 0;
 #endif

diff --git a/cde/lib/DtHelp/bufio.c b/cde/lib/DtHelp/bufio.c
index e1b6e639854d8497354ed4d158d0c94335eb91a1..f17d8ba2233e8ec5263c997ca852ebcbb32e3279 100644 (file)
--- a/cde/lib/DtHelp/bufio.c
+++ b/cde/lib/DtHelp/bufio.c
@@ -50,6 +50,7 @@
 #include    <errno.h>
 #include    <stdio.h>
 #include    <stdlib.h>
+#include    <stdint.h>
 #include    <unistd.h>
 #include    "bufioI.h"
 
@@ -62,7 +63,7 @@ extern int errno;
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
 #endif
 
-#define FileDes(f)             ((int) (f)->hidden)
+#define FileDes(f)             ((intptr_t) (f)->hidden)
 #define CompressFileDes(f)     (((CECompressInfoPtr) (f)->hidden)->fd)
 #define CompressSize(f)                (((CECompressInfoPtr) (f)->hidden)->size)
 
@@ -122,7 +123,7 @@ _DtHelpCeBufFileOpenWr (int fd)
 {
     BufFilePtr f;
 
-    f = _DtHelpCeBufFileCreate ((char *) fd, BufFileRawFlush, NULL, _DtHelpCeBufFileFlush);
+    f = _DtHelpCeBufFileCreate ((char *) (intptr_t) fd, BufFileRawFlush, NULL, _DtHelpCeBufFileFlush);
     f->bufp = f->buffer;
     f->left = BUFFILESIZE;
     return f;
@@ -316,7 +317,7 @@ _DtHelpCeBufFileCreate (
 BufFilePtr
 _DtHelpCeBufFileRdWithFd (int fd)
 {
-    return _DtHelpCeBufFileCreate ((char *) fd, FdRawRead, BufFileRawSkip, FdClose);
+    return _DtHelpCeBufFileCreate ((char *) (intptr_t) fd, FdRawRead, BufFileRawSkip, FdClose);
 }
 
 /*****************************************************************************