Fix return types.

12 files changed, 350 insertions, 14 deletions

diff --git a/games/netmaj/distinfo b/games/netmaj/distinfo
index 04e4d24f60e..1547b50a380 100644
--- a/games/netmaj/distinfo
+++ b/games/netmaj/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2008/10/26 22:48:43 dholland Exp $
+$NetBSD: distinfo,v 1.10 2013/02/26 10:29:34 joerg Exp $
 
 SHA1 (netmaj-2.0.7.tar.gz) = 1363ea8ca42079fb444b25c605d264b5f083e260
 RMD160 (netmaj-2.0.7.tar.gz) = 9d3fd68b7607b2c3064e9dd8310085818f32f93e
@@ -6,8 +6,16 @@ Size (netmaj-2.0.7.tar.gz) = 213819 bytes
 SHA1 (patch-aa) = 4be6d0148e4579661162315db968512ae570f122
 SHA1 (patch-af) = 4b0d060fc84deac11e119176233a24f4c8fe1f22
 SHA1 (patch-ah) = d2ad2b03dd7171418eba9617549081cd89982b96
+SHA1 (patch-ahand.c) = e7b87c1770e6ed713e96607a7345c39bf84c8eda
 SHA1 (patch-ai) = cd63f77bc8af0b6d2e3dc51ce260fc639bf48bb9
-SHA1 (patch-aj) = a25f2e0f81c10121767dae99bd6c09be69467a13
+SHA1 (patch-aj) = e6e80937e671b33d1a4b18aee62f541c5adbf7d5
 SHA1 (patch-al) = 881d23913beedf4b3167b1fafd08210555cccd55
