Changeset 76ca3f7 in mainline for uspace/lib/c/include


Ignore:
Timestamp:
2010-03-23T20:49:54Z (16 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e417b96
Parents:
b48ebd19 (diff), 63f8966 (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 mailnline changes, revision 329

Location:
uspace/lib/c/include
Files:
82 moved

Legend:

Unmodified
Added
Removed

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

    rb48ebd19 r76ca3f7  
    3838#include <sys/types.h>
    3939#include <stdarg.h>
    40 #include <string.h>
     40#include <str.h>
    4141#include <adt/list.h>
    4242
    … …  
    7575};
    7676
     77enum _buffer_state {
     78        /** Buffer is empty */
     79        _bs_empty,
     80
     81        /** Buffer contains data to be written */
     82        _bs_write,
     83
     84        /** Buffer contains prefetched data for reading */
     85        _bs_read
     86};
     87
    7788typedef struct {
    7889        /** Linked list pointer. */
    … …  
    94105        int phone;
    95106
     107        /**
     108         * Non-zero if the stream needs sync on fflush(). XXX change
     109         * console semantics so that sync is not needed.
     110         */
     111        int need_sync;
     112
    96113        /** Buffering type */
    97114        enum _buffer_type btype;
     115
    98116        /** Buffer */
    99117        uint8_t *buf;
     118
    100119        /** Buffer size */
    101120        size_t buf_size;
     121
     122        /** Buffer state */
     123        enum _buffer_state buf_state;
     124
    102125        /** Buffer I/O pointer */
    103126        uint8_t *buf_head;
     127
     128        /** Points to end of occupied space when in read mode. */
     129        uint8_t *buf_tail;
    104130} FILE;
    105131

  • uspace/lib/c/include/str.h

    rb48ebd19 r76ca3f7  
    3333 */
    3434
    35 #ifndef LIBC_STRING_H_
    36 #define LIBC_STRING_H_
     35#ifndef LIBC_STR_H_
     36#define LIBC_STR_H_
    3737
    3838#include <mem.h>

  • uspace/lib/c/include/sysinfo.h

    rb48ebd19 r76ca3f7  
    3838#include <libc.h>
    3939#include <sysinfo.h>
    40 #include <string.h>
     40#include <str.h>
    4141
    4242sysarg_t sysinfo_value(const char *name);
Note: See TracChangeset for help on using the changeset viewer.