em4305: Convert to PD API version 3

[libsigrokdecode.git] / srd.c

diff --git a/srd.c b/srd.c
index 7b18c9a4dfa2a6ded230005f452a611f0094c4bb..344919a07b75227c28d53fac0c9de3d0413fbc35 100644 (file)
--- a/srd.c
+++ b/srd.c
@@ -157,7 +157,7 @@ SRD_API int srd_init(const char *path)
        PyImport_AppendInittab("sigrokdecode", PyInit_sigrokdecode);
 
        /* Initialize the Python interpreter. */
-       Py_Initialize();
+       Py_InitializeEx(0);
 
        /* Locations relative to the XDG system data directories. */
        sys_datadirs = g_get_system_data_dirs();
@@ -219,12 +219,9 @@ SRD_API int srd_init(const char *path)
  */
 SRD_API int srd_exit(void)
 {
-       GSList *l;
-
        srd_dbg("Exiting libsigrokdecode.");
 
-       for (l = sessions; l; l = l->next)
-               srd_session_destroy((struct srd_session *)l->data);
+       g_slist_foreach(sessions, (GFunc)srd_session_destroy, NULL);
 
        srd_decoder_unload_all();
        g_slist_free_full(searchpaths, g_free);