srd_decoder_load_all_zip_path(): Fix a compiler warning (-Wshadow).

[libsigrokdecode.git] / decoder.c

diff --git a/decoder.c b/decoder.c
index 21b756ba370620bf99db2aefb8a31f0f7f9c6b10..87df2ad8f839d552494b1c6b6969a5167e5684f4 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -340,7 +340,7 @@ static int get_options(struct srd_decoder *d)
                                if (!py_item)
                                        goto except_out;
 
-                               if (Py_TYPE(py_default) != Py_TYPE(py_item)) {
+                               if (py_default && (Py_TYPE(py_default) != Py_TYPE(py_item))) {
                                        srd_err("All values for option '%s' must be "
                                                "of the same type as the default.",
                                                o->id);
@@ -937,7 +937,7 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec)
        return SRD_OK;
 }
 
-static void srd_decoder_load_all_zip_path(char *path)
+static void srd_decoder_load_all_zip_path(char *zip_path)
 {
        PyObject *zipimport_mod, *zipimporter_class, *zipimporter;
        PyObject *prefix_obj, *files, *key, *value, *set, *modname;
@@ -958,7 +958,7 @@ static void srd_decoder_load_all_zip_path(char *path)
        if (zipimporter_class == NULL)
                goto err_out;
 
-       zipimporter = PyObject_CallFunction(zipimporter_class, "s", path);
+       zipimporter = PyObject_CallFunction(zipimporter_class, "s", zip_path);
        if (zipimporter == NULL)
                goto err_out;