Avoid linker conflicts on DescribeFoo symbols

These symbols belong to the user. It caused a confusing error for Blink.
This commit is contained in:
Justine Tunney 2024-08-24 18:10:22 -07:00
parent 38cc4b3c68
commit bb06230f1e
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
120 changed files with 346 additions and 347 deletions

View file

@ -29,8 +29,8 @@
#define append(...) o += ksnprintf(buf + o, N - o, __VA_ARGS__)
const char *(DescribeTermios)(char buf[N], ssize_t rc,
const struct termios *tio) {
const char *_DescribeTermios(char buf[N], ssize_t rc,
const struct termios *tio) {
int o = 0;
char b128[128];
@ -61,7 +61,7 @@ const char *(DescribeTermios)(char buf[N], ssize_t rc,
{IUTF8, "IUTF8"}, //
};
append(".c_iflag=%s",
DescribeFlags(b128, 128, kInput, ARRAYLEN(kInput), "", tio->c_iflag));
_DescribeFlags(b128, 128, kInput, ARRAYLEN(kInput), "", tio->c_iflag));
struct DescribeFlags kOutput[] = {
{OPOST, "OPOST"}, //
@ -83,8 +83,8 @@ const char *(DescribeTermios)(char buf[N], ssize_t rc,
{VT1, "VT1"}, //
{FF1, "FF1"}, //
};
append(", .c_oflag=%s", DescribeFlags(b128, 128, kOutput, ARRAYLEN(kOutput),
"", tio->c_oflag));
append(", .c_oflag=%s", _DescribeFlags(b128, 128, kOutput, ARRAYLEN(kOutput),
"", tio->c_oflag));
struct DescribeFlags kControl[] = {
{CS8, "CS8"}, //
@ -98,8 +98,8 @@ const char *(DescribeTermios)(char buf[N], ssize_t rc,
{CLOCAL, "CLOCAL"}, //
{CRTSCTS, "CRTSCTS"}, //
};
append(", .c_cflag=%s", DescribeFlags(b128, 128, kControl, ARRAYLEN(kControl),
"", tio->c_cflag));
append(", .c_cflag=%s", _DescribeFlags(b128, 128, kControl,
ARRAYLEN(kControl), "", tio->c_cflag));
struct DescribeFlags kLocal[] = {
{ISIG, "ISIG"}, //
@ -125,7 +125,7 @@ const char *(DescribeTermios)(char buf[N], ssize_t rc,
".c_cc[VTIME]=%d, "
".c_cc[VINTR]=CTRL(%#c), "
".c_cc[VQUIT]=CTRL(%#c)",
DescribeFlags(b128, 128, kLocal, ARRAYLEN(kLocal), "", tio->c_lflag),
_DescribeFlags(b128, 128, kLocal, ARRAYLEN(kLocal), "", tio->c_lflag),
tio->c_cc[VMIN], tio->c_cc[VTIME], CTRL(tio->c_cc[VINTR]),
CTRL(tio->c_cc[VQUIT]));