dtwm: Change to ANSI function definitions

diff --git a/cde/programs/dtwm/Session.c b/cde/programs/dtwm/Session.c
index b4817d67e5037f9001b864ecba0c999db3d2a151..6c428372a640afc32bc72a3c2eb23581e3eada5b 100644 (file)
--- a/cde/programs/dtwm/Session.c
+++ b/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;
 

diff --git a/cde/programs/dtwm/UI.c b/cde/programs/dtwm/UI.c
index 6cba034a461a362ee72b01be7e67dabaa5236242..a3a30632fcf2738c07a0d65947de651f3fa6609f 100644 (file)
--- a/cde/programs/dtwm/UI.c
+++ b/cde/programs/dtwm/UI.c
@@ -696,9 +696,7 @@ PanelControlCreate (Widget parent,
  ************************************************************************/
 
 static void
-BoxCreate ()
-
-
+BoxCreate (void)
 {
    int i, j;
    BoxData * box_data;

diff --git a/cde/programs/dtwm/WmCEvent.c b/cde/programs/dtwm/WmCEvent.c
index af976c574d39a4c88013ef53dc046921168b48d6..3ce479d1fc2302b8ae79464cf26e5361532d4926 100644 (file)
--- a/cde/programs/dtwm/WmCEvent.c
+++ b/cde/programs/dtwm/WmCEvent.c
@@ -2725,8 +2725,7 @@ void DetermineActiveScreen (XEvent *pEvent)
  * 
  *************************************<->***********************************/
 
-WmScreenData * GetScreenForWindow (win)
-    Window win;
+WmScreenData * GetScreenForWindow (Window win)
 
 {
     XWindowAttributes attribs;

diff --git a/cde/programs/dtwm/WmFP.c b/cde/programs/dtwm/WmFP.c
index 0865c1ed5e16454876eac8666f44f34205df938d..1ec9519633252dace076623d50a7dc744ff925ed 100644 (file)
--- a/cde/programs/dtwm/WmFP.c
+++ b/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;

diff --git a/cde/programs/dtwm/WmFeedback.c b/cde/programs/dtwm/WmFeedback.c
index e3b46935addcbdd23cde8ff9c8356aff2094746b..c6e9a22e9aac241397db0acbabb999d44ebc229e 100644 (file)
--- a/cde/programs/dtwm/WmFeedback.c
+++ b/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)
-
-   Widget w;
-   caddr_t client_data;
-   caddr_t call_data;
+static void OkCB (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)
-
-   Widget w;
-   caddr_t client_data;
-   caddr_t call_data;
+static void CancelCB (Widget w, caddr_t client_data, caddr_t call_data)
 {
     WithdrawDialog (w);
 

diff --git a/cde/programs/dtwm/WmFunction.c b/cde/programs/dtwm/WmFunction.c
index fb52b4892fc1cb6ac4b101733f10394bd2d9b621..36305ec78508a6e476dcdbe5c7cc8135b3d579cc 100644 (file)
--- a/cde/programs/dtwm/WmFunction.c
+++ b/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 *pcd;
+ClientData * FindSecondToTopTransient (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)
-    String args;
-    ClientData *pCD;
-    XEvent *event;
-
+Boolean F_Pass_Key (String args, ClientData *pCD, XEvent *event)
 {
     if (wmGD.passKeysActive)
     {

diff --git a/cde/programs/dtwm/WmGraphics.c b/cde/programs/dtwm/WmGraphics.c
index edc7ed1d744ea133d4bde1508e71d4d39549750b..f3c71caea304265e85cb2327e1db2e6b76690a99 100644 (file)
--- a/cde/programs/dtwm/WmGraphics.c
+++ b/cde/programs/dtwm/WmGraphics.c
@@ -984,9 +984,7 @@ Boolean ExtendRList (RList *prl, unsigned int amt)
  *  --------
  *                     
  *************************************<->***********************************/
-RList *AllocateRList (amt)
-
-    unsigned int amt;
+RList *AllocateRList (unsigned int amt)
 {
     RList *prl;
 

diff --git a/cde/programs/dtwm/WmIconBox.c b/cde/programs/dtwm/WmIconBox.c
index 1335e37a5a706353452548e13a542af487bd3ef3..062b346c22661d8d0c2f45b25550e14aece41f89 100644 (file)
--- a/cde/programs/dtwm/WmIconBox.c
+++ b/cde/programs/dtwm/WmIconBox.c
@@ -1581,10 +1581,7 @@ void SetGranularity (WmWorkspaceData *pWS, ClientData *pCD, IconBoxData *pIBD)
  * 
  *************************************<->***********************************/
 
-MenuItem *GetIconBoxMenuItems (pSD)
-
-    WmScreenData *pSD;
-
+MenuItem *GetIconBoxMenuItems (WmScreenData *pSD)
 {
 
     return(ParseMwmMenuStr (pSD, 
@@ -1969,12 +1966,7 @@ Boolean InsertIconIntoBox (IconBoxData *pIBD, ClientData *pCD)
  * 
  *************************************<->***********************************/
 
-IconInfo *InsertIconInfo (pIBD, pCD, theWidget)
-
-    IconBoxData *pIBD;
-    ClientData *pCD;
-    Widget theWidget;
-
+IconInfo *InsertIconInfo (IconBoxData *pIBD, ClientData *pCD, Widget theWidget)
 {
     IconInfo *pII;
     int place;

diff --git a/cde/programs/dtwm/WmImage.c b/cde/programs/dtwm/WmImage.c
index 15f5ee119ac41b7c5d30510d1ad0d2bb1b75b71c..0c043572e186a6323571dc2e9015ad30ee21a3a6 100644 (file)
--- a/cde/programs/dtwm/WmImage.c
+++ b/cde/programs/dtwm/WmImage.c
@@ -964,9 +964,7 @@ int GetBitmapIndex (WmScreenData *pSD, char *name, Boolean bReportError)
  * 
  *************************************<->***********************************/
 
-char *BitmapPathName (string)
-    char *string;
-
+char *BitmapPathName (char *string)
 {
     static char  fileName[MAXWMPATH+1];
     char *retname;

diff --git a/cde/programs/dtwm/WmKeyFocus.c b/cde/programs/dtwm/WmKeyFocus.c
index 7043dba549ca8206aca53eb7b6906abe32cc6923..d34587c6d24cf4937091c1ac3423707c58e99abd 100644 (file)
--- a/cde/programs/dtwm/WmKeyFocus.c
+++ b/cde/programs/dtwm/WmKeyFocus.c
@@ -558,9 +558,7 @@ void ClearFocusIndication (ClientData *pCD, Boolean refresh)
  *        
  *************************************<->***********************************/
 
-ClientData *GetClientUnderPointer (pSameScreen)
-    Boolean *pSameScreen;
-
+ClientData *GetClientUnderPointer (Boolean *pSameScreen)
 {
     Window root;
     Window child;
@@ -871,9 +869,7 @@ Boolean FocusNextTransient (ClientData *pCD, unsigned long type, Boolean initiat
  *
  *************************************<->***********************************/
 
-ClientData *FindLastTransientTreeFocus (pCD, pcdNoFocus)
-    ClientData *pCD;
-    ClientData *pcdNoFocus;
+ClientData *FindLastTransientTreeFocus (ClientData *pCD, ClientData *pcdNoFocus)
 
 {
     ClientData *pcdNext;
@@ -934,10 +930,7 @@ ClientData *FindLastTransientTreeFocus (pCD, pcdNoFocus)
  *
  *************************************<->***********************************/
 
-ClientData *FindNextTFocusInSeq (pCD, startAt)
-    ClientData *pCD;
-    unsigned long startAt;
-
+ClientData *FindNextTFocusInSeq (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 *pCD;
-    unsigned long startAt;
-
+ClientData *FindPrevTFocusInSeq (ClientData *pCD, unsigned long startAt)
 {
     ClientData *pcdNextFocus = NULL;
     ClientData *pcdNext;

diff --git a/cde/programs/dtwm/WmMenu.c b/cde/programs/dtwm/WmMenu.c
index cffed7e93c19938468cb8b2913eb4f913749df60..8a7bc01217e3a9ec7bd9207c3d7a55e2460e4520 100644 (file)
--- a/cde/programs/dtwm/WmMenu.c
+++ b/cde/programs/dtwm/WmMenu.c
@@ -302,10 +302,7 @@ MenuSpec *MakeMenu (WmScreenData *pSD,
 
 \f
 /*************************************<->***********************************/
-void CheckTerminalSeparator(menuSpec, buttonWidget, manage)
-     MenuSpec *menuSpec;
-     Widget buttonWidget;
-     Boolean manage;
+void CheckTerminalSeparator(MenuSpec *menuSpec, Widget buttonWidget, Boolean manage)
 {
     CompositeWidget cw;
     WidgetList      children;

diff --git a/cde/programs/dtwm/WmResParse.c b/cde/programs/dtwm/WmResParse.c
index 12274bea774724300cae0b3fecc27ae1fc7bff2b..7587373fa2bcc7c18a8c67945627d25af1d06d41 100644 (file)
--- a/cde/programs/dtwm/WmResParse.c
+++ b/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)
-    String     lang;
+static char *ExtractLocaleName(String lang)
 {
 
 #ifdef hpux     /* hpux-specific parsing of the locale string */

diff --git a/cde/programs/dtwm/WmResource.c b/cde/programs/dtwm/WmResource.c
index e414e58a81e8ce3392c16a3474051cd57c5112b8..059521df1902ffc59b3dc94a33c6f2a544e96588 100644 (file)
--- a/cde/programs/dtwm/WmResource.c
+++ b/cde/programs/dtwm/WmResource.c
@@ -5850,11 +5850,8 @@ _WmGetDynamicDefault (Widget widget, unsigned char type, String defaultColor, Pi
  * 
  *************************************<->***********************************/
 
-XmColorData * _WmGetDefaultColors (screen, colormap, defaultColor)
-       Screen *screen;
-       Colormap colormap;
-       String defaultColor;
-
+XmColorData * _WmGetDefaultColors (Screen *screen, 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 *ptr;
-       unsigned size;
-
+char * WmRealloc (char *ptr, unsigned size)
 {
     if (ptr)
     {
@@ -6034,10 +6028,7 @@ char * WmRealloc (ptr, size)
  * 
  *************************************<->***********************************/
 
-char * WmMalloc (ptr, size)
-       char *ptr;
-       unsigned size;
-
+char * WmMalloc (char *ptr, unsigned size)
 {
     if (ptr)
     {
@@ -6083,10 +6074,7 @@ char * WmMalloc (ptr, size)
  *************************************<->***********************************/
 
 void
-SetupDefaultResources (pSD)
-
-WmScreenData *pSD;
-
+SetupDefaultResources (WmScreenData *pSD)
 {
     KeySpec *nextKeySpec;
     String keyBindings;