-SHA1 (patch-am) = 61da0c1ac3e73553aba80638a45df9bbda61ffb7
-SHA1 (patch-an) = 6f1ddbdbe0065518e166af9c23565579d19965e8
+SHA1 (patch-am) = 958f22aeebb31880b3c1449b0678b7e4c5aaa6b5
+SHA1 (patch-an) = 39db6b23c383e66a816a89b1df8f5a6923406987
+SHA1 (patch-analize.c) = 82713c39528dfa7cd1f669c51b10e4a5913fa9ff
+SHA1 (patch-client.c) = a573a5743c90a550a037f7d692673b840a87b653
+SHA1 (patch-netmaj1.c) = 802c5057f791a9307f9854ddebbffda2121303dd
+SHA1 (patch-plview.c) = 38e1dbcc6637b4c12edc8b0bb9e6a2a0d9452129
+SHA1 (patch-proxyserver.c) = 74ab3134ff7692141fd46fe35e3cc544062fe6f8
+SHA1 (patch-result.c) = 874466a0f405d392959f0a02631b162e1b1ff735
+SHA1 (patch-xsleep.c) = 1b5b40266caad5ca4282ce3e6146cd98e8f2dedf
diff --git a/games/netmaj/patches/patch-ahand.c b/games/netmaj/patches/patch-ahand.c
new file mode 100644
index 00000000000..184b3a12d33
--- /dev/null
+++ b/games/netmaj/patches/patch-ahand.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-ahand.c,v 1.1 2013/02/26 10:29:34 joerg Exp $
+
+--- ahand.c.orig	2013-02-25 20:41:22.000000000 +0000
++++ ahand.c
+@@ -25,6 +25,8 @@
+ #include "ahand.h"
+ #include "global.h"
+ 
++static void ah_result_add(ahand_t *a);
++
+ extern FILE *df;
+ 
+ ahand_t result_ahand[MAX_RESULT];
+@@ -111,7 +113,7 @@ ah_sort(a) ahand_t *a; {
+ }
+ 
+ 
+-ah_result_add(a) ahand_t *a; {
++static void ah_result_add(ahand_t *a) {
+ 	int i;
+ 	int rest;
+ 	int v2=0;
+@@ -303,7 +305,7 @@ ah_analize(a,from) ahand_t *a; {
+ 	if(!found) ah_result_add(a);
+ }
+ 
+-ah_print(a,name) ahand_t *a; char *name; {
++void ah_print(ahand_t *a, char *name) {
+ 	int i,j,n;
+ 
+ 	if (!df) return;
diff --git a/games/netmaj/patches/patch-aj b/games/netmaj/patches/patch-aj
index 7e7a6a3352b..44c49df681c 100644
--- a/games/netmaj/patches/patch-aj
+++ b/games/netmaj/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2004/01/23 19:05:45 agc Exp $
+$NetBSD: patch-aj,v 1.2 2013/02/26 10:29:34 joerg Exp $
 
---- log.c	2004/01/23 18:57:54	1.1
-+++ log.c	2004/01/23 18:58:33
-@@ -31,7 +31,7 @@
+--- log.c.orig	1996-07-31 08:06:02.000000000 +0000
++++ log.c
+@@ -31,7 +31,7 @@ char *pai2str(n) pai_t n; {
  	return pai_strings[n];
  }
  
diff --git a/games/netmaj/patches/patch-am b/games/netmaj/patches/patch-am
index 8216e1341e1..95187fefc19 100644
--- a/games/netmaj/patches/patch-am
+++ b/games/netmaj/patches/patch-am
@@ -1,8 +1,17 @@
-$NetBSD: patch-am,v 1.1 2008/03/03 05:06:40 jlam Exp $
+$NetBSD: patch-am,v 1.2 2013/02/26 10:29:34 joerg Exp $
 
---- cui.c.orig	1996-08-06 13:24:30.000000000 -0400
+--- cui.c.orig	1996-08-06 17:24:30.000000000 +0000
 +++ cui.c
-@@ -207,6 +207,10 @@ int help_index;
+@@ -178,7 +178,7 @@ char talk_messages[9][60] = {
+ };
+ #endif
+ 
+-extern FILE *log;
++extern FILE *logp;
+ extern int play_speed;
+ extern int auto_stop;
+ extern int auto_play;
+@@ -207,6 +207,16 @@ int help_index;
  int key_mac[100];
  int key_mac_cnt=0;
  
@@ -10,6 +19,102 @@ $NetBSD: patch-am,v 1.1 2008/03/03 05:06:40 jlam Exp $
 +#define u_char unsigned char
 +#endif
 +
++static void execute_help(global_t *gp);
++static void draw_player(global_t *gp, int who);
++static void draw_river(global_t *gp, int who);
++static void draw_status(global_t *gp);
++static void draw_hand(global_t *gp, int who);
++
  ungetstrx(str) unsigned char *str; {
  	int len;
  	int i;
+@@ -361,7 +371,7 @@ retry:
+ 	return ret;
+ }
+ 
+-ui_event_wait(gp,time_out) global_t *gp; {
++void ui_event_wait(global_t *gp, int time_out) {
+ 	fd_set fds;
+ 	struct timeval to,*top;
+ 	int fd,fd2;
+@@ -380,7 +390,7 @@ ui_event_wait(gp,time_out) global_t *gp;
+ 		return;	
+ 	}
+ 	if (fd == -1) {
+-		return 1;
++		return;
+ 	}
+ 
+ 	FD_ZERO( &fds );
+@@ -462,7 +472,7 @@ ui_message_gend(gp) global_t *gp; {
+ 			fclose(fp);
+ 		}
+ 	}
+-	if (log) log_game(gp,log);
++	if (logp) log_game(gp,logp);
+ }
+ 
+ ui_message_player(gp) global_t *gp; {
+@@ -721,7 +731,7 @@ ui_draw(gp,redraw) global_t *gp; {
+ 	ch_play = 0;
+ }
+ 
+-draw_status(gp) global_t *gp; {
++static void draw_status(global_t *gp) {
+ 
+ 	if (!ch_dora && !ch_play) return;
+ 	ch_dora = 0;
+@@ -768,7 +778,7 @@ draw_status(gp) global_t *gp; {
+ }
+ 
+ 
+-draw_player(gp,who) global_t *gp; {
++static void draw_player(global_t *gp, int who) {
+ 	int i;
+ 	int pp;
+ 
+@@ -791,7 +801,7 @@ draw_player(gp,who) global_t *gp; {
+ 	printw("  %7d ",player[pp].ppoint);
+ }
+ 
+-draw_river(gp,who) global_t *gp; {
++static void draw_river(global_t *gp, int who) {
+ 	int i,pai;
+ 	int pp;
+ 	int max;
+@@ -832,7 +842,7 @@ draw_river(gp,who) global_t *gp; {
+ 	clrtoeol();
+ }
+ 
+-draw_hand(gp,who) global_t *gp; {
++static void draw_hand(global_t *gp, int who) {
+ 	int i,j,k,n;
+ 	int pp,pai,naki;
+ 
+@@ -978,7 +988,7 @@ retry:
+ 	return R_TIE;
+ }
+ 
+-ui_choice(gp) global_t *gp; {
++void ui_choice(global_t *gp) {
+ 	int i,j,n,ret,pai,oldpai,kan;
+ 	char *args[25];
+ 	int pais[25];
+@@ -1087,7 +1097,7 @@ ui_result(gp) global_t *gp; {
+ 			fclose(fp);
+ 		}
+ 	}
+-	if (log) log_play(gp,log);
++	if (logp) log_play(gp,logp);
+ }
+ 
+ 
+@@ -1447,7 +1457,7 @@ cleanup_wstack() {
+ 	wstack_cnt = 0;
+ }
+ 
+-execute_help(gp) global_t *gp; {
++static void execute_help(global_t *gp) {
+ 	extern char *program;
+ 	static char *pages[500];
+ 	static int page_num;
diff --git a/games/netmaj/patches/patch-an b/games/netmaj/patches/patch-an
index 138ac25ded6..515cfd951ef 100644
--- a/games/netmaj/patches/patch-an
+++ b/games/netmaj/patches/patch-an
@@ -1,9 +1,18 @@
-$NetBSD: patch-an,v 1.1 2008/10/26 22:48:43 dholland Exp $
+$NetBSD: patch-an,v 1.2 2013/02/26 10:29:34 joerg Exp $
 
 Fix obvious bug detected by gcc.
 
---- pf.c~	1996-07-31 04:06:10.000000000 -0400
-+++ pf.c	2008-10-26 18:40:32.000000000 -0400
+--- pf.c.orig	1996-07-31 08:06:10.000000000 +0000
++++ pf.c
+@@ -66,7 +66,7 @@ typedef struct  {
+ #define yakus		(((pf_global_t *)(gp->ext[0]))->_yakus)
+ #define pf_top		(((pf_global_t *)(gp->ext[0]))->_pf_top)
+ 
+-pf_init(gp,file,prog) global_t *gp; char *file; char *prog; {
++void pf_init(global_t *gp, char *file, char *prog) {
+ 	FILE *pf;		/* personal file */
+ 	char buf[100];
+ 	char buf2[100];
 @@ -94,7 +94,7 @@ pf_init(gp,file,prog) global_t *gp; char
  	}
  	if (!pf) {
diff --git a/games/netmaj/patches/patch-analize.c b/games/netmaj/patches/patch-analize.c
new file mode 100644
index 00000000000..6b5a9d285a2
--- /dev/null
+++ b/games/netmaj/patches/patch-analize.c
@@ -0,0 +1,43 @@
+$NetBSD: patch-analize.c,v 1.1 2013/02/26 10:29:34 joerg Exp $
+
+--- analize.c.orig	2013-02-25 20:44:13.000000000 +0000
++++ analize.c
+@@ -98,7 +98,6 @@ static int pointdiff;
+ 
+ static calc_myposition();
+ static analize_policy();
+-static analize_base();
+ static filter_random();
+ static filter_dora();
+ static filter_zone();
+@@ -118,6 +117,8 @@ static print_pai();
+ static print_point();
+ static naki_look();
+ 
++static void analize_base(global_t *gp, int p, int max, int *rp);
++
+ static calc_myposition(gp) global_t *gp; {
+         int i,j,tmp;
+ 	int s[4];
+@@ -224,10 +225,11 @@ typedef struct {
+ 
+ pnt_t result_pnt;
+ 
++void
+ #ifdef INTEST
+ new_analize(gp,p) global_t *gp;
+ #else
+-analize(gp,p) global_t *gp;
++analize(global_t *gp, int p)
+ #endif
+ {
+ 	int r[14];
+@@ -608,7 +610,7 @@ static analize_policy(gp) global_t *gp; 
+ }
+ 
+ 
+-static analize_base(gp,p,max,rp) global_t *gp; int *rp; {
++static void analize_base(global_t *gp, int p, int max, int *rp) {
+ 	ahand_t a;
+ 	int rests[14];
+ 	int r[14];
diff --git a/games/netmaj/patches/patch-client.c b/games/netmaj/patches/patch-client.c
new file mode 100644
index 00000000000..f59fe87f5f8
--- /dev/null
+++ b/games/netmaj/patches/patch-client.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-client.c,v 1.1 2013/02/26 10:29:34 joerg Exp $
+
+--- client.c.orig	2013-02-25 20:53:04.000000000 +0000
++++ client.c
+@@ -37,7 +37,7 @@ usage:\n\
+ 
+ global_t *gp_client;
+ FILE *df;
+-FILE *log;
++FILE *logp;
+ char *host;
+ int port = PORT_NUMBER;
+ int protocol_version = 0;
+@@ -132,7 +132,7 @@ main(argc,argv) int argc; char *argv[];
+ 			plog = fopen(optarg,"a");
+ 			break;
+ 		case 'l':
+-			log = fopen(optarg,"a");
++			logp = fopen(optarg,"a");
+ 			break;
+ 		case 'T':
+ 			board = optarg;
diff --git a/games/netmaj/patches/patch-netmaj1.c b/games/netmaj/patches/patch-netmaj1.c
new file mode 100644
index 00000000000..0dc3ee192f2
--- /dev/null
+++ b/games/netmaj/patches/patch-netmaj1.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-netmaj1.c,v 1.1 2013/02/26 10:29:34 joerg Exp $
+
+--- netmaj1.c.orig	2013-02-25 20:50:53.000000000 +0000
++++ netmaj1.c
+@@ -41,7 +41,7 @@ int auto_stop=1;
+ int play_speed=1;
+ extern int tonpu;
+ 
+-FILE *log;
++FILE *logp;
+ FILE *log_server;
+ FILE *plog = 0;
+ callback() {}
+@@ -234,7 +234,7 @@ main(argc,argv) int argc; char *argv[]; 
+ 			df = fopen(optarg,"w");
+ 			break;
+ 		case 'l':
+-			log = fopen(optarg,"w");
++			logp = fopen(optarg,"w");
+ 			break;
+ 		case 'H':
+ 			tonpu = 0;
diff --git a/games/netmaj/patches/patch-plview.c b/games/netmaj/patches/patch-plview.c
new file mode 100644
index 00000000000..4a1529f3e16
--- /dev/null
+++ b/games/netmaj/patches/patch-plview.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-plview.c,v 1.1 2013/02/26 10:29:34 joerg Exp $
+
+--- plview.c.orig	2013-02-25 20:51:05.000000000 +0000
++++ plview.c
+@@ -34,7 +34,7 @@ extern char *pai_strings[];
+ river_t mrv[4][RIVER_MAX];
+ 
+ FILE *df,*plog;
+-FILE *log;
++FILE *logp;
+ FILE *fp;
+ FILE *ofp;
+ 
diff --git a/games/netmaj/patches/patch-proxyserver.c b/games/netmaj/patches/patch-proxyserver.c
new file mode 100644
index 00000000000..b1ebe73a779
--- /dev/null
+++ b/games/netmaj/patches/patch-proxyserver.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-proxyserver.c,v 1.1 2013/02/26 10:29:34 joerg Exp $
+
+--- proxyserver.c.orig	2013-02-25 20:54:05.000000000 +0000
++++ proxyserver.c
+@@ -61,6 +61,8 @@ int debug=0;
+ 
+ char *cmd = "/bin/sh";
+ 
++static void proxy_start(void);
++
+ void term() {
+ 	proxy_term();
+ 	exit(1);
+@@ -224,7 +226,7 @@ if (debug) printf("sute %s\n",buf);
+ 	}
+ }
+ 
+-proxy_start() {
++static void proxy_start(void) {
+ 	char buf[256];
+ 	fd_set fds;
+ 	int maxfd;
diff --git a/games/netmaj/patches/patch-result.c b/games/netmaj/patches/patch-result.c
new file mode 100644
index 00000000000..ef572d21222
--- /dev/null
+++ b/games/netmaj/patches/patch-result.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-result.c,v 1.1 2013/02/26 10:29:34 joerg Exp $
+
+--- result.c.orig	2013-02-25 20:42:32.000000000 +0000
++++ result.c
+@@ -33,6 +33,7 @@
+ static int fu_calc_head();
+ static int find_kind();
+ static result_clear_genyakus();
++static void result_calc_ryukyoku(global_t *gp, result_t *yr);
+ 
+ result_new(gp) global_t *gp; {
+ 	int i;
+@@ -118,7 +119,7 @@ result_check_sukan(gp) global_t *gp; {
+ 	return (knmax==4)?0:1;
+ }
+ 
+-result_calc(gp,mode,pp,pp_num) global_t *gp; int *pp; {
++void result_calc(global_t *gp, int mode, int *pp, int pp_num) {
+ 	int i,ac,p;
+ 	result_t yr[4];
+ 	int st[4];
+@@ -216,7 +217,7 @@ calc_tumibo(gp,yr,furi) global_t *gp; re
+ 	}
+ }
+ 
+-result_calc_ryukyoku(gp,yr) global_t *gp; result_t *yr; {
++static void result_calc_ryukyoku(global_t *gp, result_t *yr) {
+ 	int i,n;
+ 	int tenpai[4];
+ 	int tenpai_cnt=0;
diff --git a/games/netmaj/patches/patch-xsleep.c b/games/netmaj/patches/patch-xsleep.c
new file mode 100644
index 00000000000..7a9fed58b48
--- /dev/null
+++ b/games/netmaj/patches/patch-xsleep.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-xsleep.c,v 1.1 2013/02/26 10:29:34 joerg Exp $
+
+--- xsleep.c.orig	2013-02-25 20:45:25.000000000 +0000
++++ xsleep.c
+@@ -25,12 +25,14 @@
+ #include "pai.h"
+ #include "global.h"
+ 
+-xsleep(time_out) {
+-	return ysleep(time_out * 10);
++static void ysleep(int);
++
++void xsleep(time_out) {
++	ysleep(time_out * 10);
+ }
+ 
+ #ifndef HAVE_GETTIMEOFDAY
+-ysleep(time_out) {
++static void ysleep(int time_out) {
+ 	fd_set fds;
+ 	struct timeval to,*top;
+ 	int ret = 0;
+@@ -51,7 +53,7 @@ static double dtime() {
+ 	return (now.tv_sec + now.tv_usec * 0.0000001);
+ }
+ 
+-ysleep(time_out) {
++static void ysleep(int time_out) {
+ 	fd_set fds;
+ 	struct timeval to,*top;
+ 	double t,now;