X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoder.c;h=593f2594811468a0d5dba99772466d100fcba8f3;hp=d29a6d6a9472208673ca0ec27ed03428638d8239;hb=1063646c74946527c6e8d23790f6fd8501f5665c;hpb=4fadb1282f5e9aa41abcb67e7d90cdc4a9b2628d

diff --git a/decoder.c b/decoder.c
index d29a6d6..593f259 100644
--- a/decoder.c
+++ b/decoder.c
@@ -137,12 +137,12 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 	int alen, ret, i;
 	char **ann;
 
-	srd_dbg("srd: loading module '%s'", name);
+	srd_dbg("Loading module '%s'.", name);
 
 	py_basedec = py_method = py_attr = NULL;
 
 	if (!(d = g_try_malloc0(sizeof(struct srd_decoder)))) {
-		srd_dbg("srd: Failed to malloc struct srd_decoder");
+		srd_dbg("Failed to malloc struct srd_decoder.");
 		ret = SRD_ERR_MALLOC;
 		goto err_out;
 	}
@@ -151,24 +151,20 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 
 	/* Import the Python module. */
 	if (!(d->py_mod = PyImport_ImportModule(name))) {
-		/* TODO: Report exception message/traceback to err/dbg. */
-		srd_warn("srd: import of '%s' failed.", name);
-		PyErr_Print();
-		PyErr_Clear();
+		catch_exception("import of '%s' failed.", name);
 		goto err_out;
 	}
 
 	/* Get the 'Decoder' class as Python object. */
 	if (!(d->py_dec = PyObject_GetAttrString(d->py_mod, "Decoder"))) {
 		/* This generated an AttributeError exception. */
-		PyErr_Print();
 		PyErr_Clear();
 		srd_err("Decoder class not found in protocol decoder %s.", name);
 		goto err_out;
 	}
 
 	if (!(py_basedec = PyObject_GetAttrString(mod_sigrokdecode, "Decoder"))) {
-		srd_dbg("srd: sigrokdecode module not loaded");
+		srd_dbg("sigrokdecode module not loaded.");
 		goto err_out;
 	}
 
@@ -294,7 +290,7 @@ char *srd_decoder_doc(struct srd_decoder *dec)
 		return NULL;
 
 	if (!(py_str = PyObject_GetAttrString(dec->py_mod, "__doc__"))) {
-		PyErr_Clear();
+		catch_exception("");
 		return NULL;
 	}
 
@@ -354,14 +350,9 @@ int srd_load_all_decoders(void)
 		/* The decoder name is the PD directory name (e.g. "i2c"). */
 		decodername = g_strdup(direntry);
 
-		/* TODO: Error handling. Use g_try_malloc(). */
-		if (!(dec = malloc(sizeof(struct srd_decoder)))) {
-			Py_Finalize(); /* Returns void. */
+		if (!(dec = g_try_malloc(sizeof(struct srd_decoder))))
 			return SRD_ERR_MALLOC;
-		}
 
-		/* Load the decoder. */
-		/* 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. */
 			pd_list = g_slist_append(pd_list, dec);
@@ -382,7 +373,6 @@ int srd_unload_all_decoders(void)
 
 	for (l = srd_list_decoders(); l; l = l->next) {
 		dec = l->data;
-		/* TODO: Error handling. */
 		srd_unload_decoder(dec);
 	}