aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2021-08-17 14:01:16 +0100
committerThomas Adam <thomas@xteddy.org>2021-08-17 14:01:16 +0100
commit7869ec87e0144c4a224ac532b68ccaf293df0c2b (patch)
tree475a7144314d198415ebb423287d6bb4bbb66217
parent0dad8dd98259ce686b98e482080d916edbc294e4 (diff)
parentde9697b456c39b668ee387a17cd4abd3858e731a (diff)
downloadrtmux-7869ec87e0144c4a224ac532b68ccaf293df0c2b.tar.gz
rtmux-7869ec87e0144c4a224ac532b68ccaf293df0c2b.tar.bz2
rtmux-7869ec87e0144c4a224ac532b68ccaf293df0c2b.zip
Merge branch 'obsd-master' into master
-rw-r--r--cmd-confirm-before.c2
-rw-r--r--tty.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c
index 6b754370..51c2fe8e 100644
--- a/cmd-confirm-before.c
+++ b/cmd-confirm-before.c
@@ -72,7 +72,7 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
free(copy);
}
- cdata = xmalloc(sizeof *cdata);
+ cdata = xcalloc(1, sizeof *cdata);
cdata->cmd = xstrdup(args->argv[0]);
cmd_get_source(self, &cdata->pi.file, &cdata->pi.line);
diff --git a/tty.c b/tty.c
index f93f6c57..ba58aa2b 100644
--- a/tty.c
+++ b/tty.c
@@ -2043,7 +2043,7 @@ tty_cmd_syncstart(struct tty *tty, const struct tty_ctx *ctx)
{
if (ctx->num == 0x11) {
/*
- * This is an overlay and a command that moves, the cursor so
+ * This is an overlay and a command that moves the cursor so
* start synchronized updates.
*/
tty_sync_start(tty);