Changeset 1c1002a in mainline


Ignore:
Timestamp:
2008-12-29T23:48:23Z (16 years ago)
Author:
Jiri Svoboda <jirik.svoboda@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6b21292
Parents:
63088cc1
Message:

fprintf(), vfprintf().

Location:
uspace
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/tester/Makefile

    r63088cc1 r1c1002a  
    5959        console/console1.c \
    6060        stdio/stdio1.c \
     61        stdio/stdio2.c \
    6162        vfs/vfs1.c
    6263

  • uspace/app/tester/stdio/stdio1.def

    r63088cc1 r1c1002a  
    11{
    22        "stdio1",
    3         "ANSI C streams test",
     3        "ANSI C streams reading test",
    44        &test_stdio1,
    55        true

  • uspace/app/tester/tester.c

    r63088cc1 r1c1002a  
    6161#include "console/console1.def"
    6262#include "stdio/stdio1.def"
     63#include "stdio/stdio2.def"
    6364        {NULL, NULL, NULL}
    6465};

  • uspace/app/tester/tester.h

    r63088cc1 r1c1002a  
    7474extern char * test_console1(bool quiet);
    7575extern char * test_stdio1(bool quiet);
     76extern char * test_stdio2(bool quiet);
    7677
    7778extern test_t tests[];

  • uspace/lib/libc/Makefile

    r63088cc1 r1c1002a  
    6161        generic/io/io.c \
    6262        generic/io/printf.c \
     63        generic/io/fprintf.c \
    6364        generic/io/stdio.c \
    6465        generic/io/stream.c \

  • uspace/lib/libc/generic/io/stdio.c

    r63088cc1 r1c1002a  
    4343#include <bool.h>
    4444#include <stdio.h>
     45
     46FILE *stdin, *stdout, *stderr;
    4547
    4648/**

  • uspace/lib/libc/include/stdio.h

    r63088cc1 r1c1002a  
    6464} FILE;
    6565
     66extern FILE *stdin, *stdout, *stderr;
     67
    6668extern int getchar(void);
    6769
    … …  
    7173extern int printf(const char *, ...);
    7274extern int asprintf(char **, const char *, ...);
    73 extern int sprintf(char *, const char *fmt, ...);
     75extern int sprintf(char *, const char *, ...);
    7476extern int snprintf(char *, size_t , const char *, ...);
    7577
    … …  
    7779extern int vsprintf(char *, const char *, va_list);
    7880extern int vsnprintf(char *, size_t, const char *, va_list);
    79 
    80 #define fprintf(f, fmt, ...) printf(fmt, ##__VA_ARGS__)
    8181
    8282extern int rename(const char *, const char *);
    … …  
    9090extern void clearerr(FILE *);
    9191
    92 extern int fgetc(FILE *);;
     92extern int fgetc(FILE *);
    9393extern int fputc(int, FILE *);
    9494extern int fputs(const char *, FILE *);
     95
     96extern int fprintf(FILE *, const char *, ...);
     97extern int vfprintf(FILE *, const char *, va_list);
    9598
    9699#define getc fgetc
Note: See TracChangeset for help on using the changeset viewer.