diff --git a/proc.c b/proc.c index ea2c8a31..fc8db304 100644 --- a/proc.c +++ b/proc.c @@ -161,12 +161,6 @@ proc_send(struct tmuxpeer *peer, enum msgtype type, int fd, const void *buf, return (0); } -int -proc_send_s(struct tmuxpeer *peer, enum msgtype type, const char *s) -{ - return (proc_send(peer, type, -1, s, strlen(s) + 1)); -} - struct tmuxproc * proc_start(const char *name, struct event_base *base, int forkflag, void (*signalcb)(int)) diff --git a/server-client.c b/server-client.c index eee28883..d2ee6895 100644 --- a/server-client.c +++ b/server-client.c @@ -371,7 +371,7 @@ server_client_detach(struct client *c, enum msgtype msgtype) c->flags |= CLIENT_DETACHING; notify_client("client-detached", c); - proc_send_s(c->peer, msgtype, s->name); + proc_send(c->peer, msgtype, -1, s->name, strlen(s->name) + 1); } /* Execute command to replace a client. */ @@ -1721,7 +1721,7 @@ server_client_dispatch_shell(struct client *c) shell = options_get_string(global_s_options, "default-shell"); if (*shell == '\0' || areshell(shell)) shell = _PATH_BSHELL; - proc_send_s(c->peer, MSG_SHELL, shell); + proc_send(c->peer, MSG_SHELL, -1, shell, strlen(shell) + 1); proc_kill_peer(c->peer); } diff --git a/server-fn.c b/server-fn.c index ccec1b4a..1bd727d4 100644 --- a/server-fn.c +++ b/server-fn.c @@ -173,7 +173,7 @@ server_lock_client(struct client *c) tty_raw(&c->tty, tty_term_string(c->tty.term, TTYC_E3)); c->flags |= CLIENT_SUSPENDED; - proc_send_s(c->peer, MSG_LOCK, cmd); + proc_send(c->peer, MSG_LOCK, -1, cmd, strlen(cmd) + 1); } void diff --git a/tmux.h b/tmux.h index ce666230..ec926d48 100644 --- a/tmux.h +++ b/tmux.h @@ -1493,7 +1493,6 @@ const char *find_home(void); /* proc.c */ struct imsg; int proc_send(struct tmuxpeer *, enum msgtype, int, const void *, size_t); -int proc_send_s(struct tmuxpeer *, enum msgtype, const char *); struct tmuxproc *proc_start(const char *, struct event_base *, int, void (*)(int)); void proc_loop(struct tmuxproc *, int (*)(void));