Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2026-05-27 08:15:06 +01:00
2 changed files with 6 additions and 6 deletions

10
sort.c
View File

@@ -425,11 +425,11 @@ sort_get_clients(u_int *n, struct sort_criteria *sort_crit)
i = 0; i = 0;
TAILQ_FOREACH(c, &clients, entry) { TAILQ_FOREACH(c, &clients, entry) {
if (c->flags & CLIENT_UNATTACHEDFLAGS) if (c->flags & CLIENT_UNATTACHEDFLAGS)
continue; continue;
if (~c->flags & CLIENT_ATTACHED) if (~c->flags & CLIENT_ATTACHED)
continue; continue;
if (lsz <= i) { if (lsz <= i) {
lsz += 100; lsz += 100;
l = xreallocarray(l, lsz, sizeof *l); l = xreallocarray(l, lsz, sizeof *l);
} }

View File

@@ -2102,7 +2102,7 @@ window_pane_tiled_geometry(struct window *w, struct window_pane *wp,
} else if (args_has(args, 'p')) { } else if (args_has(args, 'p')) {
size = args_strtonum_and_expand(args, 'p', 0, 100, item, size = args_strtonum_and_expand(args, 'p', 0, 100, item,
cause); cause);
if (cause == NULL) if (*cause == NULL)
size = curval * size / 100; size = curval * size / 100;
} }
if (*cause != NULL) if (*cause != NULL)