X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=3c7fd516a309ea7e05aff2da1b3c16a592355d6a;hb=a9b2283fd038a2a8c3e2dc1ede4fcc51d5e62c7c;hp=3547d9e1800888cbe62473920b8ba5f19343126d;hpb=d5cc282ff8026173c14ff6957482a24b2d6feef3;p=libsigrok.git diff --git a/src/input/input.c b/src/input/input.c index 3547d9e1..3c7fd516 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -271,15 +271,17 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod, if (in->module->init && in->module->init(in, new_opts) != SR_OK) { g_free(in); in = NULL; + } else { + in->buf = g_string_sized_new(128); } + if (new_opts) g_hash_table_destroy(new_opts); - in->buf = g_string_sized_new(128); return in; } -/* Returns TRUE is all required meta items are available. */ +/* Returns TRUE if all required meta items are available. */ static gboolean check_required_metadata(const uint8_t *metadata, uint8_t *avail) { int m, a; @@ -364,7 +366,7 @@ SR_API int sr_input_scan_buffer(GString *buf, const struct sr_input **in) /* Module didn't recognize this buffer. */ continue; } else if (ret != SR_OK) { - /* Can be SR_OK_CONTINUE. */ + /* Can be SR_ERR_NA. */ return ret; } @@ -477,7 +479,7 @@ SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in) /* Module didn't recognize this buffer. */ continue; } else if (ret != SR_OK) { - /* Can be SR_OK_CONTINUE. */ + /* Can be SR_ERR_NA. */ return ret; } @@ -519,7 +521,7 @@ SR_API struct sr_dev_inst *sr_input_dev_inst_get(const struct sr_input *in) * the device instance associated with this input instance, this is * guaranteed to return the moment it's ready. This gives the caller * the chance to examine the device instance, attach session callbacks - * and on so. + * and so on. * * @since 0.4.0 */