Merge branch 'stdio-cleanup' into 'master'
stdio header cleanup See merge request redox-os/relibc!945
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
use crate::platform::types::*;
|
||||
use crate::platform::types::{c_int, c_uint, int32_t, off_t};
|
||||
|
||||
pub const EOF: c_int = -1;
|
||||
pub const BUFSIZ: c_int = 1024;
|
||||
|
||||
@@ -5,7 +5,7 @@ use crate::{
|
||||
fs::File,
|
||||
header::pthread,
|
||||
io::LineWriter,
|
||||
platform::types::*,
|
||||
platform::types::c_int,
|
||||
sync::{Mutex, Once},
|
||||
};
|
||||
use alloc::{boxed::Box, vec::Vec};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use crate::{
|
||||
header::stdio::{F_NORD, F_NOWR, FILE},
|
||||
platform::types::*,
|
||||
platform::types::{c_int, size_t},
|
||||
};
|
||||
|
||||
#[unsafe(no_mangle)]
|
||||
|
||||
@@ -12,7 +12,7 @@ use crate::{
|
||||
},
|
||||
io::BufRead,
|
||||
platform,
|
||||
platform::types::*,
|
||||
platform::types::{c_char, c_int, c_void, size_t, ssize_t},
|
||||
};
|
||||
|
||||
use crate::{
|
||||
|
||||
@@ -1,17 +1,26 @@
|
||||
use alloc::boxed::Box;
|
||||
|
||||
use super::{Buffer, FILE, constants::*};
|
||||
use super::{
|
||||
Buffer, FILE,
|
||||
constants::{BUFSIZ, F_APP, F_NORD, F_NOWR},
|
||||
};
|
||||
use crate::{
|
||||
c_str::CStr,
|
||||
error::Errno,
|
||||
fs::File,
|
||||
header::{
|
||||
errno::{self, EINVAL},
|
||||
fcntl::*,
|
||||
fcntl::{
|
||||
F_GETFL, F_SETFD, F_SETFL, FD_CLOEXEC, O_APPEND, O_CLOEXEC, O_CREAT, O_EXCL, O_RDONLY,
|
||||
O_RDWR, O_TRUNC, O_WRONLY, fcntl,
|
||||
},
|
||||
pthread,
|
||||
},
|
||||
io::BufWriter,
|
||||
platform::{self, types::*},
|
||||
platform::{
|
||||
self,
|
||||
types::{c_int, c_ulonglong},
|
||||
},
|
||||
sync::Mutex,
|
||||
};
|
||||
use alloc::vec::Vec;
|
||||
|
||||
@@ -12,7 +12,14 @@ use core::{cmp, ffi::VaList, fmt, num::FpCategory, ops::Range, slice};
|
||||
|
||||
use crate::{
|
||||
header::errno::{self, EILSEQ},
|
||||
platform::{self, types::*},
|
||||
platform::{
|
||||
self,
|
||||
types::{
|
||||
c_char, c_double, c_int, c_long, c_longlong, c_short, c_uchar, c_uint, c_ulong,
|
||||
c_ulonglong, c_ushort, c_void, intmax_t, ptrdiff_t, size_t, ssize_t, uintmax_t,
|
||||
wchar_t, wint_t,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
// ____ _ _ _ _
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
use super::lookaheadreader::LookAheadReader;
|
||||
use crate::platform::types::*;
|
||||
use crate::platform::types::{
|
||||
c_char, c_double, c_float, c_int, c_long, c_longlong, c_short, c_uchar, c_uint, c_ulong,
|
||||
c_ulonglong, c_ushort, c_void, intmax_t, ptrdiff_t, size_t, ssize_t, uintmax_t,
|
||||
};
|
||||
use alloc::{string::String, vec::Vec};
|
||||
use core::ffi::VaList as va_list;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user