Refactor runtime.cs

vmuriart · vmuriart · commit 895516e52bdb · 2017-03-03T21:04:55.000-07:00
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -565,18 +565,11 @@ internal static unsafe void XDecref(IntPtr op)
         internal static unsafe long Refcount(IntPtr op)
         {
             var p = (void*)op;
-            if ((void*)0 != p)
+            if ((void*)0 == p)
             {
-                if (Is32Bit)
-                {
-                    return (*(int*)p);
-                }
-                else
-                {
-                    return (*(long*)p);
-                }
+                return 0;
             }
-            return 0;
+            return Is32Bit ? (*(int*)p) : (*(long*)p);
         }
 
 #if PYTHON_WITH_PYDEBUG
@@ -676,25 +669,6 @@ public static extern int Py_Main(
         [DllImport(PythonDll)]
         internal static extern IntPtr PyEval_GetLocals();
 
-#if PYTHON3
-        [DllImport(PythonDll)]
-        internal static extern IntPtr Py_GetProgramName();
-
-        [DllImport(PythonDll)]
-        internal static extern void Py_SetProgramName(IntPtr name);
-
-        [DllImport(PythonDll)]
-        internal static extern IntPtr Py_GetPythonHome();
-
-        [DllImport(PythonDll)]
-        internal static extern void Py_SetPythonHome(IntPtr home);
-
-        [DllImport(PythonDll)]
-        internal static extern IntPtr Py_GetPath();
-
-        [DllImport(PythonDll)]
-        internal static extern void Py_SetPath(IntPtr home);
-#elif PYTHON2
         [DllImport(PythonDll)]
         internal static extern IntPtr Py_GetProgramName();
 
@@ -712,7 +686,6 @@ public static extern int Py_Main(
 
         [DllImport(PythonDll)]
         internal static extern void Py_SetPath(IntPtr home);
-#endif
 
         [DllImport(PythonDll)]
         internal static extern IntPtr Py_GetVersion();
@@ -781,20 +754,15 @@ internal static unsafe IntPtr PyObject_TYPE(IntPtr op)
 #else
             var n = 1;
 #endif
-            if (Is32Bit)
-            {
-                return new IntPtr((void*)(*((uint*)p + n)));
-            }
-            else
-            {
-                return new IntPtr((void*)(*((ulong*)p + n)));
-            }
+            return Is32Bit
+                ? new IntPtr((void*)(*((uint*)p + n)))
+                : new IntPtr((void*)(*((ulong*)p + n)));
         }
 
         /// <summary>
         /// Managed version of the standard Python C API PyObject_Type call.
-        /// This version avoids a managed  &lt;-&gt; unmanaged transition. This one
-        /// does incref the returned type object.
+        /// This version avoids a managed  &lt;-&gt; unmanaged transition.
+        /// This one does incref the returned type object.
         /// </summary>
         internal static IntPtr PyObject_Type(IntPtr op)
         {
