circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-08-20 22:01:46 +01:00
parent 944fde7c57 d589be6c65
commit b0da0cee4d
44 changed files with 431 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
format.c
View File

@ -2085,7 +2085,7 @@ static void *
format_cb_session_windows(struct format_tree *ft)
{
if (ft->s != NULL)
return (format_printf ("%u", winlink_count(&ft->s->windows)));
return (format_printf("%u", winlink_count(&ft->s->windows)));
return (NULL);
}
@ -3626,7 +3626,7 @@ format_build_modifiers(struct format_expand_state *es, const char **s,
break;
cp++;
argv = xreallocarray (argv, argc + 1, sizeof *argv);
argv = xreallocarray(argv, argc + 1, sizeof *argv);
value = xstrndup(cp, end - cp);
argv[argc++] = format_expand1(es, value);
free(value);