rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove all usages of std::vec::vbuf

Browse Source
This commit is contained in:
Brian Anderson
2011-08-12 10:40:25 -07:00
parent f9db0390f9
commit 3d1634db15
8 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/linux_os.rs
View File

@@ -1,14 +1,15 @@
import str::sbuf;
import vec::vbuf;
// FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult
// by https://github.com/graydon/rust/issues#issue/268
native "cdecl" mod libc = "" {
fn read(fd: int, buf: *u8, count: uint) -> int;
fn write(fd: int, buf: *u8, count: uint) -> int;
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
fn fwrite(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
fn open(s: sbuf, flags: int, mode: uint) -> int;
fn read(fd: int, buf: vbuf, count: uint) -> int;
fn write(fd: int, buf: vbuf, count: uint) -> int;
fn close(fd: int) -> int;
type FILE;
fn fopen(path: sbuf, mode: sbuf) -> FILE;
@@ -17,8 +18,6 @@ native "cdecl" mod libc = "" {
fn fgetc(f: FILE) -> int;
fn ungetc(c: int, f: FILE);
fn feof(f: FILE) -> int;
fn fread(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
fn fwrite(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
fn fseek(f: FILE, offset: int, whence: int) -> int;
fn ftell(f: FILE) -> int;
type dir;
@@ -33,13 +32,6 @@ native "cdecl" mod libc = "" {
fn waitpid(pid: int, status: &mutable int, options: int) -> int;
}
native "cdecl" mod libc_ivec = "" {
fn read(fd: int, buf: *u8, count: uint) -> int;
fn write(fd: int, buf: *u8, count: uint) -> int;
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
fn fwrite(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
}
mod libc_constants {
fn O_RDONLY() -> int { ret 0; }
fn O_WRONLY() -> int { ret 1; }