head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.106 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.104 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.102 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.100 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.98 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.96 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.94 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.92 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.90 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.88 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.86 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.84 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.82 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.80 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.78 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.76 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.74 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.72 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.70 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.68 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.66 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.64 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.62 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.58 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.38 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.60 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.56 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.54 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.52 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.50 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.48 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.46 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.44 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.42 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.40 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.36 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.34 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.32 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.30 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.28 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.26 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.24 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.22 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.20 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.18 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.16 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.14 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.12 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.10 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.8 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.6 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.4 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.2 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.1.0.44 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.42 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.40 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.38 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.36 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.34 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.32 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.30 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.28 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.26 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.24 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.22 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.20 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.18 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.16 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.14 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.12 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.10 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.8 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.6 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.4 pkgsrc-2008Q1:1.1.0.2 pkgsrc-2008Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2013.02.26.10.29.34; author joerg; state Exp; branches; next 1.1; 1.1 date 2008.03.03.05.06.40; author jlam; state Exp; branches; next ; desc @@ 1.2 log @Fix return types. @ text @$NetBSD: patch-am,v 1.1 2008/03/03 05:06:40 jlam Exp $ --- cui.c.orig 1996-08-06 17:24:30.000000000 +0000 +++ cui.c @@@@ -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; +#ifndef u_char +#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; @ 1.1 log @"u_char" is not part of any standard, so it's not safe to use in cui.c. Define "u_char" to "unsigned char" in cui.c. This should fix the the problem reported by Klaus Heinz in the follow-up to PR pkg/29425. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- cui.c.orig 1996-08-06 13:24:30.000000000 -0400 d5 10 a14 1 @@@@ -207,6 +207,10 @@@@ int help_index; d22 6 d31 90 @