uzix/picocom
1
0
Fork 0
mirror of https://github.com/UzixLS/picocom.git synced 2025-07-19 07:21:18 +03:00
Code Issues Projects Releases Wiki Activity

Cleanup / refactor fd_printf and similar functions

Browse Source
This commit is contained in:
Nick Patavalis
2017-12-21 12:56:26 +02:00
parent aa58944f34
commit 637f7b375e
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fdio.c
View File

@ -53,26 +53,33 @@ writen_ni(int fd, const void *buff, size_t n)
}
int
fd_printf (int fd, const char *format, ...)
fd_vprintf (int fd, const char *format, va_list ap)
{
char buf[256];
va_list args;
int len;
va_start(args, format);
len = vsnprintf(buf, sizeof(buf), format, args);
len = vsnprintf(buf, sizeof(buf), format, ap);
buf[sizeof(buf) - 1] = '\0';
va_end(args);
return writen_ni(fd, buf, len);
}
int
fd_printf (int fd, const char *format, ...)
{
va_list args;
int len;
va_start(args, format);
len = fd_vprintf(fd, format, args);
va_end(args);
return len;
}
int
fd_pinfof(int quiet, const char *format, ...)
{
char buf[256];
va_list args;
int len;
@ -80,11 +87,10 @@ fd_pinfof(int quiet, const char *format, ...)
return 0;
}
va_start(args, format);
len = vsnprintf(buf, sizeof(buf), format, args);
buf[sizeof(buf) - 1] = '\0';
len = fd_vprintf(STDOUT_FILENO, format, args);
va_end(args);
return writen_ni(STDOUT_FILENO, buf, len);
return len;
}
/**********************************************************************/

2
fdio.h
View File

@ -26,6 +26,8 @@
ssize_t writen_ni(int fd, const void *buff, size_t n);
int fd_vprintf (int fd, const char *format, va_list ap);
int fd_printf (int fd, const char *format, ...);
int fd_pinfof (int quiet, const char *format, ...);

15
picocom.c
View File

@ -562,22 +562,15 @@ cleanup (int drain, int noreset)
void
fatal (const char *format, ...)
{
char *s, buf[256];
va_list args;
int len;
fd_printf(STE, "\r\nFATAL: ");
va_start(args, format);
len = vsnprintf(buf, sizeof(buf), format, args);
buf[sizeof(buf) - 1] = '\0';
fd_vprintf(STE, format, args);
va_end(args);
fd_printf(STE, "\r\n");
s = "\r\nFATAL: ";
writen_ni(STE, s, strlen(s));
writen_ni(STE, buf, len);
s = "\r\n";
writen_ni(STE, s, strlen(s));
cleanup(0 /* drain */, opts.noreset);
cleanup(0 /* drain */, opts.noreset, opts.hangup);
exit(EXIT_FAILURE);
}