2
0
Xavier L'Heureux 5 жил өмнө
parent
commit
5799555566

+ 1 - 1
src/header/signal/mod.rs

@@ -33,9 +33,9 @@ pub const SIG_SETMASK: c_int = 2;
 #[derive(Clone, Debug)]
 pub struct sigaction {
     pub sa_handler: Option<extern "C" fn(c_int)>,
-    pub sa_mask: sigset_t,
     pub sa_flags: c_ulong,
     pub sa_restorer: Option<unsafe extern "C" fn()>,
+    pub sa_mask: sigset_t,
 }
 
 #[repr(C)]

+ 0 - 7
src/platform/redox/signal.rs

@@ -109,9 +109,6 @@ impl PalSignal for Sys {
         let new_opt = act.map(|act| {
             let m = act.sa_mask;
             let sa_handler = unsafe { mem::transmute(act.sa_handler) };
-            println!("signal called with {:x}", unsafe {
-                mem::transmute::<_, usize>(sa_handler)
-            });
             syscall::SigAction {
                 sa_handler,
                 sa_mask: [m as u64, 0],
@@ -120,16 +117,12 @@ impl PalSignal for Sys {
             }
         });
         let mut old_opt = oact.as_ref().map(|_| syscall::SigAction::default());
-        println!("before : {:?}", new_opt);
-        println!("before old : {:?}", old_opt);
         let ret = e(syscall::sigaction(
             sig as usize,
             new_opt.as_ref(),
             old_opt.as_mut(),
         )) as c_int;
-        println!("after : {:?}", old_opt);
         if let (Some(old), Some(oact)) = (old_opt, oact) {
-            println!("after : {:?}", oact);
             oact.sa_handler = unsafe { mem::transmute(old.sa_handler) };
             let m = old.sa_mask;
             oact.sa_mask = m[0] as c_ulong;