OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #32304 - pravic:fix-variadic-ffi-test, r=alexcrichton 

test: Fix missing call of function pointer

Also an unused variable warning was here.
This commit is contained in:
bors 2016-03-19 01:53:11 -07:00
parent b9a93fad92 4cbfe1582a
commit b854149a48
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/run-pass/variadic-ffi.rs
View File

@ -45,15 +45,15 @@ pub fn main() {
let x: unsafe extern fn(*mut c_char, *const c_char, ...) -> c_int = sprintf;
// A function that takes a function pointer
unsafe fn call(p: unsafe extern fn(*mut c_char, *const c_char, ...) -> c_int) {
unsafe fn call(fp: unsafe extern fn(*mut c_char, *const c_char, ...) -> c_int) {
// Call with just the named parameter
let c = CString::new(&b"Hello World\n"[..]).unwrap();
check("Hello World\n", |s| sprintf(s, c.as_ptr()));
check("Hello World\n", |s| fp(s, c.as_ptr()));
// Call with variable number of arguments
let c = CString::new(&b"%d %f %c %s\n"[..]).unwrap();
check("42 42.500000 a %d %f %c %s\n\n", |s| {
sprintf(s, c.as_ptr(), 42, 42.5f64, 'a' as c_int, c.as_ptr());
fp(s, c.as_ptr(), 42, 42.5f64, 'a' as c_int, c.as_ptr());
});
}