@@ -1,20 +1,18 @@
-// Author: Christian Heimes <christian(at)cheimes(dot)de>
-
 #include "pynetclr.h"
 
 /* List of functions defined in the module */
 static PyMethodDef clr_methods[] = {
-    {NULL, NULL, 0, NULL}        /* Sentinel */
+    {NULL, NULL, 0, NULL} /* Sentinel */
 };
 
 PyDoc_STRVAR(clr_module_doc,
-"clr facade module to initialize the CLR. It's later "
-"replaced by the real clr module. This module has a facade "
-"attribute to make it distinguishable from the real clr module."
+             "clr facade module to initialize the CLR. It's later "
+             "replaced by the real clr module. This module has a facade "
+             "attribute to make it distinguishable from the real clr module."
 );
 
 static PyNet_Args *pn_args;
-char** environ = NULL;
+char **environ = NULL;
 
 #if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef clrdef = {
@@ -30,7 +28,8 @@ static struct PyModuleDef clrdef = {
 };
 #endif
 
-static PyObject *_initclr() {
+static PyObject *_initclr()
+{
     PyObject *m;
 
     /* Create the module and add the functions */
@@ -45,7 +44,8 @@ static PyObject *_initclr() {
     Py_INCREF(Py_True);
 
     pn_args = PyNet_Init(1);
-    if (pn_args->error) {
+    if (pn_args->error)
+    {
         return NULL;
     }
 
@@ -57,12 +57,14 @@ static PyObject *_initclr() {
 
 #if PY_MAJOR_VERSION >= 3
 PyMODINIT_FUNC
-PyInit_clr(void) {
+PyInit_clr(void)
+{
     return _initclr();
 }
 #else
 PyMODINIT_FUNC
-initclr(void) {
+initclr(void)
+{
     _initclr();
 }
 #endif
@@ -1,5 +1,3 @@
-// Author: Christian Heimes <christian(at)cheimes(dot)de>
-
 #ifndef PYNET_CLR_H
 #define PYNET_CLR_H
 
@@ -15,20 +13,21 @@
 #define MONO_DOMAIN "Python.Runtime"
 #define PR_ASSEMBLY "Python.Runtime.dll"
 
-typedef struct {
+typedef struct
+{
     MonoDomain *domain;
     MonoAssembly *pr_assm;
     MonoMethod *shutdown;
     char *pr_file;
     char *error;
     char *init_name;
     char *shutdown_name;
-    PyObject* module;
+    PyObject *module;
 } PyNet_Args;
 
-PyNet_Args* PyNet_Init(int);
-void PyNet_Finalize(PyNet_Args*);
+PyNet_Args *PyNet_Init(int);
+void PyNet_Finalize(PyNet_Args *);
 void main_thread_handler(gpointer user_data);
-char* PyNet_ExceptionToString(MonoObject *);
+char *PyNet_ExceptionToString(MonoObject *);
 
 #endif // PYNET_CLR_H
@@ -1,5 +1,3 @@
-// Author: Christian Heimes <christian(at)cheimes(dot)de>
-
 #include "pynetclr.h"
 #include "stdlib.h"
 
@@ -12,17 +10,21 @@
 
 
 // initialize Mono and PythonNet
-PyNet_Args* PyNet_Init(int ext) {
+PyNet_Args *PyNet_Init(int ext)
+{
     PyNet_Args *pn_args;
     pn_args = (PyNet_Args *)malloc(sizeof(PyNet_Args));
     pn_args->pr_file = PR_ASSEMBLY;
     pn_args->error = NULL;
     pn_args->shutdown = NULL;
     pn_args->module = NULL;
 
-    if (ext == 0) {
+    if (ext == 0)
+    {
         pn_args->init_name = "Python.Runtime:Initialize()";
-    } else {
+    }
+    else
+    {
         pn_args->init_name = "Python.Runtime:InitExt()";
     }
     pn_args->shutdown_name = "Python.Runtime:Shutdown()";
@@ -47,32 +49,38 @@ PyNet_Args* PyNet_Init(int ext) {
 
     main_thread_handler(pn_args);
 
-    if (pn_args->error != NULL) {
+    if (pn_args->error != NULL)
+    {
         PyErr_SetString(PyExc_ImportError, pn_args->error);
     }
     return pn_args;
 }
 
 // Shuts down PythonNet and cleans up Mono
-void PyNet_Finalize(PyNet_Args *pn_args) {
+void PyNet_Finalize(PyNet_Args *pn_args)
+{
     MonoObject *exception = NULL;
 
-    if (pn_args->shutdown) {
+    if (pn_args->shutdown)
+    {
         mono_runtime_invoke(pn_args->shutdown, NULL, NULL, &exception);
-        if (exception) {
+        if (exception)
+        {
             pn_args->error = PyNet_ExceptionToString(exception);
         }
         pn_args->shutdown = NULL;
     }
 
-    if (pn_args->domain) {
+    if (pn_args->domain)
+    {
         mono_jit_cleanup(pn_args->domain);
         pn_args->domain = NULL;
     }
     free(pn_args);
 }
 
-MonoMethod *getMethodFromClass(MonoClass *cls, char *name) {
+MonoMethod *getMethodFromClass(MonoClass *cls, char *name)
+{
     MonoMethodDesc *mdesc;
     MonoMethod *method;
 
@@ -83,8 +91,9 @@ MonoMethod *getMethodFromClass(MonoClass *cls, char *name) {
     return method;
 }
 
-void main_thread_handler (gpointer user_data) {
-    PyNet_Args *pn_args=(PyNet_Args *)user_data;
+void main_thread_handler(gpointer user_data)
+{
+    PyNet_Args *pn_args = (PyNet_Args *)user_data;
     MonoMethod *init;
     MonoImage *pr_image;
     MonoClass *pythonengine;
@@ -95,15 +104,19 @@ void main_thread_handler (gpointer user_data) {
     // Get the filename of the python shared object and set
     // LD_LIBRARY_PATH so Mono can find it.
     Dl_info dlinfo = {0};
-    if (0 != dladdr(&Py_Initialize, &dlinfo)) {
-        char* fname = alloca(strlen(dlinfo.dli_fname) + 1);
+    if (0 != dladdr(&Py_Initialize, &dlinfo))
+    {
+        char *fname = alloca(strlen(dlinfo.dli_fname) + 1);
         strcpy(fname, dlinfo.dli_fname);
-        char* py_libdir = dirname(fname);
-        char* ld_library_path = getenv("LD_LIBRARY_PATH");
-        if (NULL == ld_library_path) {
+        char *py_libdir = dirname(fname);
+        char *ld_library_path = getenv("LD_LIBRARY_PATH");
+        if (NULL == ld_library_path)
+        {
             setenv("LD_LIBRARY_PATH", py_libdir, 1);
-        } else {
-            char* new_ld_library_path = alloca(strlen(py_libdir)
+        }
+        else
+        {
+            char *new_ld_library_path = alloca(strlen(py_libdir)
                                                 + strlen(ld_library_path)
                                                 + 2);
             strcpy(new_ld_library_path, py_libdir);
@@ -114,25 +127,26 @@ void main_thread_handler (gpointer user_data) {
     }
 
     //get python path system variable
-    PyObject* syspath = PySys_GetObject("path");
-    char* runtime_full_path = (char*) malloc(1024);
-    const char* slash = "/";
+    PyObject *syspath = PySys_GetObject("path");
+    char *runtime_full_path = (char*) malloc(1024);
+    const char *slash = "/";
     int found = 0;
 
     int ii = 0;
-    for (ii = 0; ii < PyList_Size(syspath); ++ii) {
+    for (ii = 0; ii < PyList_Size(syspath); ++ii)
+    {
 #if PY_MAJOR_VERSION > 2
         Py_ssize_t wlen;
         wchar_t *wstr = PyUnicode_AsWideCharString(PyList_GetItem(syspath, ii), &wlen);
-        char* pydir = (char*)malloc(wlen + 1);
+        char *pydir = (char*)malloc(wlen + 1);
         size_t mblen = wcstombs(pydir, wstr, wlen + 1);
         if (mblen > wlen)
             pydir[wlen] = '\0';
         PyMem_Free(wstr);
 #else
-        const char* pydir = PyString_AsString(PyList_GetItem(syspath, ii));
+        const char *pydir = PyString_AsString(PyList_GetItem(syspath, ii));
 #endif
-        char* curdir = (char*) malloc(1024);
+        char *curdir = (char*) malloc(1024);
         strncpy(curdir, strlen(pydir) > 0 ? pydir : ".", 1024);
         strncat(curdir, slash, 1024);
 
@@ -141,12 +155,14 @@ void main_thread_handler (gpointer user_data) {
 #endif
 
         //look in this directory for the pn_args->pr_file
-        DIR* dirp = opendir(curdir);
-        if (dirp != NULL) {
-
+        DIR *dirp = opendir(curdir);
+        if (dirp != NULL)
+        {
             struct dirent *dp;
-            while ((dp = readdir(dirp)) != NULL) {
-                if (strcmp(dp->d_name, pn_args->pr_file) == 0) {
+            while ((dp = readdir(dirp)) != NULL)
+            {
+                if (strcmp(dp->d_name, pn_args->pr_file) == 0)
+                {
                     strcpy(runtime_full_path, curdir);
                     strcat(runtime_full_path, pn_args->pr_file);
                     found = 1;
@@ -157,21 +173,23 @@ void main_thread_handler (gpointer user_data) {
         }
         free(curdir);
 
-        if (found) {
+        if (found)
+        {
             pn_args->pr_file = runtime_full_path;
             break;
         }
     }
 
-    if (!found) {
+    if (!found)
+    {
         fprintf(stderr, "Could not find assembly %s. \n", pn_args->pr_file);
         return;
     }
 #endif
 
-
     pn_args->pr_assm = mono_domain_assembly_open(pn_args->domain, pn_args->pr_file);
-    if (!pn_args->pr_assm) {
+    if (!pn_args->pr_assm)
+    {
         pn_args->error = "Unable to load assembly";
         return;
     }
@@ -180,31 +198,36 @@ void main_thread_handler (gpointer user_data) {
 #endif
 
     pr_image = mono_assembly_get_image(pn_args->pr_assm);
-    if (!pr_image) {
+    if (!pr_image)
+    {
         pn_args->error = "Unable to get image";
         return;
     }
 
     pythonengine = mono_class_from_name(pr_image, "Python.Runtime", "PythonEngine");
-    if (!pythonengine) {
+    if (!pythonengine)
+    {
         pn_args->error = "Unable to load class PythonEngine from Python.Runtime";
         return;
     }
 
     init = getMethodFromClass(pythonengine, pn_args->init_name);
-    if (!init) {
+    if (!init)
+    {
         pn_args->error = "Unable to fetch Init method from PythonEngine";
         return;
     }
 
     pn_args->shutdown = getMethodFromClass(pythonengine, pn_args->shutdown_name);
-    if (!pn_args->shutdown) {
+    if (!pn_args->shutdown)
+    {
         pn_args->error = "Unable to fetch shutdown method from PythonEngine";
         return;
     }
 
     init_result = mono_runtime_invoke(init, NULL, NULL, &exception);
-    if (exception) {
+    if (exception)
+    {
         pn_args->error = PyNet_ExceptionToString(exception);
         return;
     }
@@ -213,17 +236,17 @@ void main_thread_handler (gpointer user_data) {
     if (NULL != init_result)
         pn_args->module = *(PyObject**)mono_object_unbox(init_result);
 #endif
-
 }
 
 // Get string from a Mono exception
-char* PyNet_ExceptionToString(MonoObject *e) {
-    MonoMethodDesc* mdesc = mono_method_desc_new(":ToString()", FALSE);
-    MonoMethod* mmethod = mono_method_desc_search_in_class(mdesc, mono_get_object_class());
+char *PyNet_ExceptionToString(MonoObject *e)
+{
+    MonoMethodDesc *mdesc = mono_method_desc_new(":ToString()", FALSE);
+    MonoMethod *mmethod = mono_method_desc_search_in_class(mdesc, mono_get_object_class());
     mono_method_desc_free(mdesc);
 
     mmethod = mono_object_get_virtual_method(e, mmethod);
-    MonoString* monoString = (MonoString*) mono_runtime_invoke(mmethod, e, NULL, NULL);
+    MonoString *monoString = (MonoString*) mono_runtime_invoke(mmethod, e, NULL, NULL);
     mono_runtime_invoke(mmethod, e, NULL, NULL);
     return mono_string_to_utf8(monoString);
 }