Skip to content

Commit 514b5bd

Browse files
brsonbrson
committed
---
yaml --- r: 4635 b: refs/heads/master c: 3d1634d h: refs/heads/master i: 4633: 367bdc7 4631: 234f7fa v: v3
1 parent 4d7d370 commit 514b5bd

File tree

9 files changed

+21
-47
lines changed

9 files changed

+21
-47
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: f9db0390f913f3839d440b041d26c498e329fb8b
2+
refs/heads/master: 3d1634db15deb6f871f785b4ab38083a33bd78ba

‎trunk/src/lib/aio.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import str::sbuf;
2-
import vec::vbuf;
32

43
native "rust" mod rustrt {
54
type socket;

‎trunk/src/lib/io.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ obj FILE_buf_reader(f: os::libc::FILE, res: option::t[@FILE_res]) {
6363
fn read(len: uint) -> [u8] {
6464
let buf = ~[];
6565
ivec::reserve[u8](buf, len);
66-
let read = os::libc_ivec::fread(ivec::to_ptr[u8](buf), 1u, len, f);
66+
let read = os::libc::fread(ivec::to_ptr[u8](buf), 1u, len, f);
6767
ivec::unsafe::set_len[u8](buf, read);
6868
ret buf;
6969
}
@@ -247,7 +247,7 @@ obj FILE_writer(f: os::libc::FILE, res: option::t[@FILE_res]) {
247247
fn write(v: &[u8]) {
248248
let len = ivec::len[u8](v);
249249
let vbuf = ivec::to_ptr[u8](v);
250-
let nout = os::libc_ivec::fwrite(vbuf, len, 1u, f);
250+
let nout = os::libc::fwrite(vbuf, len, 1u, f);
251251
if nout < 1u { log_err "error dumping buffer"; }
252252
}
253253
fn seek(offset: int, whence: seek_style) {
@@ -269,7 +269,7 @@ obj fd_buf_writer(fd: int, res: option::t[@fd_res]) {
269269
let vbuf;
270270
while count < len {
271271
vbuf = ptr::offset(ivec::to_ptr[u8](v), count);
272-
let nout = os::libc_ivec::write(fd, vbuf, len);
272+
let nout = os::libc::write(fd, vbuf, len);
273273
if nout < 0 {
274274
log_err "error dumping buffer";
275275
log_err sys::rustrt::last_os_error();

‎trunk/src/lib/linux_os.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11

22
import str::sbuf;
3-
import vec::vbuf;
43

54

65
// FIXME Somehow merge stuff duplicated here and macosx_os.rs. Made difficult
76
// by https://github.com/graydon/rust/issues#issue/268
87
native "cdecl" mod libc = "" {
8+
fn read(fd: int, buf: *u8, count: uint) -> int;
9+
fn write(fd: int, buf: *u8, count: uint) -> int;
10+
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
11+
fn fwrite(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
912
fn open(s: sbuf, flags: int, mode: uint) -> int;
10-
fn read(fd: int, buf: vbuf, count: uint) -> int;
11-
fn write(fd: int, buf: vbuf, count: uint) -> int;
1213
fn close(fd: int) -> int;
1314
type FILE;
1415
fn fopen(path: sbuf, mode: sbuf) -> FILE;
@@ -17,8 +18,6 @@ native "cdecl" mod libc = "" {
1718
fn fgetc(f: FILE) -> int;
1819
fn ungetc(c: int, f: FILE);
1920
fn feof(f: FILE) -> int;
20-
fn fread(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
21-
fn fwrite(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
2221
fn fseek(f: FILE, offset: int, whence: int) -> int;
2322
fn ftell(f: FILE) -> int;
2423
type dir;
@@ -33,13 +32,6 @@ native "cdecl" mod libc = "" {
3332
fn waitpid(pid: int, status: &mutable int, options: int) -> int;
3433
}
3534

36-
native "cdecl" mod libc_ivec = "" {
37-
fn read(fd: int, buf: *u8, count: uint) -> int;
38-
fn write(fd: int, buf: *u8, count: uint) -> int;
39-
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
40-
fn fwrite(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
41-
}
42-
4335
mod libc_constants {
4436
fn O_RDONLY() -> int { ret 0; }
4537
fn O_WRONLY() -> int { ret 1; }

‎trunk/src/lib/macos_os.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11

22
import str::sbuf;
3-
import vec::vbuf;
43

54
native "cdecl" mod libc = "" {
5+
fn read(fd: int, buf: *u8, count: uint) -> int;
6+
fn write(fd: int, buf: *u8, count: uint) -> int;
7+
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
8+
fn fwrite(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
69
fn open(s: sbuf, flags: int, mode: uint) -> int;
7-
fn read(fd: int, buf: vbuf, count: uint) -> int;
8-
fn write(fd: int, buf: vbuf, count: uint) -> int;
910
fn close(fd: int) -> int;
1011
type FILE;
1112
fn fopen(path: sbuf, mode: sbuf) -> FILE;
@@ -14,8 +15,6 @@ native "cdecl" mod libc = "" {
1415
fn fgetc(f: FILE) -> int;
1516
fn ungetc(c: int, f: FILE);
1617
fn feof(f: FILE) -> int;
17-
fn fread(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
18-
fn fwrite(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
1918
fn fseek(f: FILE, offset: int, whence: int) -> int;
2019
fn ftell(f: FILE) -> int;
2120
type dir;
@@ -30,13 +29,6 @@ native "cdecl" mod libc = "" {
3029
fn waitpid(pid: int, status: &mutable int, options: int) -> int;
3130
}
3231

33-
native "cdecl" mod libc_ivec = "" {
34-
fn read(fd: int, buf: *u8, count: uint) -> int;
35-
fn write(fd: int, buf: *u8, count: uint) -> int;
36-
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
37-
fn fwrite(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
38-
}
39-
4032
mod libc_constants {
4133
fn O_RDONLY() -> int { ret 0; }
4234
fn O_WRONLY() -> int { ret 1; }

‎trunk/src/lib/run_program.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
import str::sbuf;
3-
import vec::vbuf;
43

54
export program;
65
export run_program;

‎trunk/src/lib/win32_os.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11

22
import str::sbuf;
3-
import vec::vbuf;
43

54
native "cdecl" mod libc = "" {
5+
fn read(fd: int, buf: *u8, count: uint) -> int;
6+
fn write(fd: int, buf: *u8, count: uint) -> int;
7+
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
8+
fn fwrite(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
69
fn open(s: sbuf, flags: int, mode: uint) -> int = "_open";
7-
fn read(fd: int, buf: vbuf, count: uint) -> int = "_read";
8-
fn write(fd: int, buf: vbuf, count: uint) -> int = "_write";
910
fn close(fd: int) -> int = "_close";
1011
type FILE;
1112
fn fopen(path: sbuf, mode: sbuf) -> FILE;
@@ -14,20 +15,11 @@ native "cdecl" mod libc = "" {
1415
fn fgetc(f: FILE) -> int;
1516
fn ungetc(c: int, f: FILE);
1617
fn feof(f: FILE) -> int;
17-
fn fread(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
18-
fn fwrite(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
1918
fn fseek(f: FILE, offset: int, whence: int) -> int;
2019
fn ftell(f: FILE) -> int;
2120
fn _pipe(fds: *mutable int, size: uint, mode: int) -> int;
2221
}
2322

24-
native "cdecl" mod libc_ivec = "" {
25-
fn read(fd: int, buf: *u8, count: uint) -> int;
26-
fn write(fd: int, buf: *u8, count: uint) -> int;
27-
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
28-
fn fwrite(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
29-
}
30-
3123
mod libc_constants {
3224
fn O_RDONLY() -> int { ret 0; }
3325
fn O_WRONLY() -> int { ret 1; }

‎trunk/src/test/run-pass/item-attributes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@ mod test_native_items {
186186
#[attr];
187187

188188
#[attr]
189-
type vbuf;
189+
type sbuf;
190190

191191
#[attr]
192-
fn vec_len[T](v: vec[T]) -> uint;
192+
fn str_buf(s: str) -> sbuf;
193193
}
194194
}
195195

‎trunk/src/test/run-pass/native2.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11

22

33
native "rust" mod rustrt {
4-
type vbuf;
5-
fn vec_buf[T](v: vec[T], offset: uint) -> vbuf;
4+
type sbuf;
5+
fn str_buf(s: str) -> sbuf;
66
}
77

88
native "rust" mod bar = "" { }
99

1010
native "cdecl" mod zed = "" { }
1111

1212
native "cdecl" mod libc = "" {
13-
fn write(fd: int, buf: rustrt::vbuf, count: uint) -> int;
13+
fn write(fd: int, buf: *u8, count: uint) -> int;
1414
}
1515

1616
native "cdecl" mod baz = "" { }

0 commit comments

Comments
 (0)