Use more void.

7 files changed, 138 insertions, 32 deletions

diff --git a/wm/uwm/distinfo b/wm/uwm/distinfo
index 65a84060c04..e79daa765d7 100644
--- a/wm/uwm/distinfo
+++ b/wm/uwm/distinfo
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.4 2005/12/06 15:57:22 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/01/11 23:36:16 joerg Exp $
 
 SHA1 (X.V11R3uwm.tar.gz) = 180ad291555e3ff887fd32c9f7c286d5f1899bb8
 RMD160 (X.V11R3uwm.tar.gz) = b5722e71e50cd2b9a3d5727c1519be23704ddc54
 Size (X.V11R3uwm.tar.gz) = 114262 bytes
+SHA1 (patch-RubberBand.c) = f3c730d375b5cb1d2c574098155423c0c193583f
 SHA1 (patch-aa) = 99d696103e0bd2f845a516bb13770bd17d6546fa
-SHA1 (patch-ab) = dbcbafe7dd8efd58c7948115dca50fd737f12a72
+SHA1 (patch-ab) = 84e380e098b479488b3fe9676efeff7ca4dc6269
 SHA1 (patch-ac) = 0020163e35c0855114a4fe733e478d826fde9ec7
-SHA1 (patch-ad) = c07472091df19f1bd1a0489c24d996e995cab255
-SHA1 (patch-ae) = 4045c5200b95b6a75a2e05800672da6741e93cbf
+SHA1 (patch-ad) = d7f269f10d2a6932f1c79d471755205c3346d475
+SHA1 (patch-ae) = 1fe0e392d7828d94c3b2eb7852cdde40101cb661
 SHA1 (patch-af) = 17bd90e705a2ebb64ab2fdee10c725cc21d796d0
 SHA1 (patch-ag) = 7c03e888d27aa0b29b42ecbd913e26294b43bdf1
 SHA1 (patch-ah) = aaadc46f53f646c84b9e3973dab16afcd4535b41
 SHA1 (patch-ai) = 2efc4aee364cc8d85ffe7b617f3ad6cbea0d6e0e
-SHA1 (patch-aj) = 5f28dd36e0af231e52e98ff41e26054c5fe30c8a
+SHA1 (patch-aj) = e08880a7e84b2d5834801864dea8762866214d56
 SHA1 (patch-ak) = 11bd82eae6bdc41f3aa660a3a84893bd52a63d5d
+SHA1 (patch-colormap.c) = c65272de7c03c614ddd5673cde5cec25d365a783
diff --git a/wm/uwm/patches/patch-RubberBand.c b/wm/uwm/patches/patch-RubberBand.c
new file mode 100644
index 00000000000..70561b1a9e8
--- /dev/null
+++ b/wm/uwm/patches/patch-RubberBand.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-RubberBand.c,v 1.1 2013/01/11 23:36:16 joerg Exp $
+
+--- RubberBand.c.orig	2013-01-11 14:54:30.000000000 +0000
++++ RubberBand.c
+@@ -50,12 +50,7 @@
+ #define BW	PBorderWidth		/* pop-up window border width */
+ #define IBW	PPadding		/* internal border width for pop-up */
+ 
+-AskUser(dpy, scr, window, x, y, width, height, hints)
+-	Display *dpy;
+-	int scr;
+-	Window window;
+-	int *x, *y, *width, *height;
+-	XSizeHints *hints;
++void AskUser(Display *dpy, int scr, Window window, int *x, int *y, int *width, int *height, XSizeHints *hints)
+ 	{
+ 	/* XFontStruct *pfont; */
+ #define pfont	PFontInfo		/* text font for pop-up */
diff --git a/wm/uwm/patches/patch-ab b/wm/uwm/patches/patch-ab
index 658785afcf5..e0a395196d0 100644
--- a/wm/uwm/patches/patch-ab
+++ b/wm/uwm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2013/01/11 23:36:16 joerg Exp $
 
---- uwm.c.orig	Sun Oct 23 22:21:55 1988
-+++ uwm.c	Wed Jan 19 08:20:54 2000
-@@ -41,9 +41,22 @@ char *ProgramName;
+--- uwm.c.orig	1988-10-23 13:21:55.000000000 +0000
++++ uwm.c
+@@ -41,9 +41,25 @@ char *ProgramName;
  
  #include "uwm.h"
  #include <ctype.h>
@@ -20,13 +20,16 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
 +#ifdef X_NOT_STDC_ENV
 +char *malloc();
 +#endif
++
++static void SetEnvironment (void);
++void LoadXDefaults (void);
  
  #ifdef PROFIL
 -#include <signal.h>
  /*
   * Dummy handler for profiling.
   */
-@@ -53,6 +66,27 @@ ptrap()
+@@ -53,6 +69,27 @@ ptrap()
  }
  #endif
  
