constify srd_decoder_list() output

[libsigrokdecode.git] / controller.c

diff --git a/controller.c b/controller.c
index 995ddd7f13667302a2c7cc271829aafb2148d9cb..c265ae7fe0d305af9cd4cb2a2b307eff1b091123 100644 (file)
--- a/controller.c
+++ b/controller.c
@@ -420,7 +420,7 @@ SRD_API int srd_inst_probe_set_all(struct srd_decoder_inst *di,
  *
  * @param decoder_id Decoder 'id' field.
  * @param options GHashtable of options which override the defaults set in
- *                the decoder class.
+ *                the decoder class. May be NULL.
  *
  * @return Pointer to a newly allocated struct srd_decoder_inst, or
  *         NULL in case of failure.
@@ -445,10 +445,13 @@ SRD_API struct srd_decoder_inst *srd_inst_new(const char *decoder_id,
                return NULL;
        }
 
-       inst_id = g_hash_table_lookup(options, "id");
        di->decoder = dec;
-       di->inst_id = g_strdup(inst_id ? inst_id : decoder_id);
-       g_hash_table_remove(options, "id");
+       if (options) {
+               inst_id = g_hash_table_lookup(options, "id");
+               di->inst_id = g_strdup(inst_id ? inst_id : decoder_id);
+               g_hash_table_remove(options, "id");
+       } else
+               di->inst_id = g_strdup(decoder_id);
 
        /*
         * Prepare a default probe map, where samples come in the
@@ -477,7 +480,7 @@ SRD_API struct srd_decoder_inst *srd_inst_new(const char *decoder_id,
                return NULL;
        }
 
-       if (srd_inst_option_set(di, options) != SRD_OK) {
+       if (options && srd_inst_option_set(di, options) != SRD_OK) {
                g_free(di->dec_probemap);
                g_free(di);
                return NULL;
@@ -733,6 +736,8 @@ SRD_API int srd_session_start(int num_probes, int unitsize, uint64_t samplerate)
        struct srd_decoder_inst *di;
        int ret;
 
+       ret = SRD_OK;
+
        srd_dbg("Calling start() on all instances with %d probes, "
                "unitsize %d samplerate %d.", num_probes, unitsize, samplerate);