Use more void.

3 files changed, 39 insertions, 7 deletions

diff --git a/sysutils/xdu/distinfo b/sysutils/xdu/distinfo
index 30f52ee0d72..6ba3776c4b0 100644
--- a/sysutils/xdu/distinfo
+++ b/sysutils/xdu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/06/08 15:39:25 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/01/11 23:32:38 joerg Exp $
 
 SHA1 (xdu-3.0.tar.Z) = 196e2ba03253fd6b8a88fafe6b00e40632183d0c
 RMD160 (xdu-3.0.tar.Z) = 0c95ad79aaeb6e58433add71d852cc0b2312a5f9
@@ -9,4 +9,5 @@ Size (xdu-3.0.dirname.patch) = 1672 bytes
 SHA1 (xdu-3.0.i18n.patch) = 6f14b5458111b7c9776d15760d1876d242f0dabd
 RMD160 (xdu-3.0.i18n.patch) = a1ada2ae69331010dd7f3c0e77cb4410065a7254
 Size (xdu-3.0.i18n.patch) = 2760 bytes
-SHA1 (patch-aa) = abb9683db2646ae98f943693dfcb7f634ab0cb23
+SHA1 (patch-aa) = 9e42f0303cb8318ff94e393c88f11babe32625f6
+SHA1 (patch-xwin.c) = fba89059b7b7d14bf43d971010ecfced88fc7ad2
diff --git a/sysutils/xdu/patches/patch-aa b/sysutils/xdu/patches/patch-aa
index fe53abcf0dc..22609796368 100644
--- a/sysutils/xdu/patches/patch-aa
+++ b/sysutils/xdu/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2006/06/08 15:39:25 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2013/01/11 23:32:39 joerg Exp $
 
---- xdu.c.orig	2006-06-08 15:35:16.000000000 +0000
+--- xdu.c.orig	2013-01-11 14:30:40.000000000 +0000
 +++ xdu.c
-@@ -19,13 +19,13 @@
+@@ -19,18 +19,19 @@
   * limitation a license to do the foregoing actions under any patents of
   * the party supplying this software to the X Consortium.
   */
@@ -20,7 +20,14 @@ $NetBSD: patch-aa,v 1.5 2006/06/08 15:39:25 joerg Exp $
  #define	MAXPATH		4096	/* max total pathname length */
  #define	NCOLS		5	/* default number of columns in display */
  
-@@ -96,6 +96,10 @@ int size;
+ /* What we IMPORT from xwin.c */
+-extern int xsetup(), xmainloop(), xdrawrect(), xrepaint();
++extern int xsetup(), xmainloop(), xrepaint();
++void xdrawrect(char *name, int size, int x, int y, int width, int height);
+ 
+ /* What we EXPORT to xwin.c */
+ extern int press(), reset(), repaint(), setorder(), reorder();
+@@ -96,6 +97,10 @@ int size;
  	struct	node	*np;
  
  	np = (struct node *)calloc(1,sizeof(struct node));
@@ -31,7 +38,7 @@ $NetBSD: patch-aa,v 1.5 2006/06/08 15:39:25 joerg Exp $
  	np->name = strdup(name);
  	np->size = size;
  	np->num = nnodes;
-@@ -610,20 +614,6 @@ pwd()
+@@ -610,20 +615,6 @@ pwd()
  		100.0*topp->size/rootp->size);
  }
  
diff --git a/sysutils/xdu/patches/patch-xwin.c b/sysutils/xdu/patches/patch-xwin.c
new file mode 100644
index 00000000000..7993a1e0160
--- /dev/null
+++ b/sysutils/xdu/patches/patch-xwin.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-xwin.c,v 1.1 2013/01/11 23:32:39 joerg Exp $
+
+--- xwin.c.orig	2013-01-11 14:30:59.000000000 +0000
++++ xwin.c
+@@ -50,7 +50,6 @@ extern int xmainloop();
+ extern int xclear();
+ extern int xrepaint();
+ extern int xrepaint_noclear();
+-extern int xdrawrect();
+ 
+ /* internal routines */
+ static void help_popup();
+@@ -377,10 +376,7 @@ xrepaint_noclear()
+ 	repaint(xwa.width, xwa.height);
+ }
+ 
+-xdrawrect(name, size, x, y, width, height)
+-char *name;
+-int size;
+-int x, y, width, height;
++void xdrawrect(char *name, int size, int x, int y, int width, int height)
+ {
+ 	int	textx, texty;
+ 	char	label[1024];