@@ -54,7 +57,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
  #define gray_width 16
  #define gray_height 16
  static char gray_bits[] = {
-@@ -103,7 +137,6 @@ char **environ;
+@@ -103,7 +140,6 @@ char **environ;
      GC gc;			/* graphics context for gray background */
      XImage grayimage;		/* for gray background */
      XGCValues xgc;		/* to create font GCs */
@@ -62,7 +65,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
      Bool fallbackMFont = False,	/* using default GC font for menus, */
           fallbackPFont = False,	/* popups, */
           fallbackIFont = False;	/* icons */
-@@ -115,6 +148,10 @@ char **environ;
+@@ -115,6 +151,10 @@ char **environ;
  #ifdef PROFIL
      signal(SIGTERM, ptrap);
  #endif
@@ -73,7 +76,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
  
      /*
       * Set up internal defaults.
-@@ -369,7 +406,7 @@ char **environ;
+@@ -369,7 +409,7 @@ char **environ;
      if (IFontInfo == NULL) {
          fprintf(stderr, "uwm: Unable to open icon font '%s', using server default.\n",
                  IFontName);
@@ -82,7 +85,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
  	fallbackIFont = True;
      }
      PFontInfo = XLoadQueryFont(dpy, PFontName);
-@@ -379,7 +416,7 @@ char **environ;
+@@ -379,7 +419,7 @@ char **environ;
  	if (fallbackIFont)
  	    PFontInfo = IFontInfo;
  	else
@@ -91,7 +94,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
  	fallbackPFont = True;
      }
      MFontInfo = XLoadQueryFont(dpy, MFontName);
-@@ -389,7 +426,7 @@ char **environ;
+@@ -389,7 +429,7 @@ char **environ;
  	if (fallbackIFont || fallbackPFont)
  	    MFontInfo = fallbackPFont ? PFontInfo : IFontInfo;
  	else
@@ -100,7 +103,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
  	fallbackMFont = True;
      }
  
-@@ -685,7 +722,11 @@ char **environ;
+@@ -685,7 +725,11 @@ char **environ;
   */
  InitBindings()
  {
@@ -112,7 +115,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
      char *tempfile;		/* Temporary filename. */
      register FILE *fp;		/* Temporary file pointer. */
      register char **ptr;	/* Default bindings string array pointer. */
-@@ -699,15 +740,26 @@ InitBindings()
+@@ -699,15 +743,26 @@ InitBindings()
  	exit (1);
      }
      strcpy (tempfile, TEMPFILE);
@@ -139,7 +142,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
      fclose(fp);
  
      /*
-@@ -717,6 +769,7 @@ InitBindings()
+@@ -717,6 +772,7 @@ InitBindings()
          perror("uwm: cannot open temp file");
          exit(1);
      }
@@ -147,3 +150,21 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 15:57:22 joerg Exp $
      Lineno = 1;
      yyparse();
      fclose(yyin);
+@@ -998,7 +1054,7 @@ static int parse_boolean (s)
+     return -1;
+ }
+ 
+-LoadXDefaults ()
++void LoadXDefaults (void)
+ {
+     Keyword *k;
+     char *option;
+@@ -1068,7 +1124,7 @@ char **newenviron;
+  * make a new copy of environment that has room for DISPLAY
+  */
+ 
+-SetEnvironment ()
++static void SetEnvironment (void)
+ {
+     int nenvvars;
+     char **newPtr, **oldPtr;
diff --git a/wm/uwm/patches/patch-ad b/wm/uwm/patches/patch-ad
index 28278448a11..06ae859828c 100644
--- a/wm/uwm/patches/patch-ad
+++ b/wm/uwm/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2005/12/06 15:57:22 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2013/01/11 23:36:16 joerg Exp $
 
---- gram.y.orig	Thu Sep 22 22:14:31 1988
-+++ gram.y	Thu Dec 23 22:04:02 1999
+--- gram.y.orig	1988-09-22 13:14:31.000000000 +0000
++++ gram.y
 @@ -60,7 +60,10 @@ static char *hcolors[4];		/* Color value
  static char *mcolors[2];		/* Color values used in menus. */
  MenuLink *menu_link;			/* Temporary menu link pointer. */
@@ -151,3 +151,12 @@ $NetBSD: patch-ad,v 1.2 2005/12/06 15:57:22 joerg Exp $
      return(list);
  }
  
+@@ -814,6 +818,8 @@ Bool ResetMenus()
+     Menus = NULL;
+ }
+ 
++void LoadXDefaults (void);
++
+ /*
+  * Set all numeric variables to zero and all boolean variables to FALSE.
+  */
diff --git a/wm/uwm/patches/patch-ae b/wm/uwm/patches/patch-ae
index f1274138431..ef583e40564 100644
--- a/wm/uwm/patches/patch-ae
+++ b/wm/uwm/patches/patch-ae
@@ -1,8 +1,17 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2013/01/11 23:36:16 joerg Exp $
 
---- GetButton.c.orig	Mon Oct 24 19:08:17 1988
-+++ GetButton.c	Wed Dec 22 13:59:28 1999
-@@ -255,7 +255,8 @@
+--- GetButton.c.orig	1988-10-24 10:08:17.000000000 +0000
++++ GetButton.c
+@@ -59,6 +59,8 @@ static char *sccsid = "@(#)GetButton.c	3
+ 
+ #define ICONSTR	(icon_str ? icon_str : "")
+ 
++static void CheckMap(Window window);
++
+ Bool GetButton(button_event)
+     XEvent *button_event;	/* Button event packet. */
+ {
+@@ -255,7 +257,8 @@ Bool GetButton(button_event)
      /* 
       * We convert the key pressed event to ascii.
       */
@@ -12,3 +21,15 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
  
      /*
       * If kbd_str is a "non-string", then don't do anything.
+@@ -361,8 +364,9 @@ Bool GetButton(button_event)
+     return(FALSE);
+ }
+ 
+-CheckMap(window)
+-Window window;
++void AskUser(Display *dpy, int scr, Window window, int *x, int *y, int *width, int *height, XSizeHints *hints);
++
++static void CheckMap(Window window)
+ {
+     XSizeHints sizehints;
+     XWMHints *wmhints;
diff --git a/wm/uwm/patches/patch-aj b/wm/uwm/patches/patch-aj
index 9fc3aa7e8d0..9fe7e5e77ea 100644
--- a/wm/uwm/patches/patch-aj
+++ b/wm/uwm/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2005/12/06 15:57:22 joerg Exp $
+$NetBSD: patch-aj,v 1.3 2013/01/11 23:36:16 joerg Exp $
 
---- Menu.c.orig	Sat Oct  1 18:41:13 1988
-+++ Menu.c	Mon Jan 17 22:09:10 2000
-@@ -72,6 +72,10 @@ Bool alternateGC = True;	/* true if only
+--- Menu.c.orig	1988-10-01 09:41:13.000000000 +0000
++++ Menu.c
+@@ -72,6 +72,12 @@ Bool alternateGC = True;	/* true if only
  #define vfork() fork()
  #endif
  
@@ -10,10 +10,12 @@ $NetBSD: patch-aj,v 1.2 2005/12/06 15:57:22 joerg Exp $
 +char *malloc();
 +#endif
 +
++static void AdjustMaxColors(int pixel);
++
  /* the following procedure is a copy of the implementation of system, 
   * modified to reset the handling of SIGINT, SIGQUIT, and SIGHUP before
   * exec-ing
-@@ -84,6 +88,14 @@ char *s;
+@@ -84,6 +90,14 @@ char *s;
  	char **oldenviron;
  	extern char **environ, **newenviron;
  
@@ -28,7 +30,7 @@ $NetBSD: patch-aj,v 1.2 2005/12/06 15:57:22 joerg Exp $
  	oldenviron = environ;
  	environ = newenviron;
  	if ((pid = vfork()) == 0) {
-@@ -107,6 +119,9 @@ char *s;
+@@ -107,6 +121,9 @@ char *s;
  		status = -1;
  	signal(SIGINT, istat);
  	signal(SIGQUIT, qstat);
@@ -38,7 +40,7 @@ $NetBSD: patch-aj,v 1.2 2005/12/06 15:57:22 joerg Exp $
  	return(status);
  }
  
-@@ -129,7 +144,6 @@ MenuInfo *menu;
+@@ -129,7 +146,6 @@ MenuInfo *menu;
      char *hlname;			/* Pointer to hi-liter name. */
      char *strbuf;			/* String buffer for IsTextNL. */
      Bool checkMotion = TRUE;		/* To Restore Cursor Position */
@@ -46,3 +48,13 @@ $NetBSD: patch-aj,v 1.2 2005/12/06 15:57:22 joerg Exp $
      int funcbutton;			/* function button for window select */
  
      /*
+@@ -697,8 +713,7 @@ MenuInfo *menu;
+  * Decrement "MaxColors" if this pixel value has never been used in a
+  * menu before.
+  */
+-AdjustMaxColors(pixel)
+-int pixel;
++static void AdjustMaxColors(int pixel)
+ {
+     register MenuLink *mptr;
+     register MenuLine *lptr;
diff --git a/wm/uwm/patches/patch-colormap.c b/wm/uwm/patches/patch-colormap.c
new file mode 100644
index 00000000000..46b86157c09
--- /dev/null
+++ b/wm/uwm/patches/patch-colormap.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-colormap.c,v 1.1 2013/01/11 23:36:16 joerg Exp $
+
+--- colormap.c.orig	2013-01-11 14:56:26.000000000 +0000
++++ colormap.c
+@@ -4,6 +4,8 @@
+ 
+ # include "uwm.h"
+ 
++static void installColormap (Colormap colormap);
++
+ Bool	focusPointerRoot;
+ 
+ Window
+@@ -299,8 +301,7 @@ noteUninstalledColormap (colormap)
+ 	XInstallColormap (dpy, colormap);
+ }
+ 
+-installColormap (colormap)
+-    Colormap	colormap;
++static void installColormap (Colormap colormap)
+ {
+     struct colormapInfo	*ci;
+