path: root/common/console_common.c
diff options
authorSascha Hauer <>2016-04-14 09:37:28 +0200
committerSascha Hauer <>2016-04-15 12:21:46 +0200
commit5559bfd2719f0b0795a6ce66b859d879271bb1e4 (patch)
treeea8c3d5779197b753e68d271b45e660d5eb50931 /common/console_common.c
parent473d6f8a7a16d1440f360b8562b746fbadee2d82 (diff)
stdio: Replace FILE functions with filedescriptor functions
We have defined stdin, stdout and stderr as integer file descriptors, but normally they should be FILE *. Also fprintf, fputc and fputs take file descriptors instead of FILE *. As FILE * are inconvenient in the barebox environment replace the f* functions with the corresponding d* functions. dprintf is POSIX conform whereas dputc and dputs are barebox specific, but do not conflict with any stdc function. fgetc is unused and can be removed without replacing it. Signed-off-by: Sascha Hauer <>
Diffstat (limited to 'common/console_common.c')
1 files changed, 9 insertions, 9 deletions
diff --git a/common/console_common.c b/common/console_common.c
index a9bbce9..2e5869f 100644
--- a/common/console_common.c
+++ b/common/console_common.c
@@ -278,7 +278,7 @@ EXPORT_SYMBOL(console_get_first_active);
-int fprintf(int file, const char *fmt, ...)
+int dprintf(int file, const char *fmt, ...)
va_list args;
char printbuffer[CFG_PBSIZE];
@@ -293,30 +293,30 @@ int fprintf(int file, const char *fmt, ...)
/* Print the string */
- return fputs(file, printbuffer);
+ return dputs(file, printbuffer);
-int fputs(int fd, const char *s)
+int dputs(int fd, const char *s)
if (fd == 1)
return puts(s);
else if (fd == 2)
- return eputs(s);
+ return console_puts(CONSOLE_STDERR, s);
return write(fd, s, strlen(s));
-int fputc(int fd, char c)
+int dputc(int fd, char c)
if (fd == 1)
else if (fd == 2)
- eputc(c);
+ console_putc(CONSOLE_STDERR, c);
return write(fd, &c, 1);
return 0;