Fix return types.

9 files changed, 391 insertions, 37 deletions

diff --git a/x11/kterm/distinfo b/x11/kterm/distinfo
index 5d530d3ad8c..3f62b3c18b2 100644
--- a/x11/kterm/distinfo
+++ b/x11/kterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2012/05/31 13:05:27 obache Exp $
+$NetBSD: distinfo,v 1.25 2013/03/02 17:54:52 joerg Exp $
 
 SHA1 (kterm-6.2.0-scroll-wd0.2.patch) = 384d938d3cfea48ae31426c918be6b8df59eb1de
 RMD160 (kterm-6.2.0-scroll-wd0.2.patch) = e2ea4285def5c4ec8b88d36a20a328cc1082a469
@@ -17,7 +17,13 @@ RMD160 (kterm-6.2.0.tar.gz) = d23c755f119b5602a3c6f6ac97e27e10c43a8bfe
 Size (kterm-6.2.0.tar.gz) = 200448 bytes
 SHA1 (patch-KTerm.ad) = 7fccdb89f586e4db634a2efc9a919a6525982964
 SHA1 (patch-aa) = 6afc18d4c35f86077e00d3444d8ba6953463f073
-SHA1 (patch-ab) = 011b1fc5033f61784e57030c78f6cca5a82722d1
+SHA1 (patch-ab) = dd6e0a9176b9b9bd430389834de7fa6e77f3433a
 SHA1 (patch-ac) = 926a43c2bb1b78cd87dae39b10800a1e7cdfe0ce
 SHA1 (patch-ad) = 35e78a604a19d52e4367419acacab054c5653f42
-SHA1 (patch-ae) = 52a2e974fee9330465f3036267bb99fd8df40f67
+SHA1 (patch-ae) = bfeceb762f7b0f57cc42a4166ffd86baa8e31229
+SHA1 (patch-button.c) = 4d98e3a42979e49074417003f608c3216d43723b
+SHA1 (patch-cursor.c) = 00af175233449e3eeeec294e03d6769223f93e12
+SHA1 (patch-input.c) = eb7528cb9578ba1e46188ff7e347c30a29f182f2
+SHA1 (patch-screen.c) = 48c0042ed2fd6162e20c523544c1c9aa6eb9ab2a
+SHA1 (patch-scrollbar.c) = c2e9a2e20def7408423fa3bf7411e0c8ca2f2819
+SHA1 (patch-util.c) = 6183afffa6e3242b2781a2e6432a584e047972ee
diff --git a/x11/kterm/patches/patch-ab b/x11/kterm/patches/patch-ab
index da89fb6e095..3669f294e9f 100644
--- a/x11/kterm/patches/patch-ab
+++ b/x11/kterm/patches/patch-ab
@@ -1,37 +1,87 @@
-$NetBSD: patch-ab,v 1.1 2001/04/23 04:44:21 toshii Exp $
+$NetBSD: patch-ab,v 1.2 2013/03/02 17:54:52 joerg Exp $
 
---- misc.c.orig	Fri Jul 12 14:01:43 1996
+--- misc.c.orig	2013-03-01 13:15:57.000000000 +0000
 +++ misc.c
