Sync OpenBSD patchset 854:

Use LIST_* not SLIST_*.
This commit is contained in:
Tiago Cunha
2011-02-15 15:12:28 +00:00
parent 2ab568fa88
commit 3b56ebce6d
5 changed files with 19 additions and 19 deletions

View File

@ -1,4 +1,4 @@
/* $Id: tty-term.c,v 1.45 2011-01-03 23:30:43 tcunha Exp $ */
/* $Id: tty-term.c,v 1.46 2011-02-15 15:12:28 tcunha Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -33,7 +33,7 @@
void tty_term_override(struct tty_term *, const char *);
char *tty_term_strip(const char *);
struct tty_terms tty_terms = SLIST_HEAD_INITIALIZER(tty_terms);
struct tty_terms tty_terms = LIST_HEAD_INITIALIZER(tty_terms);
const struct tty_term_code_entry tty_term_codes[NTTYCODE] = {
{ TTYC_ACSC, TTYCODE_STRING, "acsc" },
@ -308,7 +308,7 @@ tty_term_find(char *name, int fd, const char *overrides, char **cause)
char *s;
const char *acs;
SLIST_FOREACH(term, &tty_terms, entry) {
LIST_FOREACH(term, &tty_terms, entry) {
if (strcmp(term->name, name) == 0) {
term->references++;
return (term);
@ -321,7 +321,7 @@ tty_term_find(char *name, int fd, const char *overrides, char **cause)
term->references = 1;
term->flags = 0;
memset(term->codes, 0, sizeof term->codes);
SLIST_INSERT_HEAD(&tty_terms, term, entry);
LIST_INSERT_HEAD(&tty_terms, term, entry);
/* Set up curses terminal. */
if (setupterm(name, fd, &error) != OK) {
@ -442,7 +442,7 @@ tty_term_free(struct tty_term *term)
if (--term->references != 0)
return;
SLIST_REMOVE(&tty_terms, term, tty_term, entry);
LIST_REMOVE(term, entry);
for (i = 0; i < NTTYCODE; i++) {
if (term->codes[i].type == TTYCODE_STRING)