From: Bert Vermeulen Date: Tue, 23 Sep 2014 10:04:35 +0000 (+0200) Subject: input: Use SR_ERR_NA instead of SR_OK_CONTINUE. X-Git-Tag: libsigrok-0.4.0~917 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=60107497fed4b307a7d64d23e3d8d6137f64c4e4;p=libsigrok.git input: Use SR_ERR_NA instead of SR_OK_CONTINUE. --- diff --git a/src/input/csv.c b/src/input/csv.c index e72357bb..cc721baf 100644 --- a/src/input/csv.c +++ b/src/input/csv.c @@ -506,7 +506,7 @@ static int initial_parse(const struct sr_input *in, GString *buf) } if (!lines[l]) { /* Not enough data for a proper line yet. */ - ret = SR_OK_CONTINUE; + ret = SR_ERR_NA; goto out; } diff --git a/src/input/input.c b/src/input/input.c index 3547d9e1..4b0804a5 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -364,7 +364,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 +477,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 +519,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 */