Build: Reduce autogen.sh to trivial stub

[libsigrokdecode.git] / type_decoder.c

diff --git a/type_decoder.c b/type_decoder.c
index 11c8ec0640e1996b16f352e30743f8214426947f..eeafe58a0d653b5927db204a4a92ce0b0aeee4cd 100644 (file)
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
 #include "config.h"
 #include <inttypes.h>
 
@@ -40,10 +40,10 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
        PyObject *py_tmp;
        struct srd_pd_output *pdo;
        struct srd_proto_data_annotation *pda;
-       int ann_format;
+       int ann_class;
        char **ann_text;
 
-       /* Should be a list of [annotation format, [string, ...]]. */
+       /* Should be a list of [annotation class, [string, ...]]. */
        if (!PyList_Check(obj) && !PyTuple_Check(obj)) {
                srd_err("Protocol decoder %s submitted %s instead of list.",
                        di->decoder->name, obj->ob_type->tp_name);
@@ -60,7 +60,7 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 
        /*
         * The first element should be an integer matching a previously
-        * registered annotation format.
+        * registered annotation class.
         */
        py_tmp = PyList_GetItem(obj, 0);
        if (!PyLong_Check(py_tmp)) {
@@ -68,10 +68,10 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
                        "first element was not an integer.", di->decoder->name);
                return SRD_ERR_PYTHON;
        }
-       ann_format = PyLong_AsLong(py_tmp);
-       if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_format))) {
+       ann_class = PyLong_AsLong(py_tmp);
+       if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_class))) {
                srd_err("Protocol decoder %s submitted data to unregistered "
-                       "annotation format %d.", di->decoder->name, ann_format);
+                       "annotation class %d.", di->decoder->name, ann_class);
                return SRD_ERR_PYTHON;
        }
 
@@ -88,9 +88,8 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
                return SRD_ERR_PYTHON;
        }
 
-       if (!(pda = g_try_malloc(sizeof(struct srd_proto_data_annotation))))
-               return SRD_ERR_MALLOC;
-       pda->ann_format = ann_format;
+       pda = g_malloc(sizeof(struct srd_proto_data_annotation));
+       pda->ann_class = ann_class;
        pda->ann_text = ann_text;
        pdata->data = pda;
 
@@ -151,8 +150,7 @@ static int convert_binary(struct srd_decoder_inst *di, PyObject *obj,
                return SRD_ERR_PYTHON;
        }
 
-       if (!(pdb = g_try_malloc(sizeof(struct srd_proto_data_binary))))
-               return SRD_ERR_MALLOC;
+       pdb = g_malloc(sizeof(struct srd_proto_data_binary));
        if (PyBytes_AsStringAndSize(py_tmp, &buf, &size) == -1)
                return SRD_ERR_PYTHON;
        pdb->bin_class = bin_class;
@@ -233,10 +231,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
                 di->inst_id, start_sample, end_sample,
                 OUTPUT_TYPES[pdo->output_type], output_id);
 
-       if (!(pdata = g_try_malloc0(sizeof(struct srd_proto_data)))) {
-               srd_err("Failed to g_malloc() struct srd_proto_data.");
-               return NULL;
-       }
+       pdata = g_malloc0(sizeof(struct srd_proto_data));
        pdata->start_sample = start_sample;
        pdata->end_sample = end_sample;
        pdata->pdo = pdo;
@@ -350,10 +345,7 @@ static PyObject *Decoder_register(PyObject *self, PyObject *args,
        srd_dbg("Instance %s creating new output type %d for %s.",
                di->inst_id, output_type, proto_id);
 
-       if (!(pdo = g_try_malloc(sizeof(struct srd_pd_output)))) {
-               PyErr_SetString(PyExc_MemoryError, "struct srd_pd_output");
-               return NULL;
-       }
+       pdo = g_malloc(sizeof(struct srd_pd_output));
 
        /* pdo_id is just a simple index, nothing is deleted from this list anyway. */
        pdo->pdo_id = g_slist_length(di->pd_output);