dtwm: Change to ANSI function definitions

cde/programs/dtwm/Session.c

@@ -78,9 +78,7 @@ extern String unpost_monitor_arrow_image;
  ************************************************************************/
  
 static char *
-SessionFileGetName ()
+SessionFileGetName (void)
-
-
 {
    char * home_dir;
    char * file_name;
@@ -113,9 +111,7 @@ SessionFileGetName ()
  ************************************************************************/
 
 void
-SessionRestoreData ()
+SessionRestoreData (void)
-
-
 {
    FILE * fd;
 
@@ -477,9 +473,7 @@ SessionRestoreData ()
  ************************************************************************/
 
 void
-WmFrontPanelSessionSaveData ()
+WmFrontPanelSessionSaveData (void)
-
-
 {
    FILE * fd;
 

cde/programs/dtwm/UI.c

@@ -696,9 +696,7 @@ PanelControlCreate (Widget parent,
  ************************************************************************/
 
 static void
-BoxCreate ()
+BoxCreate (void)
-
-
 {
    int i, j;
    BoxData * box_data;

cde/programs/dtwm/WmCEvent.c

@@ -2725,8 +2725,7 @@ void DetermineActiveScreen (XEvent *pEvent)
  * 
  *************************************<->***********************************/
 
-WmScreenData * GetScreenForWindow (win)
+WmScreenData * GetScreenForWindow (Window win)
-    Window win;
 
 {
     XWindowAttributes attribs;

cde/programs/dtwm/WmFP.c

@@ -364,8 +364,7 @@ EmbeddedClientRegister (ControlData * control_data,
  ************************************************************************/
 
 static void
-EmbeddedClientSetData ()
+EmbeddedClientSetData (void)
-
 {
    WmScreenData *pSD;
    int i;
@@ -555,8 +554,7 @@ PushRecallRegister (ControlData * control_data,
  ************************************************************************/
 
 static void
-PushRecallSetData ()
+PushRecallSetData (void)
-
 {
    WmScreenData *pSD;
    int i;

cde/programs/dtwm/WmFeedback.c

@@ -80,7 +80,7 @@ static char *confirm_mesg[4] = {"Switch to Default Behavior?",
 
 
 void
-initMesg()
+initMesg(void)
 {
 
     char * tmpString;
@@ -643,11 +643,7 @@ void UpdateFeedbackText (WmScreenData *pSD, int x, int y, unsigned int width, un
  * 
  *************************************<->***********************************/
 
-static void OkCB (w, client_data, call_data)
+static void OkCB (Widget w, caddr_t client_data, caddr_t call_data)
-
-   Widget w;
-   caddr_t client_data;
-   caddr_t call_data;
 {
     WithdrawDialog (w);
 
@@ -685,11 +681,7 @@ static void OkCB (w, client_data, call_data)
  * 
  *************************************<->***********************************/
 
-static void CancelCB (w, client_data, call_data)
+static void CancelCB (Widget w, caddr_t client_data, caddr_t call_data)
-
-   Widget w;
-   caddr_t client_data;
-   caddr_t call_data;
 {
     WithdrawDialog (w);
 

cde/programs/dtwm/WmFunction.c

@@ -218,8 +218,7 @@ Boolean F_Beep (String args, ClientData *pCD, XEvent *event)
  * is to restack the dirty transient relative to the second to the
  * top transient.  This function is used to support freeFamily stacking.
  */
-ClientData * FindSecondToTopTransient (pcd)
+ClientData * FindSecondToTopTransient (ClientData *pcd)
-ClientData *pcd;
 {
     ClientData *pcdNext;
     static ClientData *second;
@@ -2199,11 +2198,7 @@ F_Push_Recall (String args, ClientData *pCD, XEvent *event)
  *
  *************************************<->***********************************/
 
-Boolean F_Pass_Key (args, pCD, event)
+Boolean F_Pass_Key (String args, ClientData *pCD, XEvent *event)
-    String args;
-    ClientData *pCD;
-    XEvent *event;
-
 {
     if (wmGD.passKeysActive)
     {

cde/programs/dtwm/WmGraphics.c

@@ -984,9 +984,7 @@ Boolean ExtendRList (RList *prl, unsigned int amt)
  *  --------
  *			
  *************************************<->***********************************/
-RList *AllocateRList (amt)
+RList *AllocateRList (unsigned int amt)
-
-    unsigned int amt;
 {
     RList *prl;
 

cde/programs/dtwm/WmIconBox.c

@@ -1581,10 +1581,7 @@ void SetGranularity (WmWorkspaceData *pWS, ClientData *pCD, IconBoxData *pIBD)
  * 
  *************************************<->***********************************/
 
-MenuItem *GetIconBoxMenuItems (pSD)
+MenuItem *GetIconBoxMenuItems (WmScreenData *pSD)
-
-    WmScreenData *pSD;
-
 {
 
     return(ParseMwmMenuStr (pSD, 
@@ -1969,12 +1966,7 @@ Boolean InsertIconIntoBox (IconBoxData *pIBD, ClientData *pCD)
  * 
  *************************************<->***********************************/
 
-IconInfo *InsertIconInfo (pIBD, pCD, theWidget)
+IconInfo *InsertIconInfo (IconBoxData *pIBD, ClientData *pCD, Widget theWidget)
-
-    IconBoxData *pIBD;
-    ClientData *pCD;
-    Widget theWidget;
-
 {
     IconInfo *pII;
     int place;

cde/programs/dtwm/WmImage.c

@@ -964,9 +964,7 @@ int GetBitmapIndex (WmScreenData *pSD, char *name, Boolean bReportError)
  * 
  *************************************<->***********************************/
 
-char *BitmapPathName (string)
+char *BitmapPathName (char *string)
-    char *string;
-
 {
     static char  fileName[MAXWMPATH+1];
     char *retname;

cde/programs/dtwm/WmKeyFocus.c

@@ -558,9 +558,7 @@ void ClearFocusIndication (ClientData *pCD, Boolean refresh)
  *        
  *************************************<->***********************************/
 
-ClientData *GetClientUnderPointer (pSameScreen)
+ClientData *GetClientUnderPointer (Boolean *pSameScreen)
-    Boolean *pSameScreen;
-
 {
     Window root;
     Window child;
@@ -871,9 +869,7 @@ Boolean FocusNextTransient (ClientData *pCD, unsigned long type, Boolean initiat
  *
  *************************************<->***********************************/
 
-ClientData *FindLastTransientTreeFocus (pCD, pcdNoFocus)
+ClientData *FindLastTransientTreeFocus (ClientData *pCD, ClientData *pcdNoFocus)
-    ClientData *pCD;
-    ClientData *pcdNoFocus;
 
 {
     ClientData *pcdNext;
@@ -934,10 +930,7 @@ ClientData *FindLastTransientTreeFocus (pCD, pcdNoFocus)
  *
  *************************************<->***********************************/
 
-ClientData *FindNextTFocusInSeq (pCD, startAt)
+ClientData *FindNextTFocusInSeq (ClientData *pCD, unsigned long startAt)
-    ClientData *pCD;
-    unsigned long startAt;
-
 {
     ClientData *pcdNextFocus = NULL;
     ClientData *pcdNext;
@@ -1216,10 +1209,7 @@ Boolean FocusPrevTransient (ClientData *pCD, unsigned long type, Boolean initiat
  *
  *************************************<->***********************************/
 
-ClientData *FindPrevTFocusInSeq (pCD, startAt)
+ClientData *FindPrevTFocusInSeq (ClientData *pCD, unsigned long startAt)
-    ClientData *pCD;
-    unsigned long startAt;
-
 {
     ClientData *pcdNextFocus = NULL;
     ClientData *pcdNext;

cde/programs/dtwm/WmMenu.c

@@ -302,10 +302,7 @@ MenuSpec *MakeMenu (WmScreenData *pSD,
 
 
 /*************************************<->***********************************/
-void CheckTerminalSeparator(menuSpec, buttonWidget, manage)
+void CheckTerminalSeparator(MenuSpec *menuSpec, Widget buttonWidget, Boolean manage)
-     MenuSpec *menuSpec;
-     Widget buttonWidget;
-     Boolean manage;
 {
     CompositeWidget cw;
     WidgetList      children;

cde/programs/dtwm/WmResParse.c

@@ -1755,8 +1755,7 @@ void ProcessWmFile (WmScreenData *pSD, Boolean bNested)
 /**** This function stolen from Xt/Intrinsic.c ****/
 /* The implementation of this routine is operating system dependent */
 
-static char *ExtractLocaleName(lang)
+static char *ExtractLocaleName(String lang)
-    String	lang;
 {
 
 #ifdef hpux	 /* hpux-specific parsing of the locale string */

cde/programs/dtwm/WmResource.c

@@ -5850,11 +5850,8 @@ _WmGetDynamicDefault (Widget widget, unsigned char type, String defaultColor, Pi
  * 
  *************************************<->***********************************/
 
-XmColorData * _WmGetDefaultColors (screen, colormap, defaultColor)
+XmColorData * _WmGetDefaultColors (Screen *screen, Colormap colormap,
-	Screen *screen;
+                                   String defaultColor)
-	Colormap colormap;
-	String defaultColor;
-
 {
     static XmColorData *defaultSet[2] = {NULL, NULL};
     static int defaultCount[2] = {0, 0};
@@ -5986,10 +5983,7 @@ XmColorData * _WmGetDefaultColors (screen, colormap, defaultColor)
  * 
  *************************************<->***********************************/
 
-char * WmRealloc (ptr, size)
+char * WmRealloc (char *ptr, unsigned size)
-	char *ptr;
-	unsigned size;
-
 {
     if (ptr)
     {
@@ -6034,10 +6028,7 @@ char * WmRealloc (ptr, size)
  * 
  *************************************<->***********************************/
 
-char * WmMalloc (ptr, size)
+char * WmMalloc (char *ptr, unsigned size)
-	char *ptr;
-	unsigned size;
-
 {
     if (ptr)
     {
@@ -6083,10 +6074,7 @@ char * WmMalloc (ptr, size)
  *************************************<->***********************************/
 
 void
-SetupDefaultResources (pSD)
+SetupDefaultResources (WmScreenData *pSD)
-
-WmScreenData *pSD;
-
 {
     KeySpec *nextKeySpec;
     String keyBindings;