* This file is part of the sigrok project.
*
* Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
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;
}
/* 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;
}
"a subclass of sigrokdecode.Decoder.", name);
goto err_out;
}
- Py_DecRef(py_basedec);
+ Py_CLEAR(py_basedec);
/* Check for a proper start() method. */
if (!PyObject_HasAttrString(d->py_dec, "start")) {
"is not a method.", name);
goto err_out;
}
- Py_DecRef(py_method);
+ Py_CLEAR(py_method);
/* Check for a proper decode() method. */
if (!PyObject_HasAttrString(d->py_dec, "decode")) {
"is not a method.", name);
goto err_out;
}
- Py_DecRef(py_method);
+ Py_CLEAR(py_method);
/* If present, options must be a dictionary. */
if (PyObject_HasAttrString(d->py_dec, "options")) {
if (!PyDict_Check(py_attr)) {
srd_err("Protocol decoder %s options attribute is not "
"a dictionary.", d->name);
+ Py_DecRef(py_attr);
goto err_out;
}
Py_DecRef(py_attr);
return NULL;
if (!(py_str = PyObject_GetAttrString(dec->py_mod, "__doc__"))) {
- PyErr_Clear();
+ catch_exception("");
return NULL;
}
/* 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. */
- 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);
for (l = srd_list_decoders(); l; l = l->next) {
dec = l->data;
- /* TODO: Error handling. */
srd_unload_decoder(dec);
}