diff options
| author | Thomas Adam <thomas@xteddy.org> | 2023-09-01 20:01:10 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2023-09-01 20:01:10 +0100 |
| commit | e7c829fc67c9b037402ad1624139de33665fb96b (patch) | |
| tree | 2bbfa62a7a83979c4703e3ad0b48f551bca10d42 | |
| parent | 3aa20f6e758a8f96841010d374ed24505d7d89ef (diff) | |
| parent | 579829eef233ec927d9c71692fd880ddef66c2e7 (diff) | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-capture-pane.c | 2 | ||||
| -rw-r--r-- | utf8-combined.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c index 57e9716d..8f7250e8 100644 --- a/cmd-capture-pane.c +++ b/cmd-capture-pane.c @@ -39,7 +39,7 @@ const struct cmd_entry cmd_capture_pane_entry = { .name = "capture-pane", .alias = "capturep", - .args = { "ab:CeE:JNpPqS:t:", 0, 0, NULL }, + .args = { "ab:CeE:JNpPqS:Tt:", 0, 0, NULL }, .usage = "[-aCeJNpPqT] " CMD_BUFFER_USAGE " [-E end-line] " "[-S start-line] " CMD_TARGET_PANE_USAGE, diff --git a/utf8-combined.c b/utf8-combined.c index 26bd9131..49f7a648 100644 --- a/utf8-combined.c +++ b/utf8-combined.c @@ -962,7 +962,7 @@ utf8_combined_first_cmp(struct utf8_combined_first *uf1, return (-1); if (ud1->size > ud2->size) return (1); - return (memcmp(ud1->data, ud2->data, sizeof *ud1->data)); + return (memcmp(ud1->data, ud2->data, ud1->size)); } RB_HEAD(utf8_combined_tree, utf8_combined_first); RB_GENERATE_STATIC(utf8_combined_tree, utf8_combined_first, entry, @@ -979,7 +979,7 @@ utf8_combined_second_cmp(const void *vp1, const void *vp2) return (-1); if (ud1->size > ud2->size) return (1); - return (memcmp(ud1->data, ud2->data, sizeof *ud1->data)); + return (memcmp(ud1->data, ud2->data, ud1->size)); } static int |