Changeset 1916d1f in mainline for uspace/lib/posix/stdio.h


Ignore:
Timestamp:
2011-07-12T13:41:26Z (14 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
50fc490
Parents:
11809eab (diff), 6817eba (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge libposix changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/posix/stdio.h

    r11809eab r1916d1f  
    4242#include "limits.h"
    4343
     44/* Identifying the Terminal */
    4445#undef L_ctermid
    4546#define L_ctermid PATH_MAX
     47extern char *posix_ctermid(char *s);
    4648
     49/* Error Recovery */
    4750extern void posix_clearerr(FILE *stream);
    48 extern char *posix_ctermid(char *s);
    4951
    5052/* Input/Output */
    5153#undef putc
    5254#define putc fputc
     55extern int posix_fputs(const char *restrict s, FILE *restrict stream);
    5356#undef getc
    5457#define getc fgetc
    5558extern int posix_ungetc(int c, FILE *stream);
    56 
    5759extern ssize_t posix_getdelim(char **restrict lineptr, size_t *restrict n,
    5860    int delimiter, FILE *restrict stream);
    … …  
    6163
    6264/* Opening Streams */
    63 extern FILE *posix_freopen(
    64    const char *restrict filename,
    65    const char *restrict mode,
    66    FILE *restrict stream);
    67 
    68 /* Memory Streams */
    69 
     65extern FILE *posix_freopen(const char *restrict filename,
     66    const char *restrict mode, FILE *restrict stream);
    7067extern FILE *posix_fmemopen(void *restrict buf, size_t size,
    7168    const char *restrict mode);
    … …  
    7673
    7774/* File Positioning */
    78 
    7975typedef struct _posix_fpos posix_fpos_t;
    8076extern int posix_fsetpos(FILE *stream, const posix_fpos_t *pos);
    … …  
    8581extern posix_off_t posix_ftello(FILE *stream);
    8682
    87 /* Formatted Input/Output */
     83/* Flushing Buffers */
     84extern int posix_fflush(FILE *stream);
     85
     86/* Formatted Output */
    8887extern int posix_dprintf(int fildes, const char *restrict format, ...)
    8988    PRINTF_ATTRIBUTE(2, 3);
    … …  
    9392extern int posix_vsprintf(char *restrict s, const char *restrict format, va_list ap);
    9493
     94/* Formatted Input */
    9595extern int posix_fscanf(
    9696    FILE *restrict stream, const char *restrict format, ...);
    … …  
    105105
    106106/* File Locking */
    107 
    108107extern void posix_flockfile(FILE *file);
    109108extern int posix_ftrylockfile(FILE *file);
    110109extern void posix_funlockfile(FILE *file);
    111 
    112110extern int posix_getc_unlocked(FILE *stream);
    113111extern int posix_getchar_unlocked(void);
    … …  
    121119#undef L_tmpnam
    122120#define L_tmpnam PATH_MAX
    123 
    124121extern char *posix_tmpnam(char *s);
    125122
    126123#ifndef LIBPOSIX_INTERNAL
    127         #define clearerr posix_clearerr
    128124        #define ctermid posix_ctermid
    129125
     126        #define clearerr posix_clearerr
     127
     128        #define fputs posix_fputs
    130129        #define ungetc posix_ungetc
    131 
    132130        #define getdelim posix_getdelim
    133131        #define getline posix_getline
    134132
    135133        #define freopen posix_freopen
    136 
    137134        #define fmemopen posix_fmemopen
    138135        #define open_memstream posix_open_memstream
    … …  
    147144        #define ftell posix_ftell
    148145        #define ftello posix_ftello
     146
     147        #define fflush posix_fflush
    149148
    150149        #define dprintf posix_dprintf
Note: See TracChangeset for help on using the changeset viewer.