X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=session.c;h=8b8866046b3224f3b39542f65f63049acb5205d4;hp=6963a233b5617f3bf7a69635031d370d118f74a4;hb=fbff319f0a65e2d87a609f77a32b26ef200a5215;hpb=f6c7eade2b8853b3d525b5cc0402e89ca74c1908 diff --git a/session.c b/session.c index 6963a23..8b88660 100644 --- a/session.c +++ b/session.c @@ -76,8 +76,7 @@ SRD_API int srd_session_new(struct srd_session **sess) return SRD_ERR_ARG; } - if (!(*sess = g_try_malloc(sizeof(struct srd_session)))) - return SRD_ERR_MALLOC; + *sess = g_malloc(sizeof(struct srd_session)); (*sess)->session_id = ++max_session_id; (*sess)->di_list = (*sess)->callbacks = NULL; @@ -239,10 +238,6 @@ SRD_API int srd_session_send(struct srd_session *sess, return SRD_ERR_ARG; } - srd_dbg("Calling decode() on all instances with starting sample " - "number %" PRIu64 ", %" PRIu64 " bytes at 0x%p", - start_samplenum, inbuflen, inbuf); - for (d = sess->di_list; d; d = d->next) { if ((ret = srd_inst_decode(d->data, start_samplenum, end_samplenum, inbuf, inbuflen)) != SRD_OK) @@ -312,11 +307,7 @@ SRD_API int srd_pd_output_callback_add(struct srd_session *sess, srd_dbg("Registering new callback for output type %d.", output_type); - if (!(pd_cb = g_try_malloc(sizeof(struct srd_pd_callback)))) { - srd_err("Failed to g_malloc() struct srd_pd_callback."); - return SRD_ERR_MALLOC; - } - + pd_cb = g_malloc(sizeof(struct srd_pd_callback)); pd_cb->output_type = output_type; pd_cb->cb = cb; pd_cb->cb_data = cb_data;