X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoder.c;h=628e95360d063893d1580c5fba0ca989db08472e;hp=e69eae8da694ff77ef2e2dec7fecbdd70866c818;hb=ea42f53ece1b82434ba6f5f43e23560b81c102bc;hpb=09b0acbb8dd292794e7fc797352cda47c27a1355

diff --git a/decoder.c b/decoder.c
index e69eae8..628e953 100644
--- a/decoder.c
+++ b/decoder.c
@@ -19,12 +19,12 @@
  */
 
 #include "config.h"
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <dirent.h>
 
 /* The list of protocol decoders. */
-GSList *list_pds = NULL;
-GSList *decoders = NULL;
+GSList *pd_list = NULL;
+GSList *di_list = NULL;
 
 
 /**
@@ -37,7 +37,7 @@ GSList *decoders = NULL;
 GSList *srd_list_decoders(void)
 {
 
-	return list_pds;
+	return pd_list;
 }
 
 
@@ -96,30 +96,30 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 	if (!(d = malloc(sizeof(struct srd_decoder))))
 		return SRD_ERR_MALLOC;
 
-	if ((r = h_str(py_res, py_mod, "id", &(d->id))) < 0)
+	if ((r = h_str(py_res, "id", &(d->id))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "name", &(d->name))) < 0)
+	if ((r = h_str(py_res, "name", &(d->name))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "longname",
+	if ((r = h_str(py_res, "longname",
 		       &(d->longname))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "desc", &(d->desc))) < 0)
+	if ((r = h_str(py_res, "desc", &(d->desc))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "longdesc",
+	if ((r = h_str(py_res, "longdesc",
 		       &(d->longdesc))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "author", &(d->author))) < 0)
+	if ((r = h_str(py_res, "author", &(d->author))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "email", &(d->email))) < 0)
+	if ((r = h_str(py_res, "email", &(d->email))) < 0)
 		return r;
 
-	if ((r = h_str(py_res, py_mod, "license", &(d->license))) < 0)
+	if ((r = h_str(py_res, "license", &(d->license))) < 0)
 		return r;
 
 	d->py_mod = py_mod;
@@ -194,7 +194,7 @@ int srd_load_all_decoders(void)
 		/* TODO: Warning if loading fails for a decoder. */
 		if ((ret = srd_load_decoder(decodername, &dec)) == SRD_OK) {
 			/* Append it to the list of supported/loaded decoders. */
-			list_pds = g_slist_append(list_pds, dec);
+			pd_list = g_slist_append(pd_list, dec);
 		}
 	}
 	closedir(dir);