From c96be811fa7da8ddcea18cc7abcae94e0f5ff966 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Tue, 14 May 2019 17:34:56 +0200
Subject: bpo-36900: Replace global conf vars with config (GH-13299)

Replace global configuration variables with core_config read from the
current interpreter.

Cleanup dynload_hpux.c.
---
 Python/dynload_hpux.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'Python/dynload_hpux.c')

diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c
index 4967afc39c..f275e53458 100644
--- a/Python/dynload_hpux.c
+++ b/Python/dynload_hpux.c
@@ -19,48 +19,47 @@ dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix,
                                        const char *shortname,
                                        const char *pathname, FILE *fp)
 {
-    dl_funcptr p;
-    shl_t lib;
-    int flags;
-    char funcname[258];
-
-    flags = BIND_FIRST | BIND_DEFERRED;
-    if (Py_VerboseFlag) {
+    int flags = BIND_FIRST | BIND_DEFERRED;
+    int verbose = _PyInterpreterState_GET_UNSAFE()->core_config.verbose;
+    if (verbose) {
         flags = BIND_FIRST | BIND_IMMEDIATE |
             BIND_NONFATAL | BIND_VERBOSE;
         printf("shl_load %s\n",pathname);
     }
-    lib = shl_load(pathname, flags, 0);
+
+    shl_t lib = shl_load(pathname, flags, 0);
     /* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */
     if (lib == NULL) {
-        char buf[256];
-        PyObject *pathname_ob = NULL;
-        PyObject *buf_ob = NULL;
-        PyObject *shortname_ob = NULL;
-
-        if (Py_VerboseFlag)
+        if (verbose) {
             perror(pathname);
+        }
+        char buf[256];
         PyOS_snprintf(buf, sizeof(buf), "Failed to load %.200s",
                       pathname);
-        buf_ob = PyUnicode_FromString(buf);
-        shortname_ob = PyUnicode_FromString(shortname);
-        pathname_ob = PyUnicode_FromString(pathname);
+        PyObject *buf_ob = PyUnicode_FromString(buf);
+        PyObject *shortname_ob = PyUnicode_FromString(shortname);
+        PyObject *pathname_ob = PyUnicode_FromString(pathname);
         PyErr_SetImportError(buf_ob, shortname_ob, pathname_ob);
         Py_DECREF(buf_ob);
         Py_DECREF(shortname_ob);
         Py_DECREF(pathname_ob);
         return NULL;
     }
+
+    char funcname[258];
     PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN,
                   prefix, shortname);
-    if (Py_VerboseFlag)
+    if (verbose) {
         printf("shl_findsym %s\n", funcname);
+    }
+
+    dl_funcptr p;
     if (shl_findsym(&lib, funcname, TYPE_UNDEFINED, (void *) &p) == -1) {
         shl_unload(lib);
         p = NULL;
     }
-    if (p == NULL && Py_VerboseFlag)
+    if (p == NULL && verbose) {
         perror(funcname);
-
+    }
     return p;
 }
-- 
cgit v1.2.1