16 files changed, 189 insertions, 418 deletions

diff --git a/.gitignore b/.gitignore
index 44249ab..2bac438 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,7 @@ install-sh
 missing
 stamp-h1
 *~
+*.o
+editres-*-.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 8f08bc8..76158dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,29 +42,22 @@ appman_PRE = \
 
 # App default files  (*.ad)
 
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
+
 appdefaultdir = @appdefaultdir@
 
-APPDEFAULTFILES = \
+dist_appdefault_DATA = \
         app-defaults/Editres-color \
         app-defaults/Editres
 
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) ChangeLog autogen.sh
-
-SUFFIXES = .ad 
-
-.ad:
-	[ -d app-defaults ] || mkdir app-defaults
-	cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
+EXTRA_DIST = ChangeLog autogen.sh
 
-CLEANFILES = $(APPDEFAULTFILES)
 MAINTAINERCLEANFILES=ChangeLog
 
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
 
@@ -73,7 +66,7 @@ appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
 EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+CLEANFILES = $(appman_DATA)
 
 SED = sed
 
@@ -94,7 +87,7 @@ MAN_SUBSTS = \
 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
diff --git a/actions.c b/actions.c
index a6764e0..a3d1820 100644
--- a/actions.c
+++ b/actions.c
@@ -93,11 +93,7 @@ Boolean do_get_values = False;
 
 /* ARGSUSED */
 static void
-EnableGetVal(w, event, params, num_params)
-Widget w;
-XEvent * event;
-String * params;
-Cardinal * num_params;
+EnableGetVal(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
   do_get_values = True;
 }
@@ -116,11 +112,7 @@ Cardinal * num_params;
 
 /* ARGSUSED */
 static void
-SelectAction(w, event, params, num_params)
-Widget w;
-XEvent * event;
-String * params;
-Cardinal * num_params;
+SelectAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     WNode * node;
     int type;
@@ -161,11 +153,7 @@ Cardinal * num_params;
 
 /* ARGSUSED */
 static void
-RelabelAction(w, event, params, num_params)
-Widget w;
-XEvent * event;
-String * params;
-Cardinal * num_params;
+RelabelAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     WNode * node;
     int type;
@@ -195,11 +183,8 @@ Cardinal * num_params;
 /* ARGSUSED */
 
 static void
