X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=options.c;h=cba1e630028ff23be5300cb11ae2a4969a5876e6;hp=9a0bce6859306562c849a722f871577557663d07;hb=f4c490a7a2e53564ef90956aea8c09d09685f51e;hpb=6f7b4c5d7eb49642f8221a85ee6987751fcd81ce diff --git a/options.c b/options.c index 9a0bce6..cba1e63 100644 --- a/options.c +++ b/options.c @@ -17,8 +17,9 @@ * along with this program. If not, see . */ -#include "sigrok-cli.h" +#include #include +#include "sigrok-cli.h" gboolean opt_version = FALSE; gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings by default. */ @@ -41,16 +42,18 @@ gchar *opt_pd_binary = NULL; gchar *opt_input_format = NULL; gchar *opt_output_format = NULL; gchar *opt_transform_module = NULL; -gchar *opt_show = 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, \ @@ -137,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, @@ -151,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;