dtprintinfo: Coverity 89561

[oweals/cde.git] / cde / programs / dtcalc / help.c

diff --git a/cde/programs/dtcalc/help.c b/cde/programs/dtcalc/help.c
index e8382c0455e37e8b54fd0a133c8ccec6dc84390e..0d60cc7805edad43faadf5545e4be167af10f439 100644 (file)
--- a/cde/programs/dtcalc/help.c
+++ b/cde/programs/dtcalc/help.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -37,8 +37,10 @@
 #include <Xm/MessageB.h>
 
 #include <Dt/Dt.h>
+#include <Dt/Wsm.h>
 #include <Dt/HelpDialog.h>
 
+#include <stdint.h>
 #include "calctool.h"
 #include "motif.h"
 
@@ -67,9 +69,7 @@ static Widget GetHelpDialog     P(()) ;
 static void UnmanageCB          P(()) ;
 
 void
-Help(helpVolume, locationId)
-   char *helpVolume;
-   char *locationId;
+Help(char *helpVolume, char *locationId)
 {
     Arg args[10];
     Position newX, newY;
@@ -119,10 +119,7 @@ Help(helpVolume, locationId)
 }
 
 void
-HelpCloseCB(widget, client_data, call_data)
-Widget widget;
-caddr_t client_data, call_data;
-
+HelpCloseCB(Widget widget, caddr_t client_data, caddr_t call_data)
 {
 
   HelpStruct *pHelpCache = (HelpStruct *)client_data;
@@ -139,9 +136,7 @@ caddr_t client_data, call_data;
 }
 
 void 
-HelpHyperlinkCB(widget, client_data, call_data)
-Widget   widget;
-caddr_t  client_data, call_data;
+HelpHyperlinkCB(Widget widget, caddr_t client_data, caddr_t call_data)
 {
   DtHelpDialogCallbackStruct *pHyper = (DtHelpDialogCallbackStruct *) call_data;
   
@@ -157,14 +152,12 @@ caddr_t  client_data, call_data;
  
 
 void 
-HelpRequestCB(widget, client_data, call_data)
-Widget widget;
-caddr_t client_data, call_data;
+HelpRequestCB(Widget widget, caddr_t client_data, caddr_t call_data)
 {
   char  *helpVolume, *locationId;
-  int   topic;
+  intptr_t   topic;
 
-  topic = ((int) client_data) & 0xFFFF;
+  topic = ((intptr_t) client_data) & 0xFFFF;
   helpVolume = HELP_VOLUME;
 
   if(topic < 56)
@@ -382,9 +375,7 @@ caddr_t client_data, call_data;
 }
 
 void
-HelpModeCB(w, client_data, call_data)
-Widget    w;
-caddr_t   client_data, call_data;
+HelpModeCB(Widget w, caddr_t client_data, caddr_t call_data)
 {
   Widget widget;
   char *errorMsg, *tmp;
@@ -414,9 +405,7 @@ caddr_t   client_data, call_data;
 }
 
 void
-DisplayHelp( helpVolume, locationId)
-char *helpVolume;
-char *locationId;
+DisplayHelp(char *helpVolume, char *locationId)
 {
     Arg args[10];
     int n;
@@ -436,13 +425,12 @@ char *locationId;
 
 
 static Widget
-GetHelpDialog()
+GetHelpDialog(void)
 {
     static HelpStruct       *pHelpCache;
 
     HelpStruct *pHelp;
     Arg args[5];
-    int n;
 
     if(pHelpCache == (HelpStruct *)NULL)
     {
@@ -494,9 +482,7 @@ GetHelpDialog()
 }
 
 void
-ErrDialog( errString, visualParent )
-char *errString ;
-Widget visualParent ;
+ErrDialog(char *errString, Widget visualParent)
 {
   int   n;
   Arg   args[10];
@@ -543,17 +529,13 @@ Widget visualParent ;
 }
 
 static void
-UnmanageCB(widget, client_data, call_data)
-Widget  widget;
-XtPointer client_data, call_data;
+UnmanageCB(Widget  widget, XtPointer client_data, XtPointer call_data)
 {
     XtUnmanageChild(widget);
 }
 
 void
-CenterMsgCB (widget, client_data, call_data)
-Widget          widget;
-XtPointer       client_data, call_data;
+CenterMsgCB (Widget widget, XtPointer client_data, XtPointer call_data)
 {
     int n;
     Position newX, newY;