-PopdownFileDialogAction(w, event, params, num_params)
-Widget w;
-XEvent * event;
-String * params;
-Cardinal * num_params;
+PopdownFileDialogAction(Widget w, XEvent *event,
+			String *params, Cardinal *num_params)
 {
     char buf[BUFSIZ];
     Boolean val;
@@ -239,11 +224,7 @@ Cardinal * num_params;
 
 /* ARGSUSED */
 static void
-ActionQuit(w, event, params, num_params)
-Widget w;
-XEvent * event;
-String * params;
-Cardinal * num_params;
+ActionQuit(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
   if (w==global_toplevel) {
     XtDestroyApplicationContext(XtWidgetToApplicationContext(w));
@@ -273,8 +254,7 @@ static XtActionsRec actions[] = {
 };
 
 void
-SetApplicationActions(app_con)
-XtAppContext app_con;
+SetApplicationActions(XtAppContext app_con)
 {
     XtAppAddActions(app_con, actions, XtNumber(actions));
     
@@ -299,11 +279,8 @@ XtAppContext app_con;
  */
 
 static Boolean
-CheckAndFindEntry(action_name, params, num_params, table, num_table, type)
-String * params, action_name;
-Cardinal num_params, num_table;
-struct ActionValues * table;
-int * type;
+CheckAndFindEntry(String action_name, String *params, Cardinal num_params,
+		  struct ActionValues *table, Cardinal num_table, int *type)
 {
     char buf[BUFSIZ];
     int i;
@@ -345,8 +322,7 @@ int * type;
  */
 
 static WNode *
-FindTreeNodeFromWidget(w)
-Widget w;
+FindTreeNodeFromWidget(Widget w)
 {
     int ret_val;
     XPointer data_return;
diff --git a/app-defaults/Editres.ad b/app-defaults/Editres
index 9e8dc16..9e8dc16 100644
--- a/app-defaults/Editres.ad
+++ b/app-defaults/Editres
diff --git a/app-defaults/Editres-color.ad b/app-defaults/Editres-color
index 1895427..1895427 100644
--- a/app-defaults/Editres-color.ad
+++ b/app-defaults/Editres-color
diff --git a/comm.c b/comm.c
index 52e03b3..289b3b5 100644
--- a/comm.c
+++ b/comm.c
@@ -83,9 +83,7 @@ static char * DispatchEvent ( Event * event );
 
 /* ARGSUSED */
 static void
-ClientTimedOut(data, id)
-XtPointer data;
-XtIntervalId * id;
+ClientTimedOut(XtPointer data, XtIntervalId *id)
 {
   char msg[BUFSIZ];
   Widget w = (Widget) data;
@@ -108,9 +106,7 @@ XtIntervalId * id;
  */
 
 Window 
-GetClientWindow(w, x, y)
-Widget w;
-int *x, *y;
+GetClientWindow(Widget w, int *x, int *y)
 {
   int status;
   Cursor cursor;
@@ -187,10 +183,7 @@ int *x, *y;
 
 /* ARGSUSED */
 void
-SetCommand(w, command, msg)
-     Widget w;
-     ResCommand command;
-     char * msg;
+SetCommand(Widget w, ResCommand command, char *msg)
 {
   XClientMessageEvent client_event;
   Display * dpy = XtDisplay(w);
@@ -263,9 +256,7 @@ SetCommand(w, command, msg)
  */
 
 static void
-TellUserAboutMessage(label, command)
-Widget label;
-ResCommand command;
+TellUserAboutMessage(Widget label, ResCommand command)
 {
     char msg[BUFSIZ], *str;
 
@@ -306,12 +297,8 @@ ResCommand command;
 
 /* ARGSUSED */
 static Boolean
-ConvertCommand(w,selection,target,type_ret, value_ret, length_ret, format_ret)
-Widget w;
-Atom * selection, * target, * type_ret;
-XtPointer *value_ret;
-unsigned long * length_ret;
-int * format_ret;
+ConvertCommand(Widget w, Atom *selection, Atom *target, Atom *type_ret,
+	       XtPointer *value_ret, unsigned long *length_ret, int *format_ret)
 {
     if ((*selection != atom_comm) || (*target != atom_command))
 	return(FALSE);
@@ -334,9 +321,7 @@ int * format_ret;
 
 /* ARGSUSED */
 static void
-SelectionDone(w, sel, targ)
-    Widget w;
-    Atom *sel, *targ;
+SelectionDone(Widget w, Atom *sel, Atom *targ)
 {
     /* Keep the toolkit from automaticaly freeing the selection value */
 }
@@ -352,9 +337,7 @@ SelectionDone(w, sel, targ)
  */
 
 static void
-LoseSelection(w, sel)
-Widget w;
-Atom * sel;
+LoseSelection(Widget w, Atom *sel)
 {
     if (global_client.timeout != 0) {
 	XtRemoveTimeOut(global_client.timeout);
@@ -384,12 +367,8 @@ static Boolean reset_protocol_level = True;
 
 /* ARGSUSED */
 static void
-GetClientValue(w, data, selection, type, value, length, format)
-Widget w;
-XtPointer data, value;
-Atom *selection, *type;
-unsigned long *length;
-int * format;
+GetClientValue(Widget w, XtPointer data, Atom *selection, Atom *type,
+	       XtPointer value, unsigned long *length, int *format)
 {
     Event * event;
     ProtocolStream alloc_stream, *stream;
@@ -490,8 +469,7 @@ int * format;
  */
 
 static void
-BuildHeader(client_data)
-CurrentClient * client_data;
+BuildHeader(CurrentClient *client_data)
 {
     unsigned long old_alloc, old_size;
     unsigned char * old_current;
@@ -561,8 +539,7 @@ CurrentClient * client_data;
  */
 
 static Event * 
-BuildEvent(stream)
-ProtocolStream * stream;
+BuildEvent(ProtocolStream *stream)
 {
     int i;
     Event * event = (Event *) XtCalloc(sizeof(Event), 1);
@@ -793,8 +770,7 @@ ProtocolStream * stream;
  */
 
 static void
-FreeEvent(event)
-Event * event;
+FreeEvent(Event *event)
 {
     unsigned int i;
 
@@ -894,8 +870,7 @@ Event * event;
  */
 	
 static char *
-DispatchEvent(event)
-Event * event;
+DispatchEvent(Event *event)
 {
     char * error = NULL;
 
@@ -938,8 +913,7 @@ Event * event;
  */
 
 void
-InternAtoms(dpy)
-Display * dpy;
+InternAtoms(Display * dpy)
 {
     atom_comm = XInternAtom(dpy, EDITRES_COMM_ATOM, False);
     atom_command = XInternAtom(dpy, EDITRES_COMMAND_ATOM, False);
@@ -949,7 +923,7 @@ Display * dpy;
 }
 
 ResIdent
-GetNewIdent()
+GetNewIdent(void)
 {
     static ResIdent ident = 1;
 
diff --git a/configure.ac b/configure.ac
index dafd9f8..f5a9c20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,25 +26,35 @@ AC_INIT(editres,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xor
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
-PKG_CHECK_MODULES(XAW, xaw7)
+XORG_CWARNFLAGS
 
 # Checks for pkg-config packages
+PKG_CHECK_MODULES(XAW, xaw7)
 PKG_CHECK_MODULES(EDITRES, x11 xt xmu)
-EDITRES_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
-EDITRES_LIBS="$DEP_LIBS $XAW_LIBS"
+EDITRES_CFLAGS="$CWARNFLAGS $EDITRES_CFLAGS $XAW_CFLAGS"
+EDITRES_LIBS="$EDITRES_LIBS $XAW_LIBS"
 AC_SUBST(EDITRES_CFLAGS)
 AC_SUBST(EDITRES_LIBS)
 
 PKG_CHECK_MODULES(APPDEFS, xt)
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_ARG_WITH(appdefaultdir,
+	AC_HELP_STRING([--with-appdefaultdir=<pathname>],
+	  [specify directory for app-defaults files (default is autodetected)]),
+	[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
 AC_SUBST(appdefaultdir)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])
diff --git a/editres.c b/editres.c
index d8d436f..71e1765 100644
--- a/editres.c
+++ b/editres.c
@@ -65,7 +65,7 @@ AppResources global_resources;
 
 static void Syntax ( XtAppContext app_con, char *call );
 
-String fallback_resources[] = { 
+static String fallback_resources[] = { 
     NULL,
 };
 
@@ -87,9 +87,7 @@ static XtResource editres_resources[] = {
 Atom wm_delete_window;
 
 int
-main(argc, argv)
-int argc;
-char **argv;
+main(int argc, char **argv)
 {
     XtAppContext app_con;
 
@@ -140,9 +138,7 @@ char **argv;
  */
 
 static void 
-Syntax(app_con, call)
-XtAppContext app_con;
-char *call;
+Syntax(XtAppContext app_con, char *call)
 {
     XtDestroyApplicationContext(app_con);
     fprintf(stderr, "Usage: %s\n", call);
diff --git a/editresP.h b/editresP.h
index 0719511..755de65 100644
--- a/editresP.h
+++ b/editresP.h
@@ -315,25 +315,33 @@ typedef union _Event {
 /*
  * Global variables. 
  */
+extern int global_effective_protocol_version;
+extern char* global_effective_toolkit;
+extern int global_error_code;
+extern unsigned long global_serial_num;
+extern int (*global_old_error_handler)(Display *, XErrorEvent *);
+extern Boolean global_resource_box_up;
+
+extern TreeInfo *global_tree_info;
+extern CurrentClient global_client;
+extern ScreenData global_screen_data;
+extern Widget global_tree_parent;
+extern Widget global_paned;	/* named after toolkit */
+extern Widget global_toplevel;
+extern AppResources global_resources;
+
+extern String res_labels[NUM_RES_LABELS];
+
+extern Boolean do_get_values;
+extern Atom wm_delete_window;
 
-#ifndef THIS_IS_MAIN
-    extern int global_effective_protocol_version;
-    extern char* global_effective_toolkit;
-    extern int global_error_code;
-    extern unsigned long global_serial_num;
-    extern int (*global_old_error_handler)(Display *, XErrorEvent *);
-    extern Boolean global_resource_box_up;
-
-    extern TreeInfo *global_tree_info;
-    extern CurrentClient global_client;
-    extern ScreenData global_screen_data;
-    extern Widget global_tree_parent;
-    extern Widget global_paned;	/* named after toolkit */
-    extern Widget global_toplevel;
-    extern AppResources global_resources;
-
-    extern String res_labels[NUM_RES_LABELS];
-#endif
+/* number of entries in the command menu */
+#define NUM_CM_ENTRIES 8
+extern Widget CM_entries[NUM_CM_ENTRIES];
+
+/* number of entries in the tree menu */
+#define NUM_TM_ENTRIES 16
+extern Widget TM_entries[NUM_TM_ENTRIES];
 
 /*
  * Macros.
@@ -341,14 +349,10 @@ typedef union _Event {
 
 #define streq(a, b)        ( strcmp((a), (b)) == 0 )
 
-/* number of entries in the command menu */
-#define NUM_CM_ENTRIES 8
 /* offset into CM entries for setting insensitive */
 #define CM_OFFSET 1
 /* number of CM entries to make insensitive */
 #define CM_NUM 5
-/* number of entries in the tree menu */
-#define NUM_TM_ENTRIES 16
 #define TM_OFFSET 0
 #define TM_NUM 16
 
diff --git a/geometry.c b/geometry.c
index ab706a9..8be1d9a 100644
--- a/geometry.c
+++ b/geometry.c
@@ -58,8 +58,7 @@ static void FlashWidgetsCleanup ( XtPointer info_ptr, XtIntervalId * id );
  */
 
 void 
-_FindWidget(w)
-Widget w;
+_FindWidget(Widget w)
 {
     char msg[BUFSIZ];
     WNode * node;
@@ -96,8 +95,7 @@ Widget w;
  */
 
 void
-DisplayChild(event)
-Event * event;
+DisplayChild(Event *event)
 {
     FindChildEvent * find_event = (FindChildEvent *) event;
     WNode * node;
@@ -129,8 +127,7 @@ Event * event;
  */
 
 void
-_FlashActiveWidgets(tree_info)
-TreeInfo * tree_info;
+_FlashActiveWidgets(TreeInfo *tree_info)
 {
     int i;
     ProtocolStream * stream = &(global_client.stream);
@@ -166,8 +163,7 @@ TreeInfo * tree_info;
  */
 
 char *
-HandleFlashWidget(event)
-Event * event;
+HandleFlashWidget(Event *event)
 {
     GetGeomEvent * geom_event = (GetGeomEvent *) event;
     char * errors = NULL;
@@ -190,10 +186,7 @@ Event * event;
  */
 
 static void
-AddToFlashList(tree_info, geom_info, errors)
-TreeInfo * tree_info;
-GetGeomInfo * geom_info;
-char ** errors;
+AddToFlashList(TreeInfo *tree_info, GetGeomInfo *geom_info, char **errors)
 {
     WNode * node;
     char buf[BUFSIZ];
@@ -235,12 +228,8 @@ char ** errors;
  */
 
 static void
-_AddToFlashList(tree_info, errors, node, x, y, width, height)
-TreeInfo * tree_info;
-char ** errors;
-WNode * node;
-int x, y;
-unsigned int width, height;
+_AddToFlashList(TreeInfo *tree_info, char **errors, WNode *node,
+		int x, int y, unsigned int width, unsigned int height)
 {
     Display * dpy = XtDisplay(tree_info->tree_widget);
     Window window = (Window) node->window;
@@ -304,10 +293,8 @@ unsigned int width, height;
 #define MORE_FLASH_WIDGETS 5
 
 static void
-CreateFlashWidget(tree_info, x, y, width, height)
-TreeInfo * tree_info;
-int x, y;
-unsigned int width, height;
+CreateFlashWidget(TreeInfo *tree_info, int x, int y,
+		  unsigned int width, unsigned int height)
 {
     Widget shell;
     Arg args[3];
@@ -350,8 +337,7 @@ unsigned int width, height;
  */
 
 static void
-FlashWidgets(tree_info)
-TreeInfo * tree_info;
+FlashWidgets(TreeInfo *tree_info)
 {
     int i;
     unsigned long wait, half_flash;
@@ -383,9 +369,7 @@ TreeInfo * tree_info;
 
 /* ARGSUSED */
 static void
-FlashWidgetsOn(info_ptr, id)
-XtPointer info_ptr;
-XtIntervalId * id;
+FlashWidgetsOn(XtPointer info_ptr, XtIntervalId *id)
 {
 
     int i;
@@ -407,9 +391,7 @@ XtIntervalId * id;
 
 /* ARGSUSED */
 static void
-FlashWidgetsOff(info_ptr, id)
-XtPointer info_ptr;
-XtIntervalId * id;
+FlashWidgetsOff(XtPointer info_ptr, XtIntervalId *id)
 {
     int i;
     TreeInfo * tree_info = (TreeInfo *) info_ptr;
@@ -427,9 +409,7 @@ XtIntervalId * id;
 
 /* ARGSUSED */
 static void
-FlashWidgetsCleanup(info_ptr, id)
-XtPointer info_ptr;
-XtIntervalId * id;
+FlashWidgetsCleanup(XtPointer info_ptr, XtIntervalId *id)
 {
     int i;
     TreeInfo * tree_info = (TreeInfo *) info_ptr;
diff --git a/handler.c b/handler.c
index c7b7770..6d14c77 100644
--- a/handler.c
+++ b/handler.c
@@ -63,9 +63,7 @@ static void SetOnlyMatchingWidgets ( WNode * node, XtPointer info_ptr );
 
 /* ARGSUSED */
 void
-Quit(w, client_data, call_data)
-Widget w;
-XtPointer call_data, client_data;
+Quit(Widget w, XtPointer client_data, XtPointer call_data)
 {
     XtDestroyApplicationContext(XtWidgetToApplicationContext(w));
     exit(0);
@@ -84,9 +82,7 @@ XtPointer call_data, client_data;
 
 /* ARGSUSED */
 void
-SendTree(w, value, call_data)
-Widget w;
-XtPointer value, call_data;
+SendTree(Widget w, XtPointer value, XtPointer call_data)
 {
     if ((Boolean)(long) value)
 	global_client.window = None;
@@ -109,9 +105,7 @@ XtPointer value, call_data;
 
 /* ARGSUSED */
 void
-FindWidget(w, client_data, call_data)
-Widget w;
-XtPointer client_data, call_data;
+FindWidget(Widget w, XtPointer client_data, XtPointer call_data)
 {
 
     _FindWidget(XtParent(w));	/* Use parent since it is a "real"
@@ -128,9 +122,7 @@ XtPointer client_data, call_data;
 
 /* ARGSUSED */
 void
-InitSetValues(w, client_data, call_data)
-Widget w;
-XtPointer call_data, client_data;
+InitSetValues(Widget w, XtPointer client_data, XtPointer call_data)
 {
     if (!XtIsWidget(w))     /* Make sure that we use a "Real" widget here. */
 	w = XtParent(w);
@@ -148,9 +140,7 @@ XtPointer call_data, client_data;
 
 /* ARGSUSED */
 void
-TreeSelect(w, client_data, call_data)
-Widget w;
-XtPointer call_data, client_data;
+TreeSelect(Widget w, XtPointer client_data, XtPointer call_data)
 {
     SelectTypes type = (SelectTypes) (unsigned long) client_data;
 
@@ -167,9 +157,7 @@ XtPointer call_data, client_data;
 
 /* ARGSUSED */
 void
-TreeRelabel(w, client_data, call_data)
-Widget w;
-XtPointer call_data, client_data;
+TreeRelabel(Widget w, XtPointer client_data, XtPointer call_data)
 {
     LabelTypes type = (LabelTypes) (unsigned long) client_data;
 
@@ -186,9 +174,7 @@ XtPointer call_data, client_data;
 
 /* ARGSUSED */
 void 
-PannerCallback(w, closure, report_ptr)
-Widget w;
-XtPointer closure, report_ptr;
+PannerCallback(Widget w, XtPointer closure, XtPointer report_ptr)
 {
     Arg args[2];
     XawPannerReport *report = (XawPannerReport *) report_ptr;
@@ -213,9 +199,7 @@ XtPointer closure, report_ptr;
 
 /* ARGSUSED */
 void 
-PortholeCallback(w, panner_ptr, report_ptr)
-Widget w;
-XtPointer panner_ptr, report_ptr;
+PortholeCallback(Widget w, XtPointer panner_ptr, XtPointer report_ptr)
 {
     Arg args[10];
     Cardinal n = 0;
@@ -241,9 +225,7 @@ XtPointer panner_ptr, report_ptr;
 
 /* ARGSUSED */
 void 
-FlashActiveWidgets(w, junk, garbage)
-Widget w;
-XtPointer junk, garbage;
+FlashActiveWidgets(Widget w, XtPointer junk, XtPointer garbage)
 {
     _FlashActiveWidgets(global_tree_info);
 }
@@ -256,9 +238,7 @@ XtPointer junk, garbage;
 
 /* ARGSUSED */
 void
-GetResourceList(w, junk, garbage)
-Widget w;
-XtPointer junk, garbage;
+GetResourceList(Widget w, XtPointer junk, XtPointer garbage)
 {
     WNode * node;
     ProtocolStream * stream = &(global_client.stream);
@@ -305,9 +285,7 @@ XtPointer junk, garbage;
 
 /* ARGSUSED */
 void 
-DumpTreeToFile(w, junk, garbage)
-Widget w;
-XtPointer junk, garbage;
+DumpTreeToFile(Widget w, XtPointer junk, XtPointer garbage)
 {
     _PopupFileDialog(XtParent(w), "Enter the filename:", "",
 		     _DumpTreeToFile, (XtPointer) global_tree_info);
@@ -332,9 +310,7 @@ XtPointer junk, garbage;
 
 /* ARGSUSED */
 void 
-AnyChosen(w, any_info_ptr, state_ptr)
-Widget w;
-XtPointer any_info_ptr, state_ptr;
+AnyChosen(Widget w, XtPointer any_info_ptr, XtPointer state_ptr)
 {
     AnyInfo * any_info = (AnyInfo *) any_info_ptr;
     Boolean state = (Boolean)(long) state_ptr;
@@ -396,8 +372,7 @@ XtPointer any_info_ptr, state_ptr;
 
 
 static char *
-GetResourceName(res_box)
-ResourceBoxInfo * res_box;
+GetResourceName(ResourceBoxInfo *res_box)
 {
     XawListReturnStruct * list_info;
     char * result;
@@ -430,9 +405,8 @@ ResourceBoxInfo * res_box;
  */
 
 void
-ActivateWidgetsAndSetResourceString(w, node_ptr, call_data)
-Widget w;
-XtPointer node_ptr, call_data;
+ActivateWidgetsAndSetResourceString(Widget w,
+				    XtPointer node_ptr, XtPointer call_data)
 {
     SetResourceString(w, node_ptr, call_data);
     ActivateResourceWidgets(w, node_ptr, call_data);
@@ -449,9 +423,7 @@ XtPointer node_ptr, call_data;
  */
 
 void
-SetResourceString(w, node_ptr, junk)
-Widget w;
-XtPointer node_ptr, junk;
+SetResourceString(Widget w, XtPointer node_ptr, XtPointer junk)
 {
     static char * malloc_string; /* These are both inited to zero. */
     static Cardinal malloc_size;
@@ -532,9 +504,7 @@ XtPointer node_ptr, junk;
 extern Boolean do_get_values;
 
 void
-ResourceListCallback(list, node_ptr, junk)
-Widget list;
-XtPointer node_ptr, junk;
+ResourceListCallback(Widget list, XtPointer node_ptr, XtPointer junk)
 {
     Widget o_list;
     WNode * node = (WNode *) node_ptr;
@@ -568,9 +538,7 @@ XtPointer node_ptr, junk;
 
 /* ARGSUSED */
 void
-PopdownResBox(w, shell_ptr, junk)
-Widget w;
-XtPointer shell_ptr, junk;
+PopdownResBox(Widget w, XtPointer shell_ptr, XtPointer junk)
 {
     Widget shell = (Widget) shell_ptr;
 
@@ -580,9 +548,7 @@ XtPointer shell_ptr, junk;
 
 /* ARGSUSED */
 static void
-_AppendResourceString(w, res_box_ptr, filename_ptr)
-Widget w;
-XtPointer res_box_ptr, filename_ptr;
+_AppendResourceString(Widget w, XtPointer res_box_ptr, XtPointer filename_ptr)
 {
     Arg args[1];
     FILE * fp;
@@ -629,9 +595,7 @@ XtPointer res_box_ptr, filename_ptr;
 
 /* ARGSUSED */
 void
-SaveResource(w, res_box_ptr, junk)
-Widget w;
-XtPointer res_box_ptr, junk;
+SaveResource(Widget w, XtPointer res_box_ptr, XtPointer junk)
 {
     /* 
      * If there is no filename the ask for one, otherwise just save to
@@ -656,9 +620,7 @@ XtPointer res_box_ptr, junk;
 
 /* ARGSUSED */
 static void
-_SetResourcesFile(w, junk, filename_ptr)
-Widget w;
-XtPointer junk, filename_ptr;
+_SetResourcesFile(Widget w, XtPointer junk, XtPointer filename_ptr)
 {
     char *filename = (char *) filename_ptr;
 
@@ -680,9 +642,7 @@ XtPointer junk, filename_ptr;
 
 /* ARGSUSED */
 void
-SetFile(w, junk, garbage)
-Widget w;
-XtPointer junk, garbage;
+SetFile(Widget w, XtPointer junk, XtPointer garbage)
 {
     /* 
      * If there is no filename the ask for one, otherwise just save to
@@ -705,9 +665,7 @@ XtPointer junk, garbage;
 
 /* ARGSUSED */
 void
-ApplyResource(w, node_ptr, junk)
-Widget w;
-XtPointer node_ptr, junk;
+ApplyResource(Widget w, XtPointer node_ptr, XtPointer junk)
 {
     ProtocolStream * stream = &(global_client.stream);
     ApplyResourcesInfo info;
@@ -775,8 +733,7 @@ XtPointer node_ptr, junk;
 
 /* ARGSUSED */
 static void
-ObtainResource(node_ptr)
-XtPointer node_ptr;
+ObtainResource(XtPointer node_ptr)
 {
     ProtocolStream * stream = &(global_client.stream);
     ObtainResourcesInfo info;
@@ -821,9 +778,7 @@ XtPointer node_ptr;
  */
 
 static void
-CreateSetValuesCommand(node, info_ptr)
-WNode * node;
-XtPointer info_ptr;
+CreateSetValuesCommand(WNode *node, XtPointer info_ptr)
 {
     ApplyResourcesInfo * info = (ApplyResourcesInfo *) info_ptr;
     XrmNameList name_quarks;
@@ -855,9 +810,7 @@ XtPointer info_ptr;
 /*****
 
 static void
-CreateGetValuesCommand(node, info_ptr)
-WNode * node;
-XtPointer info_ptr;
+CreateGetValuesCommand(WNode *node, XtPointer info_ptr)
 {
     ApplyResourcesInfo * info = (ApplyResourcesInfo *) info_ptr;
     XrmNameList name_quarks;
@@ -891,9 +844,7 @@ XtPointer info_ptr;
 
 /* ARGSUSED */
 void
-ActivateResourceWidgets(w, node_ptr, junk)
-Widget w;
-XtPointer node_ptr, junk;
+ActivateResourceWidgets(Widget w, XtPointer node_ptr, XtPointer junk)
 {
     WNode * node = (WNode *) node_ptr;	       
     ApplyResourcesInfo info;
@@ -932,9 +883,7 @@ XtPointer node_ptr, junk;
  */
 
 static void
-SetOnlyMatchingWidgets(node, info_ptr)
-WNode * node;
-XtPointer info_ptr;
+SetOnlyMatchingWidgets(WNode *node, XtPointer info_ptr)
 {
     ApplyResourcesInfo * info = (ApplyResourcesInfo *) info_ptr;
     XrmNameList name_quarks;
diff --git a/setvalues.c b/setvalues.c
index 5c4ac3b..810d4f7 100644
--- a/setvalues.c
+++ b/setvalues.c
@@ -49,8 +49,7 @@ in this Software without prior written authorization from The Open Group.
  */
 
 char *
-PrintSetValuesError(event)
-Event * event;
+PrintSetValuesError(Event *event)
 {
     char * errors = NULL;
     WNode * node;
@@ -86,9 +85,7 @@ Event * event;
  */
 
 char *
-GetResourceValueForSetValues(node, size)
-WNode * node;
-unsigned short * size;
+GetResourceValueForSetValues(WNode *node, unsigned short *size)
 {
     Arg args[1];
     char *ptr, *temp;
diff --git a/svpopup.c b/svpopup.c
index 8affe88..f949f5e 100644
--- a/svpopup.c
+++ b/svpopup.c
@@ -61,9 +61,7 @@ static void CancelSetValues ( Widget w, XtPointer junk, XtPointer garbage );
 
 /* ARGSUSED */
 void
-PopupSetValues(parent, event)
-Widget parent;
-XEvent * event;
+PopupSetValues(Widget parent, XEvent *event)
 {
     Arg args[1];
 
@@ -107,11 +105,7 @@ XEvent * event;
 
 /* ARGSUSED */
 void 
-ModifySVEntry(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String * params;
-Cardinal * num_params;
+ModifySVEntry(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     Widget new, old;
     char msg[BUFSIZ];
@@ -156,8 +150,7 @@ Cardinal * num_params;
  */
 
 static void
-_SetField(new, old)
-Widget new, old;
+_SetField(Widget new, Widget old)
 {
     Arg args[2];
     Pixel new_border, old_border, old_bg;
@@ -199,9 +192,7 @@ Widget new, old;
  */
 
 static void
-CreateSetValuesPopup(parent, scr_data)
-Widget parent;
-ScreenData * scr_data;
+CreateSetValuesPopup(Widget parent, ScreenData *scr_data)
 {
     Widget form, cancel, do_it, label;
     Widget res_label;
@@ -286,9 +277,7 @@ ScreenData * scr_data;
 
 /* ARGSUSED */
 static void
-DoSetValues(w, junk, garbage)
-Widget w;
-XtPointer junk, garbage;
+DoSetValues(Widget w, XtPointer junk, XtPointer garbage)
 {
     ProtocolStream * stream = &(global_client.stream);
     char *res_name, *res_value;
@@ -328,9 +317,7 @@ XtPointer junk, garbage;
 
 /* ARGSUSED */
 static void
-CancelSetValues(w, junk, garbage)
-Widget w;
-XtPointer junk, garbage;
+CancelSetValues(Widget w, XtPointer junk, XtPointer garbage)
 {
     XtPopdown(XtParent(XtParent(w))); 
 }
diff --git a/utils.c b/utils.c
index dd2e8a3..56ba14d 100644
--- a/utils.c
+++ b/utils.c
@@ -58,9 +58,7 @@ static void FreeResources ( WidgetResources * resources );
  */
 
 void
-SetMessage(w, str)
-Widget w;
-char * str;
+SetMessage(Widget w, char *str)
 {
     Arg args[1];
 
@@ -136,8 +134,7 @@ GetAllStrings(char *in, char sep, char ***out, int *num)
  */
 
 void
-AddString(str, add)
-char ** str, *add;
+AddString(char ** str, char *add)
 {
     int len_str, len_add;
     char * ptr;
@@ -158,10 +155,7 @@ char ** str, *add;
  */
 
 WNode *
-FindNode(top_node, ids, number)
-WNode *top_node;
-unsigned long * ids;
-Cardinal number;
+FindNode(WNode *top_node, unsigned long *ids, Cardinal number)
 {
     int i, j;
     WNode *node;
@@ -196,9 +190,7 @@ Cardinal number;
  */
 
 WNode * 
-FindWidgetFromWindow(tree_info, win)
-TreeInfo * tree_info;
-Window win;
+FindWidgetFromWindow(TreeInfo *tree_info, Window win)
 {
     if (tree_info == NULL)
 	return(NULL);
@@ -214,9 +206,7 @@ Window win;
  */
 
 static WNode *
-FindWidgetFromWindowGivenNode(node, win)
-WNode * node;
-Window win;
+FindWidgetFromWindowGivenNode(WNode *node, Window win)
 {
     int i;
     WNode * ret_node;
@@ -241,9 +231,7 @@ Window win;
 
 /* ARGSUSED */
 int
-HandleXErrors(display, error)
-Display * display;
-XErrorEvent * error;
+HandleXErrors(Display *display, XErrorEvent *error)
 {
     if (error->serial != global_serial_num) {
 	(*global_old_error_handler) (display, error);
@@ -271,10 +259,7 @@ XErrorEvent * error;
 /* ARGSUSED */
 
 void
-_DumpTreeToFile(w, tree_ptr, filename)
-Widget w;
-XtPointer tree_ptr;
-XtPointer filename;
+_DumpTreeToFile(Widget w, XtPointer tree_ptr, XtPointer filename)
 {
     TreeInfo * tree_info = (TreeInfo *) tree_ptr;
     FILE * fp; 
@@ -325,11 +310,8 @@ typedef struct _FileDialogInfo {
 } FileDialogInfo;
 
 void
-_PopupFileDialog(w, str, default_value, func, data)
-Widget w;
-String str, default_value;
-XtCallbackProc func;
-XtPointer data;
+_PopupFileDialog(Widget w, String str, String default_value,
+		 XtCallbackProc func, XtPointer data)
 {
     FileDialogInfo * file_info;
     Widget shell, dialog;
@@ -377,10 +359,7 @@ XtPointer data;
  */
 
 void
-PopupCentered(event, w, mode)
-XEvent * event;
-Widget w;
-XtGrabKind mode;
+PopupCentered(XEvent *event, Widget w, XtGrabKind mode)
 {
     Boolean get_from_cursor = FALSE;
     Arg args[3];
@@ -459,9 +438,7 @@ XtGrabKind mode;
 /* ARGSUSED */
 
 void 
-_PopdownFileDialog(w, client_data, junk)
-Widget w;
-XtPointer client_data, junk;
+_PopdownFileDialog(Widget w, XtPointer client_data, XtPointer junk)
 {
     Widget dialog = XtParent(w);
     XPointer file_info_ptr;
@@ -504,9 +481,7 @@ XtPointer client_data, junk;
  */
 
 void
-GetNamesAndClasses(node, names, classes)
-WNode * node;
-char *** names, ***classes;
+GetNamesAndClasses(WNode *node, char ***names, char ***classes)
 {
     int i, total_widgets;
     WNode * temp = node;
@@ -532,8 +507,7 @@ char *** names, ***classes;
  */
 
 char *
-HandleGetResources(event)
-Event * event;
+HandleGetResources(Event *event)
 {
     GetResourcesEvent * get_event = (GetResourcesEvent *) event;
     char buf[BUFSIZ], * errors = NULL;
@@ -575,9 +549,7 @@ Event * event;
  */
 
 void
-CreateResourceBox(node, errors)
-WNode * node;
-char ** errors;
+CreateResourceBox(WNode *node, char **errors)
 {
     WidgetResources * resources = node->resources;
     char ** names, ** cons_names;
@@ -623,9 +595,7 @@ char ** errors;
  */
 
 static WidgetResources * 
-ParseResources(info, error)
-GetResourcesInfo * info;
-char **error;
+ParseResources(GetResourcesInfo *info, char **error)
 {
     WidgetResources * resources;
     WidgetResourceInfo * normal;
@@ -694,8 +664,7 @@ char **error;
  */
 
 static int 
-CompareResourceEntries(e1, e2) 
-const void *e1, *e2;
+CompareResourceEntries(const void *e1, const void *e2)
 {
     return (strcmp(((WidgetResourceInfo *)e1)->name, 
 		   ((WidgetResourceInfo *)e2)->name));
@@ -710,9 +679,7 @@ const void *e1, *e2;
  */
 
 static void
-AddResource(res_info, resource) 
-ResourceInfo * res_info;
-WidgetResourceInfo * resource;
+AddResource(ResourceInfo *res_info, WidgetResourceInfo *resource)
 {
     resource->name = res_info->name;
     res_info->name = NULL;	/* Keeps it from being deallocated. */
@@ -730,8 +697,7 @@ WidgetResourceInfo * resource;
  */
 
 static void
-FreeResources(resources) 
-WidgetResources * resources;
+FreeResources(WidgetResources *resources)
 {
     int i;
 
@@ -765,9 +731,7 @@ WidgetResources * resources;
  */
 
 Boolean
-CheckDatabase(db, names, classes)
-XrmDatabase db;
-XrmQuarkList names, classes;
+CheckDatabase(XrmDatabase db, XrmQuarkList names, XrmQuarkList classes)
 {
     XrmRepresentation junk;
     XrmValue garbage;
@@ -783,9 +747,7 @@ XrmQuarkList names, classes;
  */
 
 XrmQuarkList
-Quarkify(list, ptr)
-char ** list;
-char * ptr;
+Quarkify(char **list, char *ptr)
 {
     int i;
     char ** tlist;
@@ -817,10 +779,8 @@ char * ptr;
  */
 
 void
-ExecuteOverAllNodes(top_node, func, data)
-WNode * top_node;
-void (*func)(WNode *, XtPointer);
-XtPointer data;
+ExecuteOverAllNodes(WNode *top_node, void (*func)(WNode *, XtPointer),
+		    XtPointer data)
 {
     int i;
 
@@ -839,15 +799,13 @@ XtPointer data;
  */
 
 void
-InsertWidgetFromNode(stream, node)
-ProtocolStream * stream;
-WNode * node;
+InsertWidgetFromNode(ProtocolStream *stream, WNode *node)
 {
     WNode *temp;
     unsigned long * widget_list;
     register int i, num_widgets;
 
-    for (temp = node, i = 0; temp != 0; temp = temp->parent, i++) {}
+    for (temp = node, i = 0; temp != NULL; temp = temp->parent, i++) {}
 
     num_widgets = i;
     widget_list = (unsigned long *) 
@@ -858,7 +816,7 @@ WNode * node;
      * Make sure that they are inserted in the list from parent -> child.
      */
 
-    for (i--, temp = node; temp != 0; temp = temp->parent, i--) 
+    for (i--, temp = node; temp != NULL; temp = temp->parent, i--) 
 	widget_list[i] = temp->id;
 	
     _XEditResPut16(stream, num_widgets);	/* insert number of widgets. */
@@ -875,8 +833,7 @@ WNode * node;
  */
 
 char * 
-GetFailureMessage(stream)
-ProtocolStream * stream;
+GetFailureMessage(ProtocolStream *stream)
 {
     char * return_str;
 
@@ -894,8 +851,7 @@ ProtocolStream * stream;
  */
 
 char * 
-ProtocolFailure(stream)
-ProtocolStream * stream;
+ProtocolFailure(ProtocolStream *stream)
 {
     char buf[BUFSIZ];
     unsigned char version;
diff --git a/widgets.c b/widgets.c
index 9782cca..5b1ad42 100644
--- a/widgets.c
+++ b/widgets.c
@@ -136,8 +136,7 @@ static XtResource resources[] = {
 #undef Offset
 
 void 
-RebuildMenusAndLabel(toolkit)
-     String toolkit;
+RebuildMenusAndLabel(String toolkit)
 {
   if (strcmp(global_effective_toolkit, toolkit)) {
     CreateCommandMenu(box, toolkit);
@@ -164,8 +163,7 @@ RebuildMenusAndLabel(toolkit)
  */
 
 void 
-BuildWidgetTree(parent)
-Widget parent;
+BuildWidgetTree(Widget parent)
 {
     Widget paned, porthole, panner;
 
@@ -200,8 +198,7 @@ Widget parent;
 
 
 static Widget
-CreateTopArea(parent)
-Widget parent;
+CreateTopArea(Widget parent)
 {
     Widget panner;
 
@@ -260,9 +257,7 @@ static Boolean CM_set_insensitive = True;
 Widget CM_entries[NUM_CM_ENTRIES];
 
 static void
-CreateCommandMenu(parent, toolkit)
-Widget parent;
-String toolkit;
+CreateCommandMenu(Widget parent, String toolkit)
 {
     Arg args[1];
 
@@ -341,9 +336,7 @@ static Boolean TM_set_insensitive = True;
 Widget TM_entries[NUM_TM_ENTRIES];
 
 static void
-CreateTreeCommandMenu(parent, toolkit)
-Widget parent;
-String toolkit;
+CreateTreeCommandMenu(Widget parent, String toolkit)
 {
     int i, number;
     static struct tree_ops_menu tree_menu[] = {
@@ -422,8 +415,7 @@ static Pixmap old_pixmap;
  */
 
 void
-PrepareToLayoutTree(tree)
-Widget tree;
+PrepareToLayoutTree(Widget tree)
 {
     Arg args[1];
 
@@ -445,8 +437,7 @@ Widget tree;
  */
 
 void
-LayoutTree(tree)
-Widget tree;
+LayoutTree(Widget tree)
 {
     Arg args[1];
     
@@ -475,9 +466,7 @@ Widget tree;
  */
 
 void
-CreateResourceBoxWidgets(node, names, cons_names)
-WNode * node;
-char **names, **cons_names;
+CreateResourceBoxWidgets(WNode *node, char **names, char **cons_names)
 {
     Widget pane, box, button, viewport, pane_child;
     ResourceBoxInfo * res_box;
@@ -553,9 +542,7 @@ char **names, **cons_names;
  */
 
 static void
-CreateResourceNameForm(parent, node)
-Widget parent;
-WNode * node;
+CreateResourceNameForm(Widget parent, WNode *node)
 {
     ResourceBoxInfo * res_box = node->resources->res_box;
     AnyInfo *new_info = NULL, *old_info;
@@ -692,8 +679,7 @@ WNode * node;
  */
 
 static void
-SetToggleGroupLeaders(node)
-WNode * node;
+SetToggleGroupLeaders(WNode *node)
 {
     NameInfo *name;
     ResourceBoxInfo * res_box = node->resources->res_box;
@@ -721,9 +707,8 @@ WNode * node;
  */
  
 static void
-MakeBoxLookNice(dot, star, any, single, name, class, endbox)
-Widget dot, star, any, single, name, class;
-int endbox;
+MakeBoxLookNice(Widget dot, Widget star, Widget any, Widget single,
+		Widget name, Widget class, int endbox)
 {
 
 #define MAX_HDIST 3
@@ -834,10 +819,7 @@ int endbox;
 static char* noneList[] = {"None"};
 
 static void
-CreateLists(parent, node, names, cons_names) 
-Widget parent;
-WNode * node;
-char **names, **cons_names;
+CreateLists(Widget parent, WNode *node, char **names, char **cons_names)
 {
     Widget viewport;
     Cardinal num_args;
@@ -894,9 +876,7 @@ char **names, **cons_names;
  */
 
 static void
-CreateValueWidget(parent, node)
-Widget parent;
-WNode * node;
+CreateValueWidget(Widget parent, WNode *node)
 {
     Widget form, label;
     Cardinal num_args;
@@ -938,12 +918,8 @@ WNode * node;
  *	Returns: none.
  */
 
-extern Atom wm_delete_window;
-
 static void
-PopupOnNode(node, shell)
-WNode * node;
-Widget shell;
+PopupOnNode(WNode *node, Widget shell)
 {
     Arg args[3];
     Cardinal num_args;
@@ -1003,9 +979,7 @@ Widget shell;
 
 /* ARGSUSED */
 static void
-FreeClientData(w, ptr, junk)
-Widget w;
-XtPointer ptr, junk;
+FreeClientData(Widget w, XtPointer ptr, XtPointer junk)
 {
     XtFree(ptr);
 }
@@ -1022,9 +996,7 @@ XtPointer ptr, junk;
 
 /* ARGSUSED */
 static void
-FreeResBox(w, ptr, junk)
-Widget w;
-XtPointer ptr, junk;
+FreeResBox(Widget w, XtPointer ptr, XtPointer junk)
 {
     WNode * node = (WNode *) ptr;
     NameInfo *old_name, *name = node->resources->res_box->name_info;
diff --git a/wtree.c b/wtree.c
index ec90316..368cc81 100644
--- a/wtree.c
+++ b/wtree.c
@@ -56,9 +56,7 @@ static WNode ** CopyActiveNodes ( TreeInfo * tree_info );
 
 /* ARGSUSED */
 void
-BuildVisualTree(tree_parent, event)
-Widget tree_parent;
-Event * event;
+BuildVisualTree(Widget tree_parent, Event *event)
 {
     WNode * top;
     char msg[BUFSIZ];
@@ -102,9 +100,7 @@ Event * event;
  */
 
 void
-AddTreeNode(tree, top) 
-Widget tree;
-WNode * top;
+AddTreeNode(Widget tree, WNode *top)
 {
     int i;
     Arg args[1];
@@ -146,9 +142,7 @@ WNode * top;
 
 /* ARGSUSED */
 void
-TreeToggle(w, node_ptr, state_ptr)
-Widget w;
-XtPointer node_ptr, state_ptr;
+TreeToggle(Widget w, XtPointer node_ptr, XtPointer state_ptr)
 {
     Boolean state = (Boolean)(long) state_ptr;
     WNode * node = (WNode *) node_ptr;
@@ -166,8 +160,7 @@ XtPointer node_ptr, state_ptr;
  */
 
 static void
-AddNodeToActiveList(node)
-WNode * node;
+AddNodeToActiveList(WNode *node)
 {
     TreeInfo * info = node->tree_info;
 
@@ -191,8 +184,7 @@ WNode * node;
  */
 
 static void
-RemoveNodeFromActiveList(node)
-WNode * node;
+RemoveNodeFromActiveList(WNode *node)
 {
     TreeInfo * info = node->tree_info;
     Boolean found_node = FALSE;
@@ -218,8 +210,7 @@ WNode * node;
  */
 
 static Boolean
-IsActiveNode(node)
-WNode * node;
+IsActiveNode(WNode *node)
 {
     TreeInfo * info = node->tree_info;
     int i;
@@ -238,8 +229,7 @@ WNode * node;
  */
     
 TreeInfo *
-CreateTree(event)
-Event * event;
+CreateTree(Event *event)
 {
     SendWidgetTreeEvent * send_event = (SendWidgetTreeEvent *) event;
     int i;
@@ -268,8 +258,7 @@ Event * event;
  */
 
 void
-PrintNodes(top)
-WNode * top;
+PrintNodes(WNode *top)
 {
     int i;
 
@@ -292,9 +281,7 @@ WNode * top;
  */
 
 void
-_TreeRelabel(tree_info, type)
-TreeInfo * tree_info;
-LabelTypes type;
+_TreeRelabel(TreeInfo *tree_info, LabelTypes type)
 {
     WNode * top;
 
@@ -471,9 +458,7 @@ _TreeRelabelNode(WNode *node, LabelTypes type, Boolean recurse)
  */
 
 void
-_TreeActivateNode(node, type)
-WNode * node;
-SelectTypes type;
+_TreeActivateNode(WNode* node, SelectTypes type)
 {
     Arg args[1];
     int i;
@@ -519,10 +504,7 @@ SelectTypes type;
  */
 
 static void
-AddNode(top_node, info, tree_info)
-WNode ** top_node;
-WidgetTreeInfo * info;
-TreeInfo * tree_info;
+AddNode(WNode **top_node, WidgetTreeInfo *info, TreeInfo *tree_info)
 {
     WNode *node, *parent;
     Boolean early_break = FALSE;
@@ -569,10 +551,7 @@ TreeInfo * tree_info;
  */
 
 static void
-FillNode(info, node, tree_info)
-WidgetTreeInfo * info;
-WNode * node;
-TreeInfo * tree_info;
+FillNode(WidgetTreeInfo *info, WNode *node, TreeInfo *tree_info)
 {
     node->class = info->class;
     info->class = NULL;	/* keeps it from deallocating. */
@@ -590,8 +569,7 @@ TreeInfo * tree_info;
  */
 
 static void
-AddChild(parent, child)
-WNode * parent, * child;
+AddChild(WNode *parent, WNode *child)
 {
     if (parent->num_children >= parent->alloc_children) {
 	parent->alloc_children += NUM_INC;
@@ -618,8 +596,7 @@ WNode * parent, * child;
  */
 
 static WNode ** 
-CopyActiveNodes(tree_info)
-TreeInfo * tree_info;
+CopyActiveNodes(TreeInfo *tree_info)
 {
     WNode ** list;
     int i;
@@ -643,8 +620,7 @@ TreeInfo * tree_info;
  */
 
 void
-SetAndCenterTreeNode(node)
-WNode * node;
+SetAndCenterTreeNode(WNode *node)
 {
     Arg args[5];
     Cardinal num_args;
@@ -700,10 +676,7 @@ WNode * node;
  */
 
 void
-PerformTreeToFileDump(node, num_tabs, fp)
-WNode * node;
-int num_tabs;
-FILE * fp;
+PerformTreeToFileDump(WNode *node, int num_tabs, FILE *fp)
 {
     int i;