sigrok-cli_cross.nsi.in: Use Python 3.4 (Windows XP support).

[sigrok-cli.git] / options.c

diff --git a/options.c b/options.c
index 179d892f4021239bda222ee4fdd84e9462e3c7b3..cba1e630028ff23be5300cb11ae2a4969a5876e6 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. */
@@ -40,16 +41,19 @@ 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;
+gboolean opt_continuous = FALSE;
 gchar *opt_get = NULL;
-gchar *opt_set = 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,                    \
@@ -73,6 +77,7 @@ 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)
@@ -110,6 +115,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,
@@ -133,7 +140,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,
@@ -147,8 +154,10 @@ static const GOptionEntry optargs[] = {
        {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;