From 5d85ab82cefdff7829e384b30917c4442fa488a7 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 26 Jan 2011 00:11:48 +0000 Subject: Use LIST_* not SLIST_*. --- usr.bin/tmux/cmd-server-info.c | 6 +++--- usr.bin/tmux/job.c | 8 ++++---- usr.bin/tmux/server.c | 4 ++-- usr.bin/tmux/tmux.h | 10 +++++----- usr.bin/tmux/tty-term.c | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/tmux/cmd-server-info.c b/usr.bin/tmux/cmd-server-info.c index d81a822c012..25ec25f3e17 100644 --- a/usr.bin/tmux/cmd-server-info.c +++ b/usr.bin/tmux/cmd-server-info.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-server-info.c,v 1.22 2011/01/13 00:54:32 nicm Exp $ */ +/* $OpenBSD: cmd-server-info.c,v 1.23 2011/01/26 00:11:47 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -142,7 +142,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx) ctx->print(ctx, "%s", ""); ctx->print(ctx, "Terminals:"); - SLIST_FOREACH(term, &tty_terms, entry) { + LIST_FOREACH(term, &tty_terms, entry) { ctx->print(ctx, "%s [references=%u, flags=0x%x]:", term->name, term->references, term->flags); for (i = 0; i < NTTYCODE; i++) { @@ -174,7 +174,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx) ctx->print(ctx, "%s", ""); ctx->print(ctx, "Jobs:"); - SLIST_FOREACH(job, &all_jobs, lentry) { + LIST_FOREACH(job, &all_jobs, lentry) { ctx->print(ctx, "%s [fd=%d, pid=%d, status=%d, flags=0x%x]", job->cmd, job->fd, job->pid, job->status, job->flags); } diff --git a/usr.bin/tmux/job.c b/usr.bin/tmux/job.c index 99527735335..305d1fe6049 100644 --- a/usr.bin/tmux/job.c +++ b/usr.bin/tmux/job.c @@ -1,4 +1,4 @@ -/* $OpenBSD: job.c,v 1.23 2011/01/23 11:03:43 nicm Exp $ */ +/* $OpenBSD: job.c,v 1.24 2011/01/26 00:11:47 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -32,7 +32,7 @@ */ /* All jobs list. */ -struct joblist all_jobs = SLIST_HEAD_INITIALIZER(all_jobs); +struct joblist all_jobs = LIST_HEAD_INITIALIZER(all_jobs); RB_GENERATE(jobs, job, entry, job_cmp); @@ -99,7 +99,7 @@ job_add(struct jobs *jobs, int flags, struct client *c, const char *cmd, if (jobs != NULL) RB_INSERT(jobs, jobs, job); - SLIST_INSERT_HEAD(&all_jobs, job, lentry); + LIST_INSERT_HEAD(&all_jobs, job, lentry); return (job); } @@ -119,7 +119,7 @@ job_free(struct job *job) { job_kill(job); - SLIST_REMOVE(&all_jobs, job, job, lentry); + LIST_REMOVE(job, lentry); xfree(job->cmd); if (job->freefn != NULL && job->data != NULL) diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index 0b211388b8a..9588bbb6105 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.100 2011/01/08 01:52:36 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.101 2011/01/26 00:11:47 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -415,7 +415,7 @@ server_child_exited(pid_t pid, int status) } } - SLIST_FOREACH(job, &all_jobs, lentry) { + LIST_FOREACH(job, &all_jobs, lentry) { if (pid == job->pid) { job_died(job, status); /* might free job */ break; diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index f6c9e881b8f..72a0dc083c8 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.269 2011/01/25 23:40:26 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.270 2011/01/26 00:11:47 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -684,10 +684,10 @@ struct job { #define JOB_PERSIST 0x1 /* don't free after callback */ RB_ENTRY(job) entry; - SLIST_ENTRY(job) lentry; + LIST_ENTRY(job) lentry; }; RB_HEAD(jobs, job); -SLIST_HEAD(joblist, job); +LIST_HEAD(joblist, job); /* Screen selection. */ struct screen_sel { @@ -990,9 +990,9 @@ struct tty_term { #define TERM_EARLYWRAP 0x4 int flags; - SLIST_ENTRY(tty_term) entry; + LIST_ENTRY(tty_term) entry; }; -SLIST_HEAD(tty_terms, tty_term); +LIST_HEAD(tty_terms, tty_term); struct tty { char *path; diff --git a/usr.bin/tmux/tty-term.c b/usr.bin/tmux/tty-term.c index 1c14659741c..44da095c264 100644 --- a/usr.bin/tmux/tty-term.c +++ b/usr.bin/tmux/tty-term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-term.c,v 1.19 2011/01/01 03:32:28 nicm Exp $ */ +/* $OpenBSD: tty-term.c,v 1.20 2011/01/26 00:11:47 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -30,7 +30,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" }, @@ -305,7 +305,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); @@ -318,7 +318,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) { @@ -437,7 +437,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) -- cgit v1.2.3