libDtSvc: Resolve 28 compiler warnings.

diff --git a/cde/lib/DtSvc/DtEncap/local.c b/cde/lib/DtSvc/DtEncap/local.c
index fcf1b066a2d4b45fb6ade2c165b16cea5fc8f720..54913a45f86722f7882c138e94397580ab383e46 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/local.c
+++ b/cde/lib/DtSvc/DtEncap/local.c
@@ -206,7 +206,7 @@ void local_channel_object_input_handler(void * client_data,
   timeout.tv_sec = 0;
   timeout.tv_usec = 0;
   
-#if defined(SVR4) || defined(__osf__) || defined(__hpux) || defined(__OpenBSD__)
+#if defined(SVR4) || defined(__osf__) || defined(__hpux) || defined(__OpenBSD__) || defined(linux)
   select(max_fds, (fd_set*)&read_fd_vect, NULL, (fd_set*)&except_fd_vect, &timeout);
 #else
   /* UX has select defined with int*, not fd_set* parms */

diff --git a/cde/lib/DtSvc/DtEncap/spc-proto.c b/cde/lib/DtSvc/DtEncap/spc-proto.c
index 4b21203c5f84c3694105d566e961166fce123bab..92fa12f7713aaa33df66f8adb69194203944a32d 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/spc-proto.c
+++ b/cde/lib/DtSvc/DtEncap/spc-proto.c
@@ -41,6 +41,7 @@
 #include <stdarg.h>
 #include <sys/utsname.h>
 #include <limits.h>
+#include <stdint.h>
 
 #define X_INCLUDE_PWD_H
 #define XOS_USE_XT_LOCKING
@@ -652,7 +653,7 @@ int print_protocol_request(XeString name, protocol_request_ptr proto)
   dptr->data[dptr->offset+dptr->len]=0;
   
   fprintf(SPC_Print_Protocol,
-         "%s channel: %x, request: %d, length: %d, seq: %d data: %s\n",
+         "%s channel: %p, request: %d, length: %d, seq: %d data: %s\n",
          name, proto->channel, proto->request_type, dptr->len, proto->seqno,
          dptr->data+dptr->offset);
 
@@ -691,7 +692,7 @@ int SPC_Write_Protocol_Request (SPC_Connection_Ptr connection,
   /* We are overloading the "channel" field.  We put the cid rather  */
   /* than the actual channel pointer in when we pass it to the other */
   /* side of the connection.                                        */
-  prot_request->channel=(SPC_Channel_Ptr)(channel ? channel->cid : 0);
+  prot_request->channel=(SPC_Channel_Ptr) (intptr_t) (channel ? channel->cid : 0);
   
   switch (request) {
 

diff --git a/cde/lib/DtSvc/DtEncap/usersig.c b/cde/lib/DtSvc/DtEncap/usersig.c
index 6181a8d5e2f0afee112f9ea2523b28d007044032..6460642bae6e0416cf2e128177a18b75280817cd 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/usersig.c
+++ b/cde/lib/DtSvc/DtEncap/usersig.c
@@ -36,6 +36,7 @@
 #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
 
 #include <signal.h>
+#include <stdint.h>
 
 #include <bms/bms.h>
 #include <bms/Symbolic.h>
@@ -50,7 +51,7 @@ static void Xe_addsig(XeString name, int value)
 /*-------------------------------------------------------------------------+*/
 {
     XeSymbol sym = Xe_intern(Xe_sig_table, name);
-    sym->value = (void *)value;
+    sym->value = (void *) (intptr_t) value;
 }
 
 /*-------------------------------------------------------------------------+*/
@@ -162,7 +163,7 @@ int XeNameToSignal(XeString name)
     sym = Xe_lookup(Xe_sig_table, name);
 
     _DtSvcProcessUnlock();
-    return (sym) ? (int) sym->value : XE_SIG_NOT_IN_TABLE;
+    return (sym) ? (intptr_t) sym->value : XE_SIG_NOT_IN_TABLE;
 }
 
 /*-------------------------------------------------------------------------+*/

diff --git a/cde/lib/DtSvc/DtUtil1/ActionDb.c b/cde/lib/DtSvc/DtUtil1/ActionDb.c
index ca7e6c6d11d2ca2ad3b7549f48b48c12d8ee8fff..df3b0089e2fecc47e40c60783746391532d731d5 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/ActionDb.c
+++ b/cde/lib/DtSvc/DtUtil1/ActionDb.c
@@ -1063,7 +1063,7 @@ _DtActionConverter(DtDtsDbField * fields,
 
                if ((ThisBit = _DtActFieldBitLookup(XrmQuarkToString(fields[i].fieldName))) != 0)
                {
-                       switch ((int)(fieldVal=_DtActValidateFieldValue(ThisBit,
+                       switch ((intptr_t)(fieldVal=_DtActValidateFieldValue(ThisBit,
                                 fields[i].fieldValue, fields[0].fieldValue,
                                 fileName)))
                        {

diff --git a/cde/lib/DtSvc/DtUtil1/CmdMain.c b/cde/lib/DtSvc/DtUtil1/CmdMain.c
index 5c6fdf6ff528232edc7db7210701d3f906b8cb9b..94ed2784fde10361544d81bb564bad091e5b5a9a 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/CmdMain.c
+++ b/cde/lib/DtSvc/DtUtil1/CmdMain.c
@@ -951,13 +951,19 @@ _DtCmdCommandInvokerExecute (
        * Save the current directory and then "chdir" to the directory
        * to do the execution.  If the chdir fails, return.
        */
-      (void) getcwd (tmpDir, MAXPATHLEN);
+      if(NULL == getcwd (tmpDir, MAXPATHLEN))
+      {
+        perror(strerror(errno));
+        return (_CMD_EXECUTE_FAILURE);  
+      }
 
       if (!_DtCmdValidDir (_cmdClientHost, contextDir, contextHost)) 
       {
         Cmd_FreeAllocatedStringVector (commandArray);
         (void) sprintf (errorMessage, errorChdir, contextDir, execHost);
-        (void) chdir (tmpDir);
+        if(-1 == chdir (tmpDir)) {
+            perror(strerror(errno));
+         }
         return (_CMD_EXECUTE_FAILURE);
       }
 
@@ -981,7 +987,9 @@ _DtCmdCommandInvokerExecute (
       if (commandPid < 0) 
       {
         Cmd_FreeAllocatedStringVector (commandArray);
-        (void) chdir (tmpDir);
+        if(-1 == chdir (tmpDir)) {
+            perror(strerror(errno)); 
+         }
          (void) sprintf(errorMessage, errorFork, execHost);
          (void) _DtEnvControl (DT_ENV_RESTORE_POST_DT);
         return (_CMD_EXECUTE_FAILURE);

diff --git a/cde/lib/DtSvc/DtUtil1/DndDrop.c b/cde/lib/DtSvc/DtUtil1/DndDrop.c
index a3c05cff8d21fd6eeda9f91318d87d992b2ca07a..87bd950ef34f51de0518a40b9856ac6949781e7b 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/DndDrop.c
+++ b/cde/lib/DtSvc/DtUtil1/DndDrop.c
@@ -53,6 +53,7 @@
 
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <X11/Intrinsic.h> 
 #include <Xm/AtomMgr.h> 
 #include <Xm/DragDrop.h>
@@ -428,7 +429,7 @@ DtDndDropUnregister(
                        dndDropSiteDestroy, NULL);
 
        XDeleteContext(display, dndGetContextXID(display), 
-               (XContext)dropReceiver);
+               (XContext)(intptr_t)dropReceiver);
 
        _DtDndDestroyTransfers(dtDropInfo->transfers, dtDropInfo->numTransfers);
 
@@ -1020,7 +1021,7 @@ dndSaveDropInfo(
        int             status;
 
        status = XSaveContext(display, dndGetContextXID(display),
-               (XContext)dropReceiver, (XPointer)dtDropInfo);
+               (XContext)(intptr_t)dropReceiver, (XPointer)dtDropInfo);
 
        return (status == 0);
 }
@@ -1039,7 +1040,7 @@ dndFindDropInfo(
        DtDropInfo *    dtDropInfo;
 
        status = XFindContext(display, dndGetContextXID(display), 
-               (XContext)dropReceiver, (XPointer *)&dtDropInfo);
+               (XContext)(intptr_t)dropReceiver, (XPointer *)&dtDropInfo);
 
        if (status != 0)
                dtDropInfo = (DtDropInfo *)NULL;

diff --git a/cde/lib/DtSvc/DtUtil1/DndIcon.c b/cde/lib/DtSvc/DtUtil1/DndIcon.c
index 4f3eb25e44fc4f9eb8fc134857b95a1209bc57d2..9f176a8c04bf46f2b176256158d068ffcc93a0e6 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/DndIcon.c
+++ b/cde/lib/DtSvc/DtUtil1/DndIcon.c
@@ -498,7 +498,7 @@ getDragCollection(
        int             status;
 
        _DtSvcProcessLock();
-       if (dragCollectionContext == (XContext)NULL) {
+       if (dragCollectionContext == (XContext)0) {
                dragCollectionContext = XUniqueContext();
        }
        _DtSvcProcessUnlock();

diff --git a/cde/lib/DtSvc/DtUtil1/DtHash.c b/cde/lib/DtSvc/DtUtil1/DtHash.c
index b9620ad089ae05818bb2f775ade8fe2503e6e7d7..7d9c6f9812d0caa44355f02dca0ff0a500a8905c 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/DtHash.c
+++ b/cde/lib/DtSvc/DtUtil1/DtHash.c
@@ -152,7 +152,7 @@ void ** _DtUtilGetHash(DtHashTbl t, const unsigned char * key)
   if(tbl->hash_type == String_Key)
     tmp = tbl->table[bucket = hash_string(key, tbl->size)];
   else
-    tmp = tbl->table[bucket = abs((int)key) % tbl->size];
+    tmp = tbl->table[bucket = abs((int)(intptr_t)key) % tbl->size];
 
   if(tbl->hash_type == String_Key)
     while(tmp!=NULL)
@@ -205,7 +205,7 @@ void ** _DtUtilFindHash(DtHashTbl t, const unsigned char * key)
     }
   else
     {
-      tmp = tbl->table[abs((int)key) % tbl->size];
+      tmp = tbl->table[abs((int)(intptr_t)key) % tbl->size];
       for(;tmp!=NULL; tmp = tmp->next_entry)
        if(tmp->key == key)
          return((void *)&tmp->data);
@@ -224,7 +224,7 @@ void * _DtUtilDelHash(DtHashTbl t, const unsigned char * key)
   if(tbl->hash_type == String_Key)
     bucket = hash_string(key, tbl->size);
   else
-    bucket = abs((int)key) % tbl->size;
+    bucket = abs((int)(intptr_t)key) % tbl->size;
 
   if((tmp = tbl->table[bucket])==NULL)
     return(NULL);

diff --git a/cde/lib/DtSvc/DtUtil1/Dts.c b/cde/lib/DtSvc/DtUtil1/Dts.c
index 0b6b26c91e800bb82b0f33e0a0dd36fedbc3378e..afa8b9e967623ca6d4ef324b1bcfc5ff3711b906 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/Dts.c
+++ b/cde/lib/DtSvc/DtUtil1/Dts.c
@@ -1197,7 +1197,7 @@ type_path(const char *path, char *attr)
        char    *c;
        int     match = 0;
 
-       if(path && (int)path != -1)
+       if(path && (intptr_t)path != -1)
        {
 #ifdef USE_FNMATCH
                match = !fnmatch(attr, path, 0);

diff --git a/cde/lib/DtSvc/DtUtil1/MMDb.c b/cde/lib/DtSvc/DtUtil1/MMDb.c
index 50ffc5913a639ba8708261772b39e4391bf2e19a..3a2483cdf663e67282d904007794427f4119281d 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/MMDb.c
+++ b/cde/lib/DtSvc/DtUtil1/MMDb.c
@@ -731,5 +731,5 @@ _DtActionCompareRecordBoson(
        if (results)
                return(results);
 
-       return((int)record1 - (int)record2);
+       return((intptr_t)record1 - (intptr_t)record2);
 }

diff --git a/cde/lib/DtSvc/DtUtil1/WmBackWin.c b/cde/lib/DtSvc/DtUtil1/WmBackWin.c
index f3f04a07f60b367ff8b882e52216f4faf7d4ae21..4e9d7b29c0a97a05c7ed4b6f322427ead12d2f32 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/WmBackWin.c
+++ b/cde/lib/DtSvc/DtUtil1/WmBackWin.c
@@ -41,6 +41,7 @@
  ****************************************************************************
  ************************************<+>*************************************/
 #include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <Dt/Wsm.h> 

diff --git a/cde/lib/DtSvc/include/codelibs/stringx.h b/cde/lib/DtSvc/include/codelibs/stringx.h
index 5981603d711e19dd32e8db5e2d4b0824b543d363..981e2a436e64bc2cacf7867cf0c11288dc8b8ef3 100644 (file)
--- a/cde/lib/DtSvc/include/codelibs/stringx.h
+++ b/cde/lib/DtSvc/include/codelibs/stringx.h
@@ -140,7 +140,7 @@ inline void  strfree(const char *s)
 #if defined(__hpux) || defined(__osf__) || defined(CSRG_BASED)
        { if (s != NULL) free((void *)s); }
 #else
-       { if (s != NULL) free((const void *)s); }
+       { if (s != NULL) free((void *)s); }
 #endif /* __hpux */
 #endif
 #if defined(bsd)