input/output formats: s/extension/id/.

The struct entry 'extension' is not really a (filename) extension, but
rather a unique ID used for input or output formats, e.g. in the sigrok
CLI or GUI interface. Thus, rename it accordingly.

diff --git a/input/input_binary.c b/input/input_binary.c
index e89dc84c1ed6f4d839a2a062154a18bbe4c169d1..2b5580d984d691062cffe78eb6084d96cac24eed 100644 (file)
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -99,7 +99,7 @@ static int loadfile(struct sr_input *in, const char *filename)
 }
 
 struct sr_input_format input_binary = {
-       .extension = "binary",
+       .id = "binary",
        .description = "Raw binary",
        .format_match = format_match,
        .init = init,

diff --git a/output/output_analog.c b/output/output_analog.c
index e45100ca491aad4d66c99f60621ac0bbe529ab91..5118b5ae5fdbe839c13dbd2a13531a1df89d6aa1 100644 (file)
--- a/output/output_analog.c
+++ b/output/output_analog.c
@@ -439,7 +439,7 @@ static int data_ascii(struct sr_output *o, const char *data_in,
 #endif
 
 struct sr_output_format output_analog_bits = {
-       .extension = "analog_bits",
+       .id = "analog_bits",
        .description = "Bits (takes argument, default 64)",
        .df_type = SR_DF_ANALOG,
        .init = init_bits,
@@ -448,7 +448,7 @@ struct sr_output_format output_analog_bits = {
 };
 #if 0
 struct sr_output_format output_analog_hex = {
-       .extension = "analog_hex",
+       .id = "analog_hex",
        .description = "Hexadecimal (takes argument, default 192)",
        .df_type = SR_DF_ANALOG,
        .init = init_hex,
@@ -457,7 +457,7 @@ struct sr_output_format output_analog_hex = {
 };
 
 struct sr_output_format output_analog_ascii = {
-       .extension = "analog_ascii",
+       .id = "analog_ascii",
        .description = "ASCII (takes argument, default 74)",
        .df_type = SR_DF_ANALOG,
        .init = init_ascii,

diff --git a/output/output_binary.c b/output/output_binary.c
index 7cc25a520687e1a4d1bf09bc67c2e9f46f733d6c..f542958554c50aa7bdaaf7fe5b26153c95d2f93e 100644 (file)
--- a/output/output_binary.c
+++ b/output/output_binary.c
@@ -60,7 +60,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_binary = {
-       .extension = "binary",
+       .id = "binary",
        .description = "Raw binary",
        .df_type = SR_DF_LOGIC,
        .init = NULL,

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 1b6d78c278cb340cf0b1b5fba8107fa1783dc4bd..af24865f35adc598074ed999e2a15b67e3e7cb3c 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -194,7 +194,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_gnuplot = {
-       .extension = "gnuplot",
+       .id = "gnuplot",
        .description = "Gnuplot",
        .df_type = SR_DF_LOGIC,
        .init = init,
@@ -340,7 +340,7 @@ static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_analog_gnuplot = {
-       .extension = "analog_gnuplot",
+       .id = "analog_gnuplot",
        .description = "Gnuplot analog",
        .df_type = SR_DF_ANALOG,
        .init = analog_init,

diff --git a/output/output_ols.c b/output/output_ols.c
index 8116472d45d4a5d12aade5fc22b61a3e061d7544..df94c8c92bb117b1f3490ddbeacdcb791ca5d772 100644 (file)
--- a/output/output_ols.c
+++ b/output/output_ols.c
@@ -124,7 +124,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_ols = {
-       .extension = "ols",
+       .id = "ols",
        .description = "OpenBench Logic Sniffer",
        .df_type = SR_DF_LOGIC,
        .init = init,

diff --git a/output/output_skeleton.c b/output/output_skeleton.c
index af82d5b4a80266a5bbcdc73e55d41d7cf96fb2c0..44074ce1d78d658465c46548cda3f33849f95970 100644 (file)
--- a/output/output_skeleton.c
+++ b/output/output_skeleton.c
@@ -38,7 +38,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
 }
 
 struct sr_output_format output_foo = {
-       .extension = "foo",
+       .id = "foo",
        .description = "The foo format",
        .df_type = SR_DF_LOGIC,
        .init = init,

diff --git a/output/output_vcd.c b/output/output_vcd.c
index bd16bc2e1d26e7829893a90f76aeecea1761d60d..94efd2eb4e918bc3f7a0763c8f5832b9331df2b9 100644 (file)
--- a/output/output_vcd.c
+++ b/output/output_vcd.c
@@ -213,7 +213,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_vcd = {
-       .extension = "vcd",
+       .id = "vcd",
        .description = "Value Change Dump (VCD)",
        .df_type = SR_DF_LOGIC,
        .init = init,

diff --git a/output/text/ascii.c b/output/text/ascii.c
index 4d1611fa2a6fbc5567a0f872eaae3c4644556f89..fd6c924ebbc8a97a8d2accf613ccad50b60a3ce4 100644 (file)
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -114,7 +114,7 @@ int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_text_ascii = {
-       .extension = "ascii",
+       .id = "ascii",
        .description = "ASCII (takes argument, default 74)",
        .df_type = SR_DF_LOGIC,
        .init = init_ascii,

diff --git a/output/text/bits.c b/output/text/bits.c
index cc17a9290c1a6f0f4c6998949a4e9ac763eced5b..de526e18fbbd477eab95a2115188534244cd33e7 100644 (file)
--- a/output/text/bits.c
+++ b/output/text/bits.c
@@ -101,7 +101,7 @@ int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_text_bits = {
-       .extension = "bits",
+       .id = "bits",
        .description = "Bits (takes argument, default 64)",
        .df_type = SR_DF_LOGIC,
        .init = init_bits,

diff --git a/output/text/hex.c b/output/text/hex.c
index e4806355b371b6519f93cf7e296388dece019669..e604d9735f76a04ae2ec1b5270b5128c50b66f8f 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -90,7 +90,7 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_text_hex = {
-       .extension = "hex",
+       .id = "hex",
        .description = "Hexadecimal (takes argument, default 192)",
        .df_type = SR_DF_LOGIC,
        .init = init_hex,

diff --git a/sigrok.h b/sigrok.h
index 1ad12e96dea80b0f0896b557f16c7c93bf9085a8..22428d016fcb923b7586a18e440418f0f05faf9f 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -135,7 +135,7 @@ struct sr_input {
 };
 
 struct sr_input_format {
-       char *extension;
+       char *id;
        char *description;
        int (*format_match) (const char *filename);
        int (*init) (struct sr_input *in);
@@ -150,7 +150,7 @@ struct sr_output {
 };
 
 struct sr_output_format {
-       char *extension;
+       char *id;
        char *description;
        int df_type;
        int (*init) (struct sr_output *o);