-@@ -242,9 +242,7 @@
- 					(Widget)tekWidget : (Widget)term)))
- # endif /* !KTERM_NOTEK */
- #endif
--      if (((ev->detail) != NotifyInferior) &&
--	  ev->focus &&
--	  !(screen->select & FOCUS))
-+      if (((ev->detail) != NotifyInferior) && ev->focus)
- 	selectwindow(screen, INWINDOW);
+@@ -48,6 +48,10 @@
+ #include "error.h"
+ #include "menu.h"
+ 
++void Bell(int which, int percent);
++void selectwindow(TScreen *screen, int flag);
++void unselectwindow(TScreen *screen, int flag);
++
+ extern jmp_buf Tekend;
+ extern jmp_buf VTend;
+ 
+@@ -61,7 +65,7 @@ extern char *getenv();
+ static void DoSpecialEnterNotify();
+ static void DoSpecialLeaveNotify();
+ 
+-xevents()
++void xevents(void)
+ {
+ 	XEvent event;
+ 	register TScreen *screen = &term->screen;
+@@ -311,9 +315,7 @@ caddr_t eventdata;
+ 
+ 
+ 
+-selectwindow(screen, flag)
+-register TScreen *screen;
+-register int flag;
++void selectwindow(TScreen *screen, int flag)
+ {
+ #ifndef KTERM_NOTEK
+ 	if(screen->TekEmu) {
+@@ -341,9 +343,7 @@ register int flag;
+ #endif /* !KTERM_NOTEK */
  }
  
-@@ -271,9 +269,7 @@
- 					(Widget)tekWidget : (Widget)term)))
- # endif /* !KTERM_NOTEK */
- #endif
--      if (((ev->detail) != NotifyInferior) &&
--	  ev->focus &&
--	  !(screen->select & FOCUS))
-+      if (((ev->detail) != NotifyInferior) && ev->focus)
- 	unselectwindow(screen, INWINDOW);
+-unselectwindow(screen, flag)
+-register TScreen *screen;
+-register int flag;
++void unselectwindow(TScreen *screen, int flag)
+ {
+     if (screen->always_highlight) return;
+ 
+@@ -370,9 +370,7 @@ register int flag;
+ 
+ static long lastBellTime;	/* in milliseconds */
+ 
+-Bell(which,percent)
+-     int which;
+-     int percent;
++void Bell(int which, int percent)
+ {
+     extern XtermWidget term;
+     register TScreen *screen = &term->screen;
+@@ -596,8 +594,7 @@ creat_as(uid, gid, pathname, mode)
+  * by default.
+  */ 
+ 
+-StartLog(screen)
+-register TScreen *screen;
++void StartLog(TScreen *screen)
+ {
+ 	register char *cp;
+ 	register int i;
+@@ -706,8 +703,7 @@ register TScreen *screen;
+ 	update_logging();
  }
  
-@@ -358,8 +354,8 @@
- 	if(!Ttoggled) TCursorToggle(TOGGLE);
-     } else {
- #endif /* !KTERM_NOTEK */
--	if (screen->xic)
--	    XUnsetICFocus(screen->xic);
-+ 	if (screen->xic && screen->select == 0)
-+ 	    XUnsetICFocus(screen->xic);
- 	screen->select &= ~flag;
- 	if(screen->cursor_state &&
- 	   (screen->cursor_col != screen->cur_col ||
+-CloseLog(screen)
+-register TScreen *screen;
++void CloseLog(TScreen *screen)
+ {
+ 	if(!screen->logging || (screen->inhibit & I_LOG))
+ 		return;
+@@ -911,8 +907,7 @@ int code;
+  * was allocated using calloc, with enough extra room at the end so not
+  * to have to do a realloc().
+  */
+-Setenv (var, value)
+-register char *var, *value;
++void Setenv (char *var, char *value)
+ {
+ 	extern char **environ;
+ 	register int envindex = 0;
diff --git a/x11/kterm/patches/patch-ae b/x11/kterm/patches/patch-ae
index 8ce7163552d..fa04653d797 100644
--- a/x11/kterm/patches/patch-ae
+++ b/x11/kterm/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2005/11/29 06:18:52 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2013/03/02 17:54:52 joerg Exp $
 
---- charproc.c.orig	2005-11-29 06:09:50.000000000 +0000
+--- charproc.c.orig	2013-03-01 13:07:29.000000000 +0000
 +++ charproc.c
 @@ -71,6 +71,7 @@ in this Software without prior written a
  #define Select select
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.1 2005/11/29 06:18:52 joerg Exp $
  #include <errno.h>
  #include <setjmp.h>
  #include <ctype.h>
-@@ -101,9 +102,6 @@ extern jmp_buf VTend;
+@@ -102,9 +103,6 @@ extern jmp_buf VTend;
  
  extern XtAppContext app_con;
  extern Widget toplevel;
@@ -20,3 +20,92 @@ $NetBSD: patch-ae,v 1.1 2005/11/29 06:18:52 joerg Exp $
  extern fd_set Select_mask;
  extern fd_set X_mask;
  extern fd_set pty_mask;
+@@ -350,12 +348,22 @@ extern void HandleBeginConversion();
+ extern Boolean SendMousePosition();
+ extern void ScrnSetAttributes();
+ 
++void RevIndex(TScreen *screen, int amount);
++void Index(TScreen *screen, int amount);
++
+ /*
+  * NOTE: VTInitialize zeros out the entire ".screen" component of the 
+  * XtermWidget, so make sure to add an assignment statement in VTInitialize() 
+  * for each new ".screen" field added to this resource list.
+  */
+ 
++static void FromStatus(void);
++void ShowStatus(void);
++void HideStatus(void);
++void EraseStatus(void);
++void HideCursor(void);
++void ShowCursor(void);
++
+ /* Defaults */
+ static  Boolean	defaultFALSE	   = FALSE;
+ static  Boolean	defaultTRUE	   = TRUE;
+@@ -4333,9 +4341,9 @@ static Boolean VTSetValues (cur, request
+     }
+     if (curvt->misc.statusline != newvt->misc.statusline) {
+ 	if (newvt->misc.statusline) {
+-	    ShowStatus(&newvt->screen);
++	    ShowStatus();
+ 	} else {
+-	    HideStatus(&newvt->screen);
++	    HideStatus();
+ 	}
+ 	update_statusline();
+     }
+@@ -4347,7 +4355,7 @@ static Boolean VTSetValues (cur, request
+ /*
+  * Shows cursor at new cursor position in screen.
+  */
+-ShowCursor()
++void ShowCursor(void)
+ {
+ 	register TScreen *screen = &term->screen;
+ 	register int x, y, flags;
+@@ -4471,7 +4479,7 @@ ShowCursor()
+ /*
+  * hide cursor at previous cursor position in screen.
+  */
+-HideCursor()
++void HideCursor(void)
+ {
+ 	register TScreen *screen = &term->screen;
+ #ifndef KTERM
+@@ -4667,7 +4675,7 @@ int col;
+ 	screen->cur_col = col;
+ }
+ 
+-FromStatus()
++static void FromStatus(void)
+ {
+ 	register TScreen *screen = &term->screen;
+ 
+@@ -4677,7 +4685,7 @@ FromStatus()
+ 	CursorRestore(term, &screen->statussc);
+ }
+ 
+-ShowStatus()
++void ShowStatus(void)
+ {
+ 	register TScreen *screen = &term->screen;
+ 
+@@ -4690,7 +4698,7 @@ ShowStatus()
+ 		  Height(screen) + screen->border * 2 + screen->statusheight);
+ }
+ 
+-HideStatus()
++void HideStatus(void)
+ {
+ 	register TScreen *screen = &term->screen;
+ # ifndef KTERM
+@@ -4716,7 +4724,7 @@ HideStatus()
+ 		  Height(screen) + screen->border * 2);
+ }
+ 
+-EraseStatus()
++void EraseStatus(void)
+ {
+ 	register TScreen *screen = &term->screen;
+ 	register int j, pix;
diff --git a/x11/kterm/patches/patch-button.c b/x11/kterm/patches/patch-button.c
new file mode 100644
index 00000000000..2429c471e77
--- /dev/null
+++ b/x11/kterm/patches/patch-button.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-button.c,v 1.1 2013/03/02 17:54:53 joerg Exp $
+
+--- button.c.orig	2013-03-01 13:08:51.000000000 +0000
++++ button.c
+@@ -32,6 +32,7 @@ button.c	Handles button events in the te
+ 
+ #include "ptyx.h"		/* Xlib headers included here. */
+ #include <X11/Xatom.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ 
+ #include <X11/Xmu/Atoms.h>
+@@ -41,7 +42,7 @@ button.c	Handles button events in the te
+ #include "error.h"
+ #include "menu.h"
+ 
+-extern char *malloc();
++void TrackText(int frow, int fcol, int trow, int tcol);
+ 
+ extern void DoSecureKeyboard();
+ 
+@@ -1368,8 +1369,7 @@ register Bchr *ptr;
+ 
+ #endif	/* KTERM && KTERM_MBCC */
+ 
+-TrackText(frow, fcol, trow, tcol)
+-    register int frow, fcol, trow, tcol;
++void TrackText(int frow, int fcol, int trow, int tcol)
+     /* Guaranteed (frow, fcol) <= (trow, tcol) */
+ {
+ 	register int from, to;
diff --git a/x11/kterm/patches/patch-cursor.c b/x11/kterm/patches/patch-cursor.c
new file mode 100644
index 00000000000..b392bb4af83
--- /dev/null
+++ b/x11/kterm/patches/patch-cursor.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-cursor.c,v 1.1 2013/03/02 17:54:53 joerg Exp $
+
+--- cursor.c.orig	2013-03-01 13:14:01.000000000 +0000
++++ cursor.c
+@@ -162,9 +162,7 @@ int		n;
+  * Moves cursor down amount lines, scrolls if necessary.
+  * Won't leave scrolling region. No carriage return.
+  */
+-Index(screen, amount)
+-register TScreen	*screen;
+-register int	amount;
++void Index(TScreen *screen, int amount)
+ {
+ 	register int j;
+ 
+@@ -186,9 +184,7 @@ register int	amount;
+  * Moves cursor up amount lines, reverse scrolls if necessary.
+  * Won't leave scrolling region. No carriage return.
+  */
+-RevIndex(screen, amount)
+-register TScreen	*screen;
+-register int	amount;
++void RevIndex(TScreen *screen, int amount)
+ {
+ 	/*
+ 	 * reverse indexing when above scrolling region is cursor up.
diff --git a/x11/kterm/patches/patch-input.c b/x11/kterm/patches/patch-input.c
new file mode 100644
index 00000000000..88100343af0
--- /dev/null
+++ b/x11/kterm/patches/patch-input.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-input.c,v 1.1 2013/03/02 17:54:53 joerg Exp $
+
+--- input.c.orig	2013-03-01 13:15:13.000000000 +0000
++++ input.c
+@@ -64,11 +64,7 @@ register TScreen *screen;
+ 	}
+ }
+ 
+-Input (keyboard, screen, event, eightbit)
+-    register TKeyboard	*keyboard;
+-    register TScreen	*screen;
+-    register XKeyEvent *event;
+-    Bool eightbit;
++void Input (TKeyboard *keyboard, TScreen *screen, XKeyEvent *event, Bool eightbit)
+ {
+ 
+ #ifdef KTERM
diff --git a/x11/kterm/patches/patch-screen.c b/x11/kterm/patches/patch-screen.c
new file mode 100644
index 00000000000..112ef16ec37
--- /dev/null
+++ b/x11/kterm/patches/patch-screen.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-screen.c,v 1.1 2013/03/02 17:54:53 joerg Exp $
+
+--- screen.c.orig	2013-03-01 13:18:30.000000000 +0000
++++ screen.c
+@@ -246,24 +246,14 @@ Reallocate(sbuf, sbufaddr, nrow, ncol, o
+ }
+ 
+ #ifdef KTERM
+-ScreenWrite (screen, str, flags, gset, length)
++void ScreenWrite (TScreen *screen, Char *str, unsigned flags, Char gset, int length)
+ #else /* !KTERM */
+-ScreenWrite (screen, str, flags, length)
++void ScreenWrite (TScreen *screen, char *str, unsigned flags, int length)
+ #endif /* !KTERM */
+ /*
+    Writes str into buf at row row and column col.  Characters are set to match
+    flags.
+  */
+-TScreen *screen;
+-#ifdef KTERM
+-Char *str;
+-register unsigned flags;
+-register Char gset;
+-#else /* !KTERM */
+-char *str;
+-register unsigned flags;
+-#endif /* !KTERM */
+-register int length;		/* length of string */
+ {
+ #ifdef KTERM
+ 	register int avail  = screen->max_col - screen->cur_col + 1;
diff --git a/x11/kterm/patches/patch-scrollbar.c b/x11/kterm/patches/patch-scrollbar.c
new file mode 100644
index 00000000000..20c984f5cf2
--- /dev/null
+++ b/x11/kterm/patches/patch-scrollbar.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-scrollbar.c,v 1.1 2013/03/02 17:54:53 joerg Exp $
+
+--- scrollbar.c.orig	2013-03-01 13:19:28.000000000 +0000
++++ scrollbar.c
+@@ -265,9 +265,7 @@ ResizeScrollBar(scrollWidget, x, y, heig
+ 	ScrollBarDrawThumb(scrollWidget);
+ }
+ 
+-WindowScroll(screen, top)
+-	register TScreen *screen;
+-	int top;
++void WindowScroll(TScreen *screen, int top)
+ {
+ 	register int i, lines;
+ 	register int scrolltop, scrollheight, refreshtop;
+@@ -317,9 +315,7 @@ WindowScroll(screen, top)
+ }
+ 
+ 
+-ScrollBarOn (xw, init, doalloc)
+-    XtermWidget xw;
+-    int init, doalloc;
++void ScrollBarOn (XtermWidget xw, int init, int doalloc)
+ {
+ 	register TScreen *screen = &xw->screen;
+ 	register int border = 2 * screen->border;
+@@ -404,8 +400,7 @@ ScrollBarOn (xw, init, doalloc)
+ 	}
+ }
+ 
+-ScrollBarOff(screen)
+-	register TScreen *screen;
++void ScrollBarOff(TScreen *screen)
+ {
+ 	if(!screen->scrollbar)
+ 		return;
diff --git a/x11/kterm/patches/patch-util.c b/x11/kterm/patches/patch-util.c
new file mode 100644
index 00000000000..677c824cee8
--- /dev/null
+++ b/x11/kterm/patches/patch-util.c
@@ -0,0 +1,68 @@
+$NetBSD: patch-util.c,v 1.1 2013/03/02 17:54:53 joerg Exp $
+
+--- util.c.orig	2013-03-01 13:20:30.000000000 +0000
++++ util.c
+@@ -36,6 +36,9 @@
+ 
+ #include <stdio.h>
+ 
++void recolor_cursor (Cursor cursor, unsigned long fg, unsigned long bg);
++void CopyWait(TScreen *screen);
++
+ static void horizontal_copy_area();
+ static void vertical_copy_area();
+ 
+@@ -165,9 +168,7 @@ register TScreen *screen;
+  * All done within the scrolling region, of course. 
+  * requires: amount > 0
+  */
+-Scroll(screen, amount)
+-register TScreen *screen;
+-register int amount;
++void Scroll(TScreen *screen, int amount)
+ {
+ 	register int i = screen->bot_marg - screen->top_marg + 1;
+ 	register int shift;
+@@ -336,9 +337,7 @@ register int amount;
+  * inserts n blank lines at the cursor's position.  Lines above the
+  * bottom margin are lost.
+  */
+-InsertLine (screen, n)
+-register TScreen *screen;
+-register int n;
++void InsertLine (TScreen *screen, int n)
+ {
+ 	register int i;
+ 	register int shift;
+@@ -397,9 +396,7 @@ register int n;
+  * If cursor not in scrolling region, returns.  Else, deletes n lines
+  * at the cursor's position, lines added at bottom margin are blank.
+  */
+-DeleteLine(screen, n)
+-register TScreen *screen;
+-register int n;
++void DeleteLine(TScreen *screen, int n)
+ {
+ 	register int i;
+ 	register int shift;
+@@ -805,8 +802,7 @@ register TScreen *screen;
+ 	ClearBufRows (screen, 0, screen->max_row);
+ }
+ 
+-CopyWait(screen)
+-register TScreen *screen;
++void CopyWait(TScreen *screen)
+ {
+ 	XEvent reply;
+ 	XEvent *rep = &reply;
+@@ -1144,9 +1140,7 @@ ReverseVideo (termw)
+ }
+ 
+ 
+-recolor_cursor (cursor, fg, bg)
+-    Cursor cursor;			/* X cursor ID to set */
+-    unsigned long fg, bg;		/* pixel indexes to look up */
++void recolor_cursor (Cursor cursor, unsigned long fg, unsigned long bg)
+ {
+     register TScreen *screen = &term->screen;
+     register Display *dpy = screen->display;