input: sr_input_free() is now a void function.

Its backend, input_module.cleanup(), is now also a void function.

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index d75e02376db588a76b9e18bb46bd89544ce7e9b2..3c693642ae939ee73bcc5b16a8ecb5bc79b315ad 100644 (file)
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -138,7 +138,7 @@ SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in);
 SR_API struct sr_dev_inst *sr_input_dev_inst_get(const struct sr_input *in);
 SR_API int sr_input_send(const struct sr_input *in, GString *buf);
 SR_API int sr_input_end(const struct sr_input *in);
-SR_API int sr_input_free(const struct sr_input *in);
+SR_API void sr_input_free(const struct sr_input *in);
 
 /*--- output/output.c -------------------------------------------------------*/
 

diff --git a/src/input/csv.c b/src/input/csv.c
index 9af17be0700ab66cec76c91a676218a890263225..e72357bb6d7f7983c02fd486af9c60467c8e3273 100644 (file)
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -758,7 +758,7 @@ static int end(struct sr_input *in)
        return ret;
 }
 
-static int cleanup(struct sr_input *in)
+static void cleanup(struct sr_input *in)
 {
        struct context *inc;
 
@@ -775,8 +775,6 @@ static int cleanup(struct sr_input *in)
 
        if (inc->sample_buffer)
                g_free(inc->sample_buffer);
-
-       return SR_OK;
 }
 
 static struct sr_option options[] = {

diff --git a/src/input/input.c b/src/input/input.c
index 43b49d3f381a99caead2fe9eb5d5b96905bcce8a..3547d9e1800888cbe62473920b8ba5f19343126d 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -548,28 +548,22 @@ SR_API int sr_input_end(const struct sr_input *in)
  *
  * @since 0.4.0
  */
-SR_API int sr_input_free(const struct sr_input *in)
+SR_API void sr_input_free(const struct sr_input *in)
 {
-       int ret;
-
        if (!in)
-               return SR_ERR_ARG;
+               return;
 
-       ret = SR_OK;
        if (in->module->cleanup)
-               ret = in->module->cleanup((struct sr_input *)in);
+               in->module->cleanup((struct sr_input *)in);
        if (in->sdi)
                sr_dev_inst_free(in->sdi);
        if (in->buf->len > 64) {
                /* That seems more than just some sub-unitsize leftover... */
                sr_warn("Found %d unprocessed bytes at free time.", in->buf->len);
        }
-       if (in->buf)
-               g_string_free(in->buf, TRUE);
+       g_string_free(in->buf, TRUE);
        g_free(in->priv);
        g_free((gpointer)in);
-
-       return ret;
 }
 
 

diff --git a/src/input/vcd.c b/src/input/vcd.c
index 96bd6335b0b3f67083ee668b0f828031d69fd803..ef78c9fe477e7bc24a31328018d4778d13089a11 100644 (file)
--- a/src/input/vcd.c
+++ b/src/input/vcd.c
@@ -537,14 +537,12 @@ static int end(struct sr_input *in)
        return ret;
 }
 
-static int cleanup(struct sr_input *in)
+static void cleanup(struct sr_input *in)
 {
        struct context *inc;
 
        inc = in->priv;
        g_slist_free_full(inc->channels, free_channel);
-
-       return SR_OK;
 }
 
 static struct sr_option options[] = {

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 27f0a6153eababeacc4ccb197c986ddbf68fff13..faac464755f4a264ad8a5c1a5dd19d52dcf52ab0 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -319,7 +319,7 @@ struct sr_input_module {
         * @retval SR_OK Success
         * @retval other Negative error code.
         */
-       int (*cleanup) (struct sr_input *in);
+       void (*cleanup) (struct sr_input *in);
 };
 
 /** Output module instance. */