X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=8b8866046b3224f3b39542f65f63049acb5205d4;hb=a945c53611b3c8bdfd5d30fec7675320213acfe0;hp=2ab7462ce7c01d31b126bb8cbc9b2248d03b5361;hpb=2372b1998ae5d252433d7a7a07744ba2ea81b96e;p=libsigrokdecode.git
diff --git a/session.c b/session.c
index 2ab7462..8b88660 100644
--- a/session.c
+++ b/session.c
@@ -18,8 +18,8 @@
* along with this program. If not, see .
*/
-#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
#include
@@ -41,7 +41,7 @@
/** @cond PRIVATE */
SRD_PRIV GSList *sessions = NULL;
-int max_session_id = -1;
+SRD_PRIV int max_session_id = -1;
/** @endcond */
@@ -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;