diff options
Diffstat (limited to 'usr.bin/vi/common/main.c')
| -rw-r--r-- | usr.bin/vi/common/main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/vi/common/main.c b/usr.bin/vi/common/main.c index 435e6d81596..e1a26f3a5a8 100644 --- a/usr.bin/vi/common/main.c +++ b/usr.bin/vi/common/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.20 2013/11/25 23:27:11 krw Exp $ */ +/* $OpenBSD: main.c,v 1.21 2013/11/28 22:12:40 krw Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -78,8 +78,8 @@ editor(gp, argc, argv) gp->scr_msg = vs_msg; /* Common global structure initialization. */ - CIRCLEQ_INIT(&gp->dq); - CIRCLEQ_INIT(&gp->hq); + TAILQ_INIT(&gp->dq); + TAILQ_INIT(&gp->hq); LIST_INIT(&gp->ecq); LIST_INSERT_HEAD(&gp->ecq, &gp->excmd, q); gp->noprint = DEFAULT_NOPRINT; @@ -244,11 +244,11 @@ editor(gp, argc, argv) */ if (screen_init(gp, NULL, &sp)) { if (sp != NULL) - CIRCLEQ_INSERT_HEAD(&gp->dq, sp, q); + TAILQ_INSERT_HEAD(&gp->dq, sp, q); goto err; } F_SET(sp, SC_EX); - CIRCLEQ_INSERT_HEAD(&gp->dq, sp, q); + TAILQ_INSERT_HEAD(&gp->dq, sp, q); if (v_key_init(sp)) /* Special key initialization. */ goto err; @@ -456,10 +456,10 @@ v_end(gp) (void)file_end(gp->ccl_sp, NULL, 1); (void)screen_end(gp->ccl_sp); } - while ((sp = CIRCLEQ_FIRST(&gp->dq)) != CIRCLEQ_END(&gp->dq)) - (void)screen_end(sp); - while ((sp = CIRCLEQ_FIRST(&gp->hq)) != CIRCLEQ_END(&gp->hq)) - (void)screen_end(sp); + while ((sp = TAILQ_FIRST(&gp->dq))) + (void)screen_end(sp); /* Removes sp from the queue. */ + while ((sp = TAILQ_FIRST(&gp->hq))) + (void)screen_end(sp); /* Removes sp from the queue. */ #ifdef HAVE_PERL_INTERP perl_end(gp); |