dtfile: fix pointer to integer conversion

Use XtArgVal (usually (long)) to convert
(XtPointer) to (int) and back.

This provides safe way to convert and
avoids compiler warning.

diff --git a/cde/programs/dtfile/ChangeDirP.c b/cde/programs/dtfile/ChangeDirP.c
index 3610a710a159d34f9d49f9a36ef26d13480ec780..6073083a0b179227e368e1b8c18cd7a66e7ee430 100644 (file)
--- a/cde/programs/dtfile/ChangeDirP.c
+++ b/cde/programs/dtfile/ChangeDirP.c
@@ -304,7 +304,7 @@ ShowChangeDirDialog(
 
    if (w)
    {
-      if((int)client_data == FM_POPUP)
+      if((XtArgVal)client_data == FM_POPUP)
          mbar = XtParent(w);
       else
          mbar = (Widget) XmGetPostedFromWidget(XtParent(w));

diff --git a/cde/programs/dtfile/Desktop.c b/cde/programs/dtfile/Desktop.c
index a0180fe96d8e051958c9949e2e00eb3bec3582a4..f83c29f480fc7c9da3832c101db0935cfa6c07a6 100644 (file)
--- a/cde/programs/dtfile/Desktop.c
+++ b/cde/programs/dtfile/Desktop.c
@@ -2535,7 +2535,7 @@ PutOnDTCB (
 
    XmUpdateDisplay (w);
 
-   if((int)client_data != 0)
+   if(client_data != 0)
       mbar = XtParent(w);
    else
       mbar = XmGetPostedFromWidget(XtParent(w));

diff --git a/cde/programs/dtfile/Encaps.c b/cde/programs/dtfile/Encaps.c
index e2bff9c196a1d90461a5694c1e941974dfd791e0..5314e0e950588386cfc63ebe25620814af5b01e0 100644 (file)
--- a/cde/programs/dtfile/Encaps.c
+++ b/cde/programs/dtfile/Encaps.c
@@ -1249,22 +1249,22 @@ IntDialogGetResources(
       {
          if (resource->size == sizeof(char))
          {
-            charVal = (char)resource->default_value;
+            charVal = (char)(XtArgVal)resource->default_value;
             convertedValue.addr = (caddr_t) &charVal;
          }
          else if (resource->size == sizeof(short))
          {
-            shortVal = (short)resource->default_value;
+            shortVal = (short)(XtArgVal)resource->default_value;
             convertedValue.addr = (caddr_t) &shortVal;
          }
          else if (resource->size == sizeof(int))
          {
-            intVal = (int)resource->default_value;
+            intVal = (int)(XtArgVal)resource->default_value;
             convertedValue.addr = (caddr_t) &intVal;
          }
          else
          {
-            longVal = (long)resource->default_value;
+            longVal = (long)(XtArgVal)resource->default_value;
             convertedValue.addr = (caddr_t) &longVal;
          }
       }

diff --git a/cde/programs/dtfile/File.c b/cde/programs/dtfile/File.c
index 9f88b1caae0cf4174fada68c10246e8e60641ba3..6c80338d29b56204af25179e688a52f6d68b94a2 100644 (file)
--- a/cde/programs/dtfile/File.c
+++ b/cde/programs/dtfile/File.c
@@ -7193,7 +7193,7 @@ CommitWorkProcUpdates(
    /* If not managed yet, manage the file window again */
    if (!XtIsManaged((Widget)file_window))
    {
-     XtPointer incr;
+     XtArgVal incr;
      Arg args[2];
 
      XtManageChild ((Widget)file_window);

diff --git a/cde/programs/dtfile/FileDialog.c b/cde/programs/dtfile/FileDialog.c
index 5a8577e70fb876c94ee453de3e6d37cbd8154e6e..b446aa3181e76dd21f8233a66d10e018b7117b08 100644 (file)
--- a/cde/programs/dtfile/FileDialog.c
+++ b/cde/programs/dtfile/FileDialog.c
@@ -270,7 +270,7 @@ ShowCopyFileDialog(
    char * directory_name;
    char * tmpStr, *tempStr;
 
-   XtPointer width;
+   XtArgVal width;
    Dimension f_width, d_width;
 
    Widget shell;
@@ -1750,7 +1750,7 @@ FileTypePreview(
    char * new_link_path;
    PixmapData *pixmapData;
    Tt_status tt_status;
-   Boolean Flag =  ((Boolean)call_data == True)?True:False;
+   Boolean Flag =  ((Boolean)(XtArgVal)call_data == True)?True:False;
 
    call_struct = (DialogCallbackStruct *) client_data;
    new_name = (char *) _DtStripSpaces (new_name);

diff --git a/cde/programs/dtfile/Filter.c b/cde/programs/dtfile/Filter.c
index d950d261f980c7d50dc695339a52a7ec53b16e8e..7d3ff3de5d5aee9c283ea49b6e77fc3fb6172cbd 100644 (file)
--- a/cde/programs/dtfile/Filter.c
+++ b/cde/programs/dtfile/Filter.c
@@ -1391,7 +1391,7 @@ ShowHiddenFiles (
    Widget mbar;
    Arg args[1];
 
-   if ((int)client_data == FM_POPUP)
+   if ((XtArgVal)client_data == FM_POPUP)
      mbar = XtParent(w);
    else
      mbar = (Widget)XmGetPostedFromWidget(XtParent(w));

diff --git a/cde/programs/dtfile/FindP.c b/cde/programs/dtfile/FindP.c
index a92a3f0764752798bb6134750b5a64acd583713e..8ac37e4564a11d61ae960ca669c6a9efcd5061a4 100644 (file)
--- a/cde/programs/dtfile/FindP.c
+++ b/cde/programs/dtfile/FindP.c
@@ -101,7 +101,7 @@ ShowFindDialog(
 
    if (w)
    {
-      if ( (int) client_data == FM_POPUP )
+      if ( (XtArgVal) client_data == FM_POPUP )
         mbar = XtParent(w);
       else
         mbar = XmGetPostedFromWidget(XtParent(w));

diff --git a/cde/programs/dtfile/HelpP.c b/cde/programs/dtfile/HelpP.c
index 8a2c9fccc9bc80481f025239eee453445f29965c..d91a10a139ed8361658b92e3b48794f170dfc392 100644 (file)
--- a/cde/programs/dtfile/HelpP.c
+++ b/cde/programs/dtfile/HelpP.c
@@ -461,7 +461,7 @@ ShowDTHelpDialog(
    }
 
    _DtShowDialog(parentShell, NULL, NULL, dialogData, NULL, NULL, 
-              DTHelpClose, (XtPointer)workspaceNum, 
+              DTHelpClose, (XtPointer)(XtArgVal)workspaceNum,
               desktop_data->workspaceData[workspaceNum]->name,
               False, False, NULL, NULL);
 
@@ -474,7 +474,7 @@ ShowDTHelpDialog(
    helpRec = (HelpRec *)_DtGetDialogInstance(dialogData);
    XtRemoveAllCallbacks(helpRec->helpDialog, DtNhyperLinkCallback);
    XtAddCallback(helpRec->helpDialog, DtNhyperLinkCallback,
-                 DTHyperLink, (XtPointer)workspaceNum);
+                 DTHyperLink, (XtPointer)(XtArgVal)workspaceNum);
 }
 
 
@@ -494,7 +494,7 @@ DTHelpClose(
         DialogData *new_dialog_data )
 
 {
-   int  workspaceNum = (int) client_data;
+   int  workspaceNum = (int)(XtArgVal) client_data;
    int count;
    int i, j;
    WorkspaceRec * wsInfo;
@@ -535,7 +535,7 @@ DTHyperLink(
         XtPointer callData )
 
 {
-   int  workspaceNum = (int) clientData;
+   int  workspaceNum = (int)(XtArgVal) clientData;
    DtHelpDialogCallbackStruct * hyperData;
 
    hyperData = (DtHelpDialogCallbackStruct *)callData;

diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c
index c5b10e40178307a8d79e613eda930150979fd964..9b2213304809108bdc0b8846e4a3002a5e9d013e 100644 (file)
--- a/cde/programs/dtfile/Main.c
+++ b/cde/programs/dtfile/Main.c
@@ -5146,7 +5146,7 @@ CleanUp (
    XRectangle textExtent;
    Position x, y;
 
-   if ((int) client_data == FM_POPUP)
+   if ((int)(XtArgVal) client_data == FM_POPUP)
      mbar = XtParent(w);
    else
      mbar = XmGetPostedFromWidget(XtParent(w));

diff --git a/cde/programs/dtfile/Menu.c b/cde/programs/dtfile/Menu.c
index 7ba74aeaf7f2d5d9e812604c7450e338efc1f2ec..574a861180fa0cc77541630be3ba315702c213ef 100644 (file)
--- a/cde/programs/dtfile/Menu.c
+++ b/cde/programs/dtfile/Menu.c
@@ -843,7 +843,7 @@ UnselectAll(
    Arg args[1];
    Widget mbar;
 
-   if ((int)client_data == FM_POPUP)
+   if ((int)(XtArgVal) client_data == FM_POPUP)
      mbar = XtParent(w);
    else
      mbar = XmGetPostedFromWidget(XtParent(w));
@@ -886,7 +886,7 @@ SelectAll(
    Arg args[1];
    Widget mbar;
 
-   if ((int)client_data == FM_POPUP)
+   if ((int)(XtArgVal)client_data == FM_POPUP)
      mbar = XtParent(w);
    else
      mbar = XmGetPostedFromWidget(XtParent(w));
@@ -1009,7 +1009,7 @@ TrashFiles(
 
    XmUpdateDisplay (w);
 
-   if((int)client_data == 0)
+   if((int)(XtArgVal)client_data == 0)
       mbar = XmGetPostedFromWidget(XtParent(w));
    else
       mbar =  XtParent(w);
@@ -1164,7 +1164,7 @@ ChangeToHome(
    Boolean found;
 
    XmUpdateDisplay (w);
-   if((int)client_data == FM_POPUP)
+   if((int)(XtArgVal)client_data == FM_POPUP)
       mbar = XtParent(w);
    else
       mbar = XmGetPostedFromWidget(XtParent(w));
@@ -1242,7 +1242,7 @@ ChangeToParent(
    Widget focus_widget;
 
    XmUpdateDisplay (w);
-   if((int)client_data == FM_POPUP)
+   if((int)(XtArgVal)client_data == FM_POPUP)
       mbar = XtParent(w);
    else
       mbar = XmGetPostedFromWidget(XtParent(w));

diff --git a/cde/programs/dtfile/ModAttrP.c b/cde/programs/dtfile/ModAttrP.c
index 1ba8212a345dce3d989de0a14c568085ef18175a..5df7c9cea9b52b115ac6156bdaf4c04aa2379aa5 100644 (file)
--- a/cde/programs/dtfile/ModAttrP.c
+++ b/cde/programs/dtfile/ModAttrP.c
@@ -134,7 +134,7 @@ ShowModAttrDialog(
   
    XmUpdateDisplay (w);
 
-   if((int)client_data != 0)
+   if((int)(XtArgVal)client_data != 0)
       mbar = XtParent(w);
    else
       mbar = XmGetPostedFromWidget(XtParent(w));

diff --git a/cde/programs/dtfile/OverWrite.c b/cde/programs/dtfile/OverWrite.c
index 38821b66234f555bdc0910fd2e78fcd1b7092db5..7600be3be51b67c286a044963d28070cfc8aad3d 100644 (file)
--- a/cde/programs/dtfile/OverWrite.c
+++ b/cde/programs/dtfile/OverWrite.c
@@ -175,7 +175,7 @@ replace_rename_ok_callback(
    char         *newFileName = NULL;
    int          newFileDirLen;
    int          rename_rc;
-   Boolean      same = (Boolean)client_data;
+   Boolean      same = (Boolean)(XtArgVal)client_data;
 
    /* if same is true, then the object is tring to be copied into the same
     * folder as itself.  So the existing files stay the same and the new files
@@ -441,7 +441,7 @@ replace_rename_radio_callback(
 
 
    if (state->set)
-      switch ((int) client_data)
+      switch ((int)(XtArgVal) client_data)
       {
         case RADIO_REPLACE:
            XtVaSetValues (G_rename_text,
@@ -589,7 +589,7 @@ multicollide_ok_callback(
    struct stat  buf;
 
 
-   Boolean      same = (Boolean)client_data;
+   Boolean      same = (Boolean)(XtArgVal)client_data;
 
    /* if same is true, then the object is tring to be copied into the same
     * folder as itself.  So the existing files stay the same and the new files
@@ -1757,7 +1757,7 @@ Create_Action_Area(
 
        if (i == actions.defaultAction)
          {
-            XtPointer heightptr;
+            XtArgVal heightptr;
             Dimension height, h;
             XtVaGetValues (action_area, XmNmarginHeight, &heightptr, NULL);
             height = (Dimension)heightptr;

diff --git a/cde/programs/dtfile/dtcopy/overwrtdialog.c b/cde/programs/dtfile/dtcopy/overwrtdialog.c
index b1efd9e71dcf7117147b1888b385e8d34942d04b..04ec30fc4b053dec83a971630df457917680804d 100644 (file)
--- a/cde/programs/dtfile/dtcopy/overwrtdialog.c
+++ b/cde/programs/dtfile/dtcopy/overwrtdialog.c
@@ -94,7 +94,7 @@ radio_callback(
    XmToggleButtonCallbackStruct *state = (XmToggleButtonCallbackStruct *)call_data;
 
 
-   G_overwrite_selection = (int) client_data;
+   G_overwrite_selection = (int)(XtArgVal) client_data;
 
    if (state->set)
       switch (G_overwrite_selection)
@@ -404,7 +404,7 @@ create_overwrite_dialog(
                                             XmNalignment,   XmALIGNMENT_BEGINNING,
                                             XmNlabelString, xm_string[i],
                                             NULL);
-       XtAddCallback(radiobtn[i], XmNvalueChangedCallback, radio_callback, (XtPointer) i);
+       XtAddCallback(radiobtn[i], XmNvalueChangedCallback, radio_callback, (XtPointer)(XtArgVal) i);
        XmStringFree(xm_string[i]);
      }
 

diff --git a/cde/programs/dtfile/dtcopy/utils.c b/cde/programs/dtfile/dtcopy/utils.c
index 824101bdb7cfb2585128a4f5e406d4336bd43fa6..b12f36e5cb1e3f418296f5a6d6af6b0ed86b8ebf 100644 (file)
--- a/cde/programs/dtfile/dtcopy/utils.c
+++ b/cde/programs/dtfile/dtcopy/utils.c
@@ -137,7 +137,7 @@ help_callback(
   char  *helpVolume, *locationId;
   int   topic;
 
-  topic = (int)client_data;
+  topic = (int)(XtArgVal) client_data;
   helpVolume = HELP_VOLUME;
 
   switch (topic)
@@ -418,15 +418,12 @@ Create_Action_Area(
 
        if (i == actions.defaultAction)
          {
-            union {
-                XtPointer ptr;
-                Dimension dim;
-            } wide;
+            XtArgVal arg;
             Dimension height, h;
-            XtVaGetValues (action_area, XmNmarginHeight, &wide.ptr, NULL);
-            h = wide.dim;
-            XtVaGetValues (widget, XmNheight, &wide.ptr, NULL);
-            height = wide.dim;
+            XtVaGetValues (action_area, XmNmarginHeight, &arg, NULL);
+            h = (Dimension)arg;
+            XtVaGetValues (widget, XmNheight, &arg, NULL);
+            height = (Dimension)arg;
 
             height +=2 * h;
             XtVaSetValues (action_area,