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

Tidy tparm wrapper functions to have more obvious names and check tparm

Browse Source 
return value.
This commit is contained in:
nicm
2023-04-25 09:31:50 +00:00
parent 551e0c36d9
commit 8f34504736
3 changed files with 111 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tty-term.c
View File

@ -754,35 +754,60 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
}
const char *
tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
tty_term_string_i(struct tty_term *term, enum tty_code_code code, int a)
{
return (tparm((char *) tty_term_string(term, code), a));
const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, a);
if (s == NULL)
fatalx("could not expand %s", tty_term_codes[code].name);
return (s);
}
const char *
tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b)
tty_term_string_ii(struct tty_term *term, enum tty_code_code code, int a, int b)
{
return (tparm((char *) tty_term_string(term, code), a, b));
const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, a, b);
if (s == NULL)
fatalx("could not expand %s", tty_term_codes[code].name);
return (s);
}
const char *
tty_term_string3(struct tty_term *term, enum tty_code_code code, int a, int b,
tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a, int b,
int c)
{
return (tparm((char *) tty_term_string(term, code), a, b, c));
const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, a, b, c);
if (s == NULL)
fatalx("could not expand %s", tty_term_codes[code].name);
return (s);
}
const char *
tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a)
tty_term_string_s(struct tty_term *term, enum tty_code_code code, const char *a)
{
return (tparm((char *) tty_term_string(term, code), a));
const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, (long)a);
if (s == NULL)
fatalx("could not expand %s", tty_term_codes[code].name);
return (s);
}
const char *
tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a,
const void *b)
tty_term_string_ss(struct tty_term *term, enum tty_code_code code, const char *a,
const char *b)
{
return (tparm((char *) tty_term_string(term, code), a, b));
const char *x = tty_term_string(term, code), *s;
s = tparm((char *)x, (long)a, (long)b);
if (s == NULL)
fatalx("could not expand %s", tty_term_codes[code].name);
return (s);
}
int