update comment and switch if logic to match other code

Author: brettmc

phper/src/functions.rs

@@ -647,22 +647,22 @@ impl ZFunc {
         }
     }
 
-    /// Get the type of the function (ZEND_USER_FUNCTION,
-    /// ZEND_INTERNAL_FUNCTION, etc).
-    pub fn get_type(&self) -> u8 {
-        unsafe { self.inner.type_ }
+    /// Get the type of the function (sys::ZEND_USER_FUNCTION,
+    /// sys::ZEND_INTERNAL_FUNCTION, or sys::ZEND_EVAL_CODE).
+    pub fn get_type(&self) -> u32 {
+        unsafe { self.inner.type_ as u32 }
     }
 
     /// For a user function or eval'd code, get the filename from op_array.
     pub fn get_filename(&self) -> Option<&ZStr> {
         unsafe {
             match u32::from(self.inner.type_) {
                 ZEND_USER_FUNCTION | ZEND_EVAL_CODE => {
-                    let filename_ptr = self.inner.op_array.filename;
-                    if !filename_ptr.is_null() {
-                        ZStr::try_from_ptr(filename_ptr)
-                    } else {
+                    let ptr = self.inner.op_array.filename;
+                    if ptr.is_null() {
                         None
+                    } else {
+                        ZStr::try_from_ptr(ptr)
                     }
                 }
                 _ => None,

phper/src/values.rs

@@ -138,10 +138,10 @@ impl ExecuteData {
             match u32::from((*self.inner.func).type_) {
                 ZEND_USER_FUNCTION | ZEND_EVAL_CODE => {
                     let opline = self.inner.opline;
-                    if !opline.is_null() {
-                        Some((*opline).lineno)
-                    } else {
+                    if opline.is_null() {
                         None
+                    } else {
+                        Some((*opline).lineno)
                     }
                 }
                 _ => None,