head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.124 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.122 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.120 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.118 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.116 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.114 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.112 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.110 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.108 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.106 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.104 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.102 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.100 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.98 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.96 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.94 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.92 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.90 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.88 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.86 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.84 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.82 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.80 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.76 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.56 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.78 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.74 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.72 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.70 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.68 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.66 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.64 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.62 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.60 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.58 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.54 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.52 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.50 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.48 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.46 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.44 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.42 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.40 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.38 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.36 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.34 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.32 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.30 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.28 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.26 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.24 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.22 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.20 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.18 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.16 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.14 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.12 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.10 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.8 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.6 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.4 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.2 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.1.0.44 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.42 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.40 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.38 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.36 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.34 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.32 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.30 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.28 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.26 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.24 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.22 pkgsrc-2008Q1:1.1.0.20 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.18 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.16 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.14 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.12 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.10 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.8 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.6 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.4 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.2 pkgsrc-2005Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2010.12.28.08.25.20; author obache; state Exp; branches; next 1.1; 1.1 date 2005.12.15.23.02.33; author joerg; state Exp; branches; next ; desc @@ 1.2 log @Use TAILQ instead of CIRCLEQ, it is not recommended anyway and it was removed in FreeBSD and DragonFly. Patch provided by Nolan Lum via PR#44284 Bump PKGREVISION. @ text @$NetBSD$ --- screen.c.orig 1999-02-22 16:52:34 -0500 +++ screen.c @@@@ -36,6 +36,7 @@@@ #elif defined(HAVE_LIBGEN_H) #include #endif +#include #include "compat.h" #include "tty.h" @@@@ -66,7 +67,7 @@@@ struct ircpage { struct ircwin *ipg_iwa; struct ircwin *ipg_iwc; - CIRCLEQ_ENTRY(ircpage) ipg_entries; + TAILQ_ENTRY(ircpage) ipg_entries; int ipg_upd; }; @@@@ -99,7 +100,7 @@@@ static int dodisplay; /* if 0, window updates and clock won't be * displayed (for example when in opt editor */ -CIRCLEQ_HEAD(, ircpage) pages_head; +TAILQ_HEAD(, ircpage) pages_head = TAILQ_HEAD_INITIALIZER(pages_head); #define IW_USED 1 #define IW_VISIBLE 2 @@@@ -109,7 +110,6 @@@@ extern void (*othercmd) __P((char *)); extern int on_irc; extern int umd; -extern int errno; extern int is_away; char *prompt; @@@@ -167,7 +167,7 @@@@ tty_gotoxy(0, 0); tty_flush(); - CIRCLEQ_INIT(&pages_head); + TAILQ_INIT(&pages_head); cpage = NULL; cpageno = 0; otherpage = 0; @@@@ -307,8 +307,8 @@@@ } /* Else try the other pages */ - for (ipg = pages_head.cqh_first; ipg != (struct ircpage *)&pages_head; - ipg = ipg->ipg_entries.cqe_next) { + for (ipg = pages_head.tqh_first; ipg != NULL; + ipg = ipg->ipg_entries.tqe_next) { ipg_switchtopg(ipg); /* @@@@ -656,9 +656,9 @@@@ struct channel *ch; struct ircpage *ipg, *savepg = cpage; - for (ipg = pages_head.cqh_first; - ipg != (struct ircpage *) &pages_head; - ipg = ipg->ipg_entries.cqe_next) { + for (ipg = pages_head.tqh_first; + ipg != NULL; + ipg = ipg->ipg_entries.tqe_next) { ipg_switchtopg(ipg); /* * Traverse the window list. For each window, iterate through @@@@ -987,8 +987,8 @@@@ { struct ircpage *ipg, *savepg = cpage; - for (ipg = pages_head.cqh_first; ipg != (struct ircpage *)&pages_head; - ipg = ipg->ipg_entries.cqe_next) { + for (ipg = pages_head.tqh_first; ipg != NULL; + ipg = ipg->ipg_entries.tqe_next) { ipg_switchtopg(ipg); equalwin(); } @@@@ -1099,8 +1099,8 @@@@ strcpy(t, cname); h = elf_hash(irc_strupr(t)); - for (ipg = pages_head.cqh_first; ipg != (struct ircpage *) &pages_head; - ipg = ipg->ipg_entries.cqe_next) { + for (ipg = pages_head.tqh_first; ipg != NULL; + ipg = ipg->ipg_entries.tqe_next) { ipg_switchtopg(ipg); w = iwa; @@@@ -2163,8 +2163,8 @@@@ struct ircwin *iw; struct ircpage *ipg; - for (ipg = pages_head.cqh_first; ipg != (struct ircpage *) &pages_head; - ipg = ipg->ipg_entries.cqe_next) + for (ipg = pages_head.tqh_first; ipg != NULL; + ipg = ipg->ipg_entries.tqe_next) for (iw = ipg->ipg_iwa; iw != NULL; iw = iw->iw_next) reformat_backscroll(iw, t_columns); } @@@@ -2197,7 +2197,7 @@@@ ipg->ipg_iwa = iwa; ipg->ipg_iwc = iwc; ipg->ipg_upd = 0; - CIRCLEQ_INSERT_TAIL(&pages_head, ipg, ipg_entries); + TAILQ_INSERT_TAIL(&pages_head, ipg, ipg_entries); otherpage = cpageno; cpageno = numpages++; set_prompt(NULL); @@@@ -2214,11 +2214,9 @@@@ int newpg; if (iwa == NULL || (iwa->iw_next == NULL && iwa->iw_ch == NULL)) { - if (ipg->ipg_entries.cqe_prev != - (struct ircpage *) &pages_head) + if (*(ipg->ipg_entries.tqe_prev) != NULL) newpg = cpageno - 1; - else if (ipg->ipg_entries.cqe_next != - (struct ircpage *) &pages_head) + else if (ipg->ipg_entries.tqe_next != NULL) newpg = cpageno + 1; else { iw_printf(COLI_TEXT, "%sCannot remove the only page\n", @@@@ -2235,7 +2233,7 @@@@ } ipg_switchto(newpg, 1); - CIRCLEQ_REMOVE(&pages_head, ipg, ipg_entries); + TAILQ_REMOVE(&pages_head, ipg, ipg_entries); free(ipg); numpages--; set_prompt(NULL); @@@@ -2256,11 +2254,11 @@@@ struct ircpage *ipg; int pns = pageno; - for (ipg = pages_head.cqh_first; - ipg != (struct ircpage *) &pages_head && pageno > 0; - ipg = ipg->ipg_entries.cqe_next, pageno--) + for (ipg = pages_head.tqh_first; + ipg != NULL && pageno > 0; + ipg = ipg->ipg_entries.tqe_next, pageno--) ; - if (pageno == 0 && ipg != (struct ircpage *) &pages_head) { + if (pageno == 0 && ipg != NULL) { ipg_switchtopg(ipg); set_prompt(NULL); otherpage = cpageno; @@@@ -2312,9 +2310,9 @@@@ pline[0] = 0; - for (i = 0, ipg = pages_head.cqh_first; i < numpages && - ipg != (struct ircpage *) &pages_head; - i++, ipg = ipg->ipg_entries.cqe_next) { + for (i = 0, ipg = pages_head.tqh_first; i < numpages && + ipg != NULL; + i++, ipg = ipg->ipg_entries.tqe_next) { if (ipg != cpage) sprintf(t, "-%d-", i); else @@@@ -2352,9 +2350,9 @@@@ struct ircpage *ipg; int i, n = 1; - for (i = 0, ipg = pages_head.cqh_first; - ipg != (struct ircpage *) &pages_head; - ipg = ipg->ipg_entries.cqe_next, i++) + for (i = 0, ipg = pages_head.tqh_first; + ipg != NULL; + ipg = ipg->ipg_entries.tqe_next, i++) if (ipg->ipg_upd) pglist[n++] = i + '0'; if (n > 1) { @@@@ -2378,9 +2376,9 @@@@ struct ircpage *ipg; int i; - for (i = 0, ipg = pages_head.cqh_first; - ipg != (struct ircpage *) &pages_head; - ipg = ipg->ipg_entries.cqe_next, i++) + for (i = 0, ipg = pages_head.tqh_first; + ipg != NULL; + ipg = ipg->ipg_entries.tqe_next, i++) if (ipg->ipg_upd) pupd |= 1 << i; if (force_update) @@@@ -2434,8 +2432,8 @@@@ struct ircwin *w; struct channel *ch; - for (ipg = pages_head.cqh_first; ipg != (struct ircpage *)&pages_head; - ipg = ipg->ipg_entries.cqe_next) + for (ipg = pages_head.tqh_first; ipg != NULL; + ipg = ipg->ipg_entries.tqe_next) for (w = iwa; w != NULL && w->iw_flags & IW_USED; w = w->iw_next) for (ch = w->iw_ch; ch != NULL; ch = ch->ch_wnext) @ 1.1 log @Fix errno, don't add more #if cancer. @ text @d3 1 a3 1 --- screen.c.orig 2005-12-15 22:53:30.000000000 +0000 d5 1 a5 1 @@@@ -36,6 +36,7 @@@@ static char rcsid[] = "$Id: screen.c,v 1 d13 19 a31 1 @@@@ -109,7 +110,6 @@@@ extern char *myname, nick[], *srvnm; d39 164 @