Rename session idx to session id throughout and add $ prefix to targets to use

it, extended from a diff from George Nachman.
This commit is contained in:
Nicholas Marriott
2013-03-07 10:07:22 +00:00
parent bc3580fa06
commit f47a063841
11 changed files with 47 additions and 25 deletions

View File

@ -29,7 +29,7 @@
/* Global session list. */
struct sessions sessions;
struct sessions dead_sessions;
u_int next_session;
u_int next_session_id;
struct session_groups session_groups;
struct winlink *session_next_alert(struct winlink *);
@ -69,14 +69,14 @@ session_find(const char *name)
return (RB_FIND(sessions, &sessions, &s));
}
/* Find session by index. */
/* Find session by id. */
struct session *
session_find_by_index(u_int idx)
session_find_by_id(u_int id)
{
struct session *s;
RB_FOREACH(s, sessions, &sessions) {
if (s->idx == idx)
if (s->id == id)
return (s);
}
return (NULL);
@ -120,13 +120,13 @@ session_create(const char *name, const char *cmd, const char *cwd,
if (name != NULL) {
s->name = xstrdup(name);
s->idx = next_session++;
s->id = next_session_id++;
} else {
s->name = NULL;
do {
s->idx = next_session++;
s->id = next_session_id++;
free (s->name);
xasprintf(&s->name, "%u", s->idx);
xasprintf(&s->name, "%u", s->id);
} while (RB_FIND(sessions, &sessions, s) != NULL);
}
RB_INSERT(sessions, &sessions, s);