SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

terminal-util: use LESS_BY() where appropriate

Browse Source
This commit is contained in:
Lennart Poettering
2026-07-02 08:18:36 +02:00
parent 72c6ac77e3
commit 6e9a1c4cd6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/terminal-util.c
+5 -4
View File
@@ -531,6 +531,7 @@ int show_menu(char **x,
assert(x);
assert(n_columns > 0);
assert(column_width > 0);
if (n_columns == SIZE_MAX)
n_columns = 3;
@@ -542,16 +543,16 @@ int show_menu(char **x,
size_t column_max = (columns()-1) / n_columns;
/* Subtract room for numbers */
if (with_numbers && column_max > 6)
column_max -= 6;
if (with_numbers)
column_max = LESS_BY(column_max, 6U);
/* If columns would get too tight let's make this a linear list instead. */
if (column_max < 10 && widest > 10) {
n_columns = 1;
column_max = columns()-1;
if (with_numbers && column_max > 6)
column_max -= 6;
if (with_numbers)
column_max = LESS_BY(column_max, 6U);
}
column_width = CLAMP(widest+1, 10U, column_max);