summaryrefslogtreecommitdiff
path: root/src/libc/stdio.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libc/stdio.c')
-rw-r--r--src/libc/stdio.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/libc/stdio.c b/src/libc/stdio.c
index 1d53f7a..07a047e 100644
--- a/src/libc/stdio.c
+++ b/src/libc/stdio.c
@@ -3,16 +3,16 @@
#include "stdlib.h"
#include "string.h"
-console_t *global_console = NULL;
+console_t *stdio_console = NULL;
int puts( const char *s )
{
- if( global_console == NULL ) {
+ if( stdio_console == NULL ) {
return EOF;
}
- console_put_string( global_console, s );
- console_put_newline( global_console );
+ console_put_string( stdio_console, s );
+ console_put_newline( stdio_console );
return 1;
}
@@ -33,34 +33,34 @@ int vprintf( const char *format, va_list args )
const char *s = format;
int n = 0;
- if( global_console == NULL ) {
+ if( stdio_console == NULL ) {
return -1;
}
while( *s != '\0' ) {
switch( *s ) {
case '\n':
- console_put_newline( global_console );
+ console_put_newline( stdio_console );
n++;
break;
case '%':
s++;
if( *s == '\0' ) {
- console_put_string( global_console, "<truncated % found at end of format string>" );
- console_put_newline( global_console );
+ console_put_string( stdio_console, "<truncated % found at end of format string>" );
+ console_put_newline( stdio_console );
return -1;
}
switch( *s ) {
case '%':
- console_put_char( global_console, '%' );
+ console_put_char( stdio_console, '%' );
break;
case 'X': {
char buf[19];
itoa( va_arg( args, int ), (char *)buf, 16 );
- console_put_string( global_console, buf );
+ console_put_string( stdio_console, buf );
n += strlen( buf );
}
break;
@@ -68,30 +68,30 @@ int vprintf( const char *format, va_list args )
case 'd': {
char buf[19];
itoa( va_arg( args, int ), (char *)buf, 10 );
- console_put_string( global_console, buf );
+ console_put_string( stdio_console, buf );
n += strlen( buf );
}
break;
case 'c':
- console_put_char( global_console, va_arg( args, int ) );
+ console_put_char( stdio_console, va_arg( args, int ) );
break;
case 's':
- console_put_string( global_console, va_arg( args, const char * ) );
+ console_put_string( stdio_console, va_arg( args, const char * ) );
break;
default:
- console_put_string( global_console, "<illegal format string %" );
- console_put_char( global_console, *s );
- console_put_string( global_console, ">" );
- console_put_newline( global_console );
+ console_put_string( stdio_console, "<illegal format string %" );
+ console_put_char( stdio_console, *s );
+ console_put_string( stdio_console, ">" );
+ console_put_newline( stdio_console );
}
break;
default:
- console_put_char( global_console, *s );
+ console_put_char( stdio_console, *s );
n++;
}
s++;
@@ -100,7 +100,7 @@ int vprintf( const char *format, va_list args )
return n;
}
-void stdio_set_console( console_t *console )
+void __stdio_set_console( console_t *console )
{
- global_console = console;
+ stdio_console = console;
}