X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=f1de7aa94187f60bd1e4949ba3a350cd585efb16;hp=461899e14f255c6fc0768c7b4a5360ce79f3183c;hb=7949dca0e7c6e4e5ff285733eaf5b957ba32504f;hpb=a214a2eb2f86976d44b0e0689efad26cecf529f6

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 461899e..f1de7aa 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -58,7 +58,7 @@ static gchar *opt_triggers = NULL;
 static gchar *opt_pds = NULL;
 static gchar *opt_pd_stack = NULL;
 static gchar *opt_input_format = NULL;
-static gchar *opt_format = NULL;
+static gchar *opt_output_format = NULL;
 static gchar *opt_time = NULL;
 static gchar *opt_samples = NULL;
 static gchar *opt_continuous = NULL;
@@ -68,15 +68,15 @@ static GOptionEntry optargs[] = {
 	{"loglevel", 'l', 0, G_OPTION_ARG_INT, &opt_loglevel, "Select libsigrok loglevel", NULL},
 	{"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs, "List devices", NULL},
 	{"input-file", 'i', 0, G_OPTION_ARG_FILENAME, &opt_input_file, "Load input from file", NULL},
+	{"input-format", 'I', 0, G_OPTION_ARG_STRING, &opt_input_format, "Input format", NULL},
 	{"output-file", 'o', 0, G_OPTION_ARG_FILENAME, &opt_output_file, "Save output to file", NULL},
+	{"output-format", 'O', 0, G_OPTION_ARG_STRING, &opt_output_format, "Output format", NULL},
 	{"device", 'd', 0, G_OPTION_ARG_STRING, &opt_dev, "Use device ID", NULL},
 	{"probes", 'p', 0, G_OPTION_ARG_STRING, &opt_probes, "Probes to use", NULL},
 	{"triggers", 't', 0, G_OPTION_ARG_STRING, &opt_triggers, "Trigger configuration", NULL},
 	{"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger, "Wait for trigger", NULL},
 	{"protocol-decoders", 'a', 0, G_OPTION_ARG_STRING, &opt_pds, "Protocol decoder sequence", NULL},
 	{"protocol-decoder-stack", 's', 0, G_OPTION_ARG_STRING, &opt_pd_stack, "Protocol decoder stack", NULL},
-	{"input-format", 'I', 0, G_OPTION_ARG_STRING, &opt_input_format, "Input format", NULL},
-	{"format", 'f', 0, G_OPTION_ARG_STRING, &opt_format, "Output format", NULL},
 	{"time", 0, 0, G_OPTION_ARG_STRING, &opt_time, "How long to sample (ms)", NULL},
 	{"samples", 0, 0, G_OPTION_ARG_STRING, &opt_samples, "Number of samples to acquire", NULL},
 	{"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous, "Sample continuously", NULL},
@@ -115,8 +115,8 @@ static void show_version(void)
 
 	if (srd_init(NULL) == SRD_OK) {
 		printf("Supported protocol decoders:\n");
-		srd_decoders_load_all();
-		for (l = srd_decoders_list(); l; l = l->next) {
+		srd_decoder_load_all();
+		for (l = srd_decoder_list(); l; l = l->next) {
 			dec = l->data;
 			printf("  %-20s %s\n", dec->id, dec->longname);
 		}
@@ -351,7 +351,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 				}
 			} else {
 				/* saving to a file in whatever format was set
-				 * with --format, so all we need is a filehandle */
+				 * with -O, so all we need is a filehandle */
 				outfile = g_fopen(opt_output_file, "wb");
 			}
 		}
@@ -514,13 +514,13 @@ err_out:
 	return 0;
 }
 
-void show_pd_annotation(struct srd_proto_data *pdata, void *user_data)
+void show_pd_annotation(struct srd_proto_data *pdata, void *cb_data)
 {
 	int i;
 	char **annotations;
 
-	/* 'user_data' is not used in this specific callback. */
-	(void)user_data;
+	/* 'cb_data' is not used in this specific callback. */
+	(void)cb_data;
 
 	if (pdata->ann_format != 0) {
 		/* CLI only shows the default annotation format. */
@@ -943,11 +943,11 @@ static void run_session(void)
 }
 
 static void logger(const gchar *log_domain, GLogLevelFlags log_level,
-		   const gchar *message, gpointer user_data)
+		   const gchar *message, gpointer cb_data)
 {
 	/* Avoid compiler warnings. */
 	(void)log_domain;
-	(void)user_data;
+	(void)cb_data;
 
 	/*
 	 * All messages, warnings, errors etc. go to stderr (not stdout) in
@@ -1052,14 +1052,14 @@ int main(int argc, char **argv)
 		g_strfreev(pds);
 	}
 
-	if (!opt_format) {
-		opt_format = DEFAULT_OUTPUT_FORMAT;
+	if (!opt_output_format) {
+		opt_output_format = DEFAULT_OUTPUT_FORMAT;
 		/* we'll need to remember this so when saving to a file
 		 * later, sigrok session format will be used.
 		 */
 		default_output_format = TRUE;
 	}
-	fmtargs = parse_generic_arg(opt_format);
+	fmtargs = parse_generic_arg(opt_output_format);
 	fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
 	if (!fmtspec) {
 		printf("Invalid output format.\n");
@@ -1081,7 +1081,7 @@ int main(int argc, char **argv)
 		break;
 	}
 	if (!output_format) {
-		printf("invalid output format %s\n", opt_format);
+		printf("invalid output format %s\n", opt_output_format);
 		return 1;
 	}