circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-01 15:06:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-10-28 10:01:07 +00:00
parent d5302ec327 aa420cd54a
commit 010394ab63
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-load-buffer.c
View File

@@ -66,7 +66,7 @@ cmd_load_buffer_done(__unused struct client *c, const char *path, int error,
return; return;
if (error != 0) if (error != 0)
cmdq_error(item, "%s: %s", path, strerror(error)); cmdq_error(item, "%s: %s", strerror(error), path);
else if (bsize != 0) { else if (bsize != 0) {
copy = xmalloc(bsize); copy = xmalloc(bsize);
memcpy(copy, bdata, bsize); memcpy(copy, bdata, bsize);

2
cmd-save-buffer.c
View File

@@ -65,7 +65,7 @@ cmd_save_buffer_done(__unused struct client *c, const char *path, int error,
return; return;
if (error != 0) if (error != 0)
cmdq_error(item, "%s: %s", path, strerror(error)); cmdq_error(item, "%s: %s", strerror(error), path);
cmdq_continue(item); cmdq_continue(item);
} }

4
cmd-source-file.c
View File

@@ -114,7 +114,7 @@ cmd_source_file_done(struct client *c, const char *path, int error,
return; return;
if (error != 0) if (error != 0)
cmdq_error(item, "%s: %s", path, strerror(error)); cmdq_error(item, "%s: %s", strerror(error), path);
else if (bsize != 0) { else if (bsize != 0) {
if (load_cfg_from_buffer(bdata, bsize, path, c, cdata->after, if (load_cfg_from_buffer(bdata, bsize, path, c, cdata->after,
target, cdata->flags, &new_item) < 0) target, cdata->flags, &new_item) < 0)
@@ -233,7 +233,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
error = strerror(ENOMEM); error = strerror(ENOMEM);
else else
error = strerror(EINVAL); error = strerror(EINVAL);
cmdq_error(item, "%s: %s", path, error); cmdq_error(item, "%s: %s", error, path);
retval = CMD_RETURN_ERROR; retval = CMD_RETURN_ERROR;
} }
globfree(&g); globfree(&g);