Skip to content

#7752: use fcnptr for glob errfunc. #9497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2013
Merged

#7752: use fcnptr for glob errfunc. #9497

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e80981
#7752: use fcnptr for glob errfunc.
pnkfelix Sep 25, 2013
48b4b1f
errfunc ptr is nullable, so use Option as part of interface to glob (…
pnkfelix Sep 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libstd/libc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3224,14 +3224,14 @@ pub mod funcs {
#[nolink]
#[abi = "cdecl"]
pub mod glob {
use libc::types::common::c95::{c_void};
use libc::types::os::arch::c95::{c_char, c_int};
use libc::types::os::common::posix01::{glob_t};
use option::Option;

extern {
pub fn glob(pattern: *c_char,
flags: c_int,
errfunc: *c_void, // XXX callback
errfunc: Option<extern "C" fn(epath: *c_char, errno: int) -> int>,
pglob: *mut glob_t);
pub fn globfree(pglob: *mut glob_t);
}
Expand Down