From: Uwe Hermann Date: Tue, 22 Feb 2011 22:12:41 +0000 (+0100) Subject: Make some more items 'static'. X-Git-Tag: libsigrok-0.1.0~308 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=d078d2e5f3842b1915ffa9961654f3aa4ed88e17 Make some more items 'static'. --- diff --git a/output/output_binary.c b/output/output_binary.c index e3edf62e..076d497c 100644 --- a/output/output_binary.c +++ b/output/output_binary.c @@ -24,7 +24,6 @@ #include #include "config.h" - static int data(struct sr_output *o, const char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out) { diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c index 43033777..a52c3dc1 100644 --- a/output/output_gnuplot.c +++ b/output/output_gnuplot.c @@ -34,7 +34,7 @@ struct context { #define MAX_HEADER_LEN \ (1024 + (SR_MAX_NUM_PROBES * (SR_MAX_PROBENAME_LEN + 10))) -const char *gnuplot_header = "\ +static const char *gnuplot_header = "\ # Sample data in space-separated columns format usable by gnuplot\n\ #\n\ # Generated by: %s on %s%s\ @@ -45,7 +45,7 @@ const char *gnuplot_header = "\ ----------------------------------------\n\ # 0\t\tSample counter (for internal gnuplot purposes)\n%s\n"; -const char *gnuplot_header_comment = "\ +static const char *gnuplot_header_comment = "\ # Comment: Acquisition with %d/%d probes at %s\n"; static int init(struct sr_output *o) diff --git a/output/output_ols.c b/output/output_ols.c index 966eb0b7..31e1b055 100644 --- a/output/output_ols.c +++ b/output/output_ols.c @@ -37,7 +37,6 @@ struct context { unsigned int unitsize; }; - static int init(struct sr_output *o) { struct context *ctx; diff --git a/output/output_vcd.c b/output/output_vcd.c index a61443db..4b76de0a 100644 --- a/output/output_vcd.c +++ b/output/output_vcd.c @@ -46,7 +46,7 @@ $upscope $end\n\ $enddefinitions $end\n\ $dumpvars\n"; -const char *vcd_header_comment = "\ +static const char *vcd_header_comment = "\ $comment\n Acquisition with %d/%d probes at %s\n$end\n"; static int init(struct sr_output *o) diff --git a/output/text/ascii.c b/output/text/ascii.c index 04d39ea3..75ab60b9 100644 --- a/output/text/ascii.c +++ b/output/text/ascii.c @@ -24,7 +24,6 @@ #include #include "text.h" - int init_ascii(struct sr_output *o) { return init(o, DEFAULT_BPL_ASCII, MODE_ASCII); @@ -114,7 +113,6 @@ int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in, return SR_OK; } - struct sr_output_format output_text_ascii = { "ascii", "ASCII (takes argument, default 74)", @@ -123,4 +121,3 @@ struct sr_output_format output_text_ascii = { data_ascii, event, }; - diff --git a/output/text/bits.c b/output/text/bits.c index 43eb7d02..cb8ec598 100644 --- a/output/text/bits.c +++ b/output/text/bits.c @@ -24,7 +24,6 @@ #include #include "text.h" - int init_bits(struct sr_output *o) { return init(o, DEFAULT_BPL_BITS, MODE_BITS); @@ -101,7 +100,6 @@ int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in, return SR_OK; } - struct sr_output_format output_text_bits = { "bits", "Bits (takes argument, default 64)", @@ -110,4 +108,3 @@ struct sr_output_format output_text_bits = { data_bits, event, }; - diff --git a/output/text/hex.c b/output/text/hex.c index bd9aa09d..285102ee 100644 --- a/output/text/hex.c +++ b/output/text/hex.c @@ -24,7 +24,6 @@ #include #include "text.h" - int init_hex(struct sr_output *o) { return init(o, DEFAULT_BPL_HEX, MODE_HEX); @@ -90,7 +89,6 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in, return SR_OK; } - struct sr_output_format output_text_hex = { "hex", "Hexadecimal (takes argument, default 192)", @@ -99,4 +97,3 @@ struct sr_output_format output_text_hex = { data_hex, event, }; - diff --git a/output/text/text.c b/output/text/text.c index 98735eb4..6ca8983c 100644 --- a/output/text/text.c +++ b/output/text/text.c @@ -26,7 +26,6 @@ #include "config.h" #include "text.h" - void flush_linebufs(struct context *ctx, char *outbuf) { static int max_probename_len = 0; @@ -170,4 +169,3 @@ int event(struct sr_output *o, int event_type, char **data_out, return SR_OK; } -