From: Christian McDonald <cmcdonald@netgate.com>
Date: Fri, 24 Feb 2023 14:31:19 +0000 (-0500)
Subject: #827 review response
X-Git-Tag: release-1.18.0rc1~24^2~20^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F827%2Fhead;p=thirdparty%2Funbound.git

#827 review response
---

diff --git a/pythonmod/pythonmod.c b/pythonmod/pythonmod.c
index d4042995e..6d8539bd5 100644
--- a/pythonmod/pythonmod.c
+++ b/pythonmod/pythonmod.c
@@ -3,7 +3,6 @@
  *
  * Copyright (c) 2009, Zdenek Vasicek (vasicek AT fit.vutbr.cz)
  *                     Marek Vavrusa  (xvavru00 AT stud.fit.vutbr.cz)
- * Copyright (c) 2023, Rubicon Communications, LLC (Netgate)
  *
  * This software is open source.
  *
@@ -254,10 +253,11 @@ cleanup:
 }
 
 /* we only want to unwind Python once at exit */
-void pythonmod_atexit(void)
+static void
+pythonmod_atexit(void)
 {
-   assert(py_mod_count == 0);
-   assert(maimthr != NULL);
+   log_assert(py_mod_count == 0);
+   log_assert(mainthr != NULL);
  
    PyEval_RestoreThread(mainthr);
    Py_Finalize();
@@ -322,7 +322,7 @@ int pythonmod_init(struct module_env* env, int id)
       SWIG_init();
       mainthr = PyEval_SaveThread();
 
-      /* XXX: register callback to unwind Python at exit */
+      /* register callback to unwind Python at exit */
       atexit(pythonmod_atexit);
    }
 
@@ -539,6 +539,7 @@ python_init_fail:
 
 void pythonmod_deinit(struct module_env* env, int id)
 {
+   int cbtype;
    struct pythonmod_env* pe = env->modinfo[id];
    if(pe == NULL)
       return;
@@ -567,7 +568,7 @@ void pythonmod_deinit(struct module_env* env, int id)
    free(pe);
 
    /* iterate over all possible callback types and clean up each in turn */
-   for (int cbtype = 0; cbtype < inplace_cb_types_total; cbtype++)
+   for (cbtype = 0; cbtype < inplace_cb_types_total; cbtype++)
       inplace_cb_delete(env, cbtype, id);
 
    /* Module is deallocated in Python */