kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Fix vfprintf(3) error case.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2013-11-02 22:58:15 +01:00
parent d6c1e64628
commit bfd013ab10
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libc/print.cpp
View file

@ -22,8 +22,9 @@
*******************************************************************************/ *******************************************************************************/
#include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -36,6 +37,8 @@ static size_t FileWriteCallback(void* user, const char* string, size_t stringlen
extern "C" int vfprintf(FILE* fp, const char* /*restrict*/ format, va_list list) extern "C" int vfprintf(FILE* fp, const char* /*restrict*/ format, va_list list)
{ {
size_t result = vprintf_callback(FileWriteCallback, fp, format, list); size_t result = vprintf_callback(FileWriteCallback, fp, format, list);
if ( result == SIZE_MAX )
return -1;
return (int) result; return (int) result;
} }
@ -43,22 +46,21 @@ extern "C" int fprintf(FILE* fp, const char* /*restrict*/ format, ...)
{ {
va_list list; va_list list;
va_start(list, format); va_start(list, format);
size_t result = vfprintf(fp, format, list); int result = vfprintf(fp, format, list);
va_end(list); va_end(list);
return (int) result; return result;
} }
extern "C" int vprintf(const char* /*restrict*/ format, va_list list) extern "C" int vprintf(const char* /*restrict*/ format, va_list list)
{ {
size_t result = vfprintf(stdout, format, list); return vfprintf(stdout, format, list);
return (int) result;
} }
extern "C" int printf(const char* /*restrict*/ format, ...) extern "C" int printf(const char* /*restrict*/ format, ...)
{ {
va_list list; va_list list;
va_start(list, format); va_start(list, format);
size_t result = vprintf(format, list); int result = vprintf(format, list);
va_end(list); va_end(list);
return (int) result; return result;
} }