#374 fixed cros-platform issues related to FFI

Author: chrsoo

fitsio/src/hdu.rs

@@ -1083,7 +1083,7 @@ pub struct CardIter {
 
 impl CardIter {
     fn new(file: &mut FitsFile, hdu: &FitsHdu) -> Result<CardIter> {
-        file.make_current(&hdu)?;
+        file.make_current(hdu)?;
 
         let mut iter = CardIter {
             fptr:       unsafe { file.as_raw() },
@@ -1113,17 +1113,17 @@ impl CardIter {
     }
     fn next_header(&mut self) -> Result<Card> {
         self.status = 0; // reset the status before calling
-        let mut card = Card::new();
+        let mut card = Card::default();
         unsafe {
             ffgkyn(
                 self.fptr,
                 self.current,
                 // self.name.as_mut_ptr(),
                 // self.value.as_mut_ptr(),
                 // self.comment.as_mut_ptr(),
-                card.name.as_mut_ptr(),
-                card.value.as_mut_ptr(),
-                card.comment.as_mut_ptr(),
+                card.name.as_mut_ptr() as *mut c_char,
+                card.value.as_mut_ptr() as *mut c_char,
+                card.comment.as_mut_ptr() as *mut c_char,
                 ptr::addr_of_mut!(self.status)
             )
         };
@@ -1143,7 +1143,7 @@ impl Iterator for CardIter {
         match self.next_header() {
             Ok(card) => Some(card),
             Err(e) => {
-                let mut card = Card::new();
+                let mut card = Card::default();
                 card.set_comment(format!("{e}"));
                 Some(card)
             },

fitsio/src/headers/card.rs

@@ -3,7 +3,7 @@
 use fitsio_sys::{FLEN_COMMENT, FLEN_KEYWORD, FLEN_VALUE};
 
 use crate::errors::Result;
-use std::ffi::CStr;
+use std::ffi::{c_char, CStr};
 
 /// Wraps a single header card
 #[derive(Debug)]
@@ -14,28 +14,19 @@ pub struct Card {
 }
 
 impl Card {
-    /// Create a new empty card.
-    pub fn new() -> Card {
-        Card {
-            name:       [0i8;FLEN_KEYWORD as usize],
-            value:      [0i8;FLEN_VALUE as usize],
-            comment:    [0i8;FLEN_COMMENT as usize],
-        }
-    }
-
     /// Header keyword.
     pub fn name(&self) -> Result<&str> {
-        Ok(unsafe { CStr::from_ptr(self.name.as_ptr()) }.to_str()?)
+        Ok(unsafe { CStr::from_ptr(self.name.as_ptr() as *mut c_char) }.to_str()?)
     }
 
     /// Header comment.
     pub fn comment(&self) -> Result<&str> {
-        Ok(unsafe { CStr::from_ptr(self.comment.as_ptr()) }.to_str()?)
+        Ok(unsafe { CStr::from_ptr(self.comment.as_ptr() as *mut c_char) }.to_str()?)
     }
 
     /// Header value as a &str.
     pub fn str_value(&self) -> Result<&str> {
-        Ok(unsafe { CStr::from_ptr(self.value.as_ptr()) }.to_str()?)
+        Ok(unsafe { CStr::from_ptr(self.value.as_ptr() as *mut c_char) }.to_str()?)
     }
 
     pub(crate) fn set_comment(&mut self, comment: String) {
@@ -50,3 +41,13 @@ impl Card {
         }
     }
 }
+
+impl Default for Card {
+    fn default() -> Self {
+        Card {
+            name:       [0i8;FLEN_KEYWORD as usize],
+            value:      [0i8;FLEN_VALUE as usize],
+            comment:    [0i8;FLEN_COMMENT as usize],
+        }
+    }
+}