diff options
| author | Markus Uhlin <markus@nifty-networks.net> | 2026-03-18 21:27:25 +0100 |
|---|---|---|
| committer | Markus Uhlin <markus@nifty-networks.net> | 2026-03-18 21:27:25 +0100 |
| commit | 2845c957501cc0580e4f6783a230dc60186d7cf0 (patch) | |
| tree | 2a88430401d4d4bb8911251fcd167b5f6492a6a7 /FICS | |
| parent | 05a706c995f03cb4c15db64eaf954c37151c45aa (diff) | |
Made pprintf_prompt() void -- its return value is not used anywhere through the whole project
Diffstat (limited to 'FICS')
| -rw-r--r-- | FICS/utils.c | 20 | ||||
| -rw-r--r-- | FICS/utils.h | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/FICS/utils.c b/FICS/utils.c index 57171fc..1695926 100644 --- a/FICS/utils.c +++ b/FICS/utils.c @@ -449,20 +449,26 @@ psprintf_highlight(int p, char *s, size_t size, char *format, ...) return retval; } -PUBLIC int +PUBLIC void pprintf_prompt(int p, char *format, ...) { - char tmp[10 * MAX_LINE_SIZE]; - int retval; - va_list ap; + char tmp[10 * MAX_LINE_SIZE] = { '\0' }; + int retval; + va_list ap; va_start(ap, format); retval = vsnprintf(tmp, sizeof tmp, format, ap); va_end(ap); - net_send_string(parray[p].socket, tmp, 1); - net_send_string(parray[p].socket, parray[p].prompt, 1); - return retval; + if (is_too_long(retval, sizeof tmp)) { + warnx("%s: error: vsnprintf() truncated", __func__); + return; + } + + if (net_send_string(parray[p].socket, tmp, 1) == -1) + warnx("%s: send error", __func__); + if (net_send_string(parray[p].socket, parray[p].prompt, 1) == -1) + warnx("%s: send error", __func__); } PUBLIC int diff --git a/FICS/utils.h b/FICS/utils.h index c29ded5..6452bec 100644 --- a/FICS/utils.h +++ b/FICS/utils.h @@ -96,7 +96,7 @@ extern int pmore_file(int); extern void pprintf(int, const char *, ...) PRINTFLIKE(2); extern int pprintf_highlight(int, char *, ...) PRINTFLIKE(2); extern int pprintf_noformat(int, char *, ...) PRINTFLIKE(2); -extern int pprintf_prompt(int, char *, ...) PRINTFLIKE(2); +extern void pprintf_prompt(int, char *, ...) PRINTFLIKE(2); extern int printablestring(char *); extern int psend_command(int, char *, char *); extern int psend_file(int, const char *, const char *); |