Avoid conditional references of PRINTF_BUFR_SIZE in headers.

[markj]

Summary

It turns out that PRINTF_BUFR_SIZE is always defined in opt_printf.h, but
most C files don't include that. However, subr_prf.c does, and it also
references struct tty. PRINTF_BUFR_SIZE defaults to 128, so the size of
t_prbuf varies depending on the compilation unit, resulting in duplicate
CTF type definitions.

Fix the problem by always using PRINTF_BUFR_SIZE to size t_prbuf.

[cem]

sys/sys/tty.h

136 ↗

(On Diff #50086)

I think some universe configs don't define PRINTF_BUFR_SIZE.

137 ↗

(On Diff #50086)

Is [0] or [] the preferred style? Either way, it's ok.

[markj]

sys/sys/tty.h

136 ↗

(On Diff #50086)

Hrm, ok. I'll restore the conditional definition then.

137 ↗

(On Diff #50086)

I guess we might as well use C99. I'll change it.

[markj]

• Handle PRINTF_BUFR_SIZE not being defined.
• Ensure that the buffer size is consistent across all CUs. That is, don't rely on CUs to remember to include opt_printf.h.

[cem]

(Approved)

[ed]

head/sys/kern/tty.c

110

If PRINTF_BUFR_SIZE is always defined in opt_printf.h, why do we need the conditional code here?

[cem]

head/sys/kern/tty.c

110

It's not always defined, IIRC. Hence similar logic in cam_xpt.c, subr_prf.c, and xen_console.c.

[markj]

head/sys/kern/tty.c

110

Indeed, there is no fallback definition that gets used if it's omitted in the kernel configuration file.