valgrind: Clear more unfreed memory issues

[sigrok-cli.git] / options.c

diff --git a/options.c b/options.c
index 03c001cd2df25d486d6f69f5690dfdc73ab5688a..4d398471ee86f22012a1a65994239f3ae79fe836 100644 (file)
--- a/options.c
+++ b/options.c
@@ -17,8 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
+#include <config.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 gboolean opt_version = FALSE;
 gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings by default. */
@@ -31,24 +32,27 @@ gchar *opt_config = NULL;
 gchar *opt_channels = NULL;
 gchar *opt_channel_group = NULL;
 gchar *opt_triggers = NULL;
-gchar *opt_pds = NULL;
+gchar **opt_pds = NULL;
 #ifdef HAVE_SRD
-gchar *opt_pd_stack = NULL;
 gchar *opt_pd_annotations = NULL;
 gchar *opt_pd_meta = NULL;
 gchar *opt_pd_binary = NULL;
 #endif
 gchar *opt_input_format = NULL;
 gchar *opt_output_format = NULL;
-gchar *opt_show = NULL;
+gchar *opt_transform_module = NULL;
+gboolean opt_show = FALSE;
 gchar *opt_time = NULL;
 gchar *opt_samples = NULL;
 gchar *opt_frames = NULL;
-gchar *opt_continuous = NULL;
-gchar *opt_set = NULL;
+gboolean opt_continuous = FALSE;
+gchar *opt_get = NULL;
+gboolean opt_set = FALSE;
 
-/* defines a callback function that generates
-   an error if an option occurs twice */
+/*
+ * Defines a callback function that generates an error if an
+ * option occurs twice.
+ */
 #define CHECK_ONCE(option) \
 static gboolean check_ ## option                                          \
        (const gchar *option_name, const gchar *value,                    \
@@ -72,12 +76,11 @@ CHECK_ONCE(opt_drv)
 CHECK_ONCE(opt_config)
 CHECK_ONCE(opt_input_format)
 CHECK_ONCE(opt_output_format)
+CHECK_ONCE(opt_transform_module)
 CHECK_ONCE(opt_channels)
 CHECK_ONCE(opt_channel_group)
 CHECK_ONCE(opt_triggers)
 #ifdef HAVE_SRD
-CHECK_ONCE(opt_pds)
-CHECK_ONCE(opt_pd_stack)
 CHECK_ONCE(opt_pd_annotations)
 CHECK_ONCE(opt_pd_meta)
 CHECK_ONCE(opt_pd_binary)
@@ -85,6 +88,7 @@ CHECK_ONCE(opt_pd_binary)
 CHECK_ONCE(opt_time)
 CHECK_ONCE(opt_samples)
 CHECK_ONCE(opt_frames)
+CHECK_ONCE(opt_get)
 
 #undef CHECK_STR_ONCE
 
@@ -108,6 +112,8 @@ static const GOptionEntry optargs[] = {
                        "Save output to file", NULL},
        {"output-format", 'O', 0, G_OPTION_ARG_CALLBACK, &check_opt_output_format,
                        "Output format", NULL},
+       {"transform-module", 'T', 0, G_OPTION_ARG_CALLBACK, &check_opt_transform_module,
+                       "Transform module", NULL},
        {"channels", 'C', 0, G_OPTION_ARG_CALLBACK, &check_opt_channels,
                        "Channels to use", NULL},
        {"channel-group", 'g', 0, G_OPTION_ARG_CALLBACK, &check_opt_channel_group,
@@ -117,10 +123,8 @@ static const GOptionEntry optargs[] = {
        {"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger,
                        "Wait for trigger", NULL},
 #ifdef HAVE_SRD
-       {"protocol-decoders", 'P', 0, G_OPTION_ARG_CALLBACK, &check_opt_pds,
+       {"protocol-decoders", 'P', 0, G_OPTION_ARG_STRING_ARRAY, &opt_pds,
                        "Protocol decoders to run", NULL},
-       {"protocol-decoder-stack", 'S', 0, G_OPTION_ARG_CALLBACK, &check_opt_pd_stack,
-                       "Protocol decoder stack", NULL},
        {"protocol-decoder-annotations", 'A', 0, G_OPTION_ARG_CALLBACK, &check_opt_pd_annotations,
                        "Protocol decoder annotation(s) to show", NULL},
        {"protocol-decoder-meta", 'M', 0, G_OPTION_ARG_CALLBACK, &check_opt_pd_meta,
@@ -131,7 +135,7 @@ static const GOptionEntry optargs[] = {
        {"scan", 0, 0, G_OPTION_ARG_NONE, &opt_scan_devs,
                        "Scan for devices", NULL},
        {"show", 0, 0, G_OPTION_ARG_NONE, &opt_show,
-                       "Show device detail", NULL},
+                       "Show device/format/decoder details", NULL},
        {"time", 0, 0, G_OPTION_ARG_CALLBACK, &check_opt_time,
                        "How long to sample (ms)", NULL},
        {"samples", 0, 0, G_OPTION_ARG_CALLBACK, &check_opt_samples,
@@ -140,12 +144,15 @@ static const GOptionEntry optargs[] = {
                        "Number of frames to acquire", NULL},
        {"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous,
                        "Sample continuously", NULL},
+       {"get", 0, 0, G_OPTION_ARG_CALLBACK, &check_opt_get, "Get device option only", NULL},
        {"set", 0, 0, G_OPTION_ARG_NONE, &opt_set, "Set device options only", NULL},
        {NULL, 0, 0, 0, NULL, NULL, NULL}
 };
 
-/* Parses the command line and sets all the 'opt_...' variables.
-   Returns zero on success, non-zero otherwise. */
+/*
+ * Parses the command line and sets all the 'opt_...' variables.
+ * Returns zero on success, non-zero otherwise.
+ */
 int parse_options(int argc, char **argv)
 {
        GError *error = NULL;
@@ -181,6 +188,11 @@ int parse_options(int argc, char **argv)
                opt_output_file = g_strdup(output_file_array[0]);
        }
 
+       if (1 != argc) {
+               g_critical("superfluous command line argument \"%s\"", argv[1]);
+               goto done;
+       }
+
        ret = 0;
 
 done: