mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 01:34:18 +00:00 
			
		
		
		
	Use LIST_* not SLIST_*.
This commit is contained in:
		@@ -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);
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								job.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								job.c
									
									
									
									
									
								
							@@ -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)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								server.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								server.c
									
									
									
									
									
								
							@@ -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;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								tmux.h
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								tmux.h
									
									
									
									
									
								
							@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user