Make some more items 'static'.

This commit is contained in:
Uwe Hermann 2011-02-22 23:12:41 +01:00
parent 25b4fb8557
commit d078d2e5f3
8 changed files with 3 additions and 16 deletions

View File

@ -24,7 +24,6 @@
#include <sigrok.h> #include <sigrok.h>
#include "config.h" #include "config.h"
static int data(struct sr_output *o, const char *data_in, uint64_t length_in, static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
char **data_out, uint64_t *length_out) char **data_out, uint64_t *length_out)
{ {

View File

@ -34,7 +34,7 @@ struct context {
#define MAX_HEADER_LEN \ #define MAX_HEADER_LEN \
(1024 + (SR_MAX_NUM_PROBES * (SR_MAX_PROBENAME_LEN + 10))) (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\ # Sample data in space-separated columns format usable by gnuplot\n\
#\n\ #\n\
# Generated by: %s on %s%s\ # Generated by: %s on %s%s\
@ -45,7 +45,7 @@ const char *gnuplot_header = "\
----------------------------------------\n\ ----------------------------------------\n\
# 0\t\tSample counter (for internal gnuplot purposes)\n%s\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"; # Comment: Acquisition with %d/%d probes at %s\n";
static int init(struct sr_output *o) static int init(struct sr_output *o)

View File

@ -37,7 +37,6 @@ struct context {
unsigned int unitsize; unsigned int unitsize;
}; };
static int init(struct sr_output *o) static int init(struct sr_output *o)
{ {
struct context *ctx; struct context *ctx;

View File

@ -46,7 +46,7 @@ $upscope $end\n\
$enddefinitions $end\n\ $enddefinitions $end\n\
$dumpvars\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"; $comment\n Acquisition with %d/%d probes at %s\n$end\n";
static int init(struct sr_output *o) static int init(struct sr_output *o)

View File

@ -24,7 +24,6 @@
#include <sigrok.h> #include <sigrok.h>
#include "text.h" #include "text.h"
int init_ascii(struct sr_output *o) int init_ascii(struct sr_output *o)
{ {
return init(o, DEFAULT_BPL_ASCII, MODE_ASCII); 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; return SR_OK;
} }
struct sr_output_format output_text_ascii = { struct sr_output_format output_text_ascii = {
"ascii", "ascii",
"ASCII (takes argument, default 74)", "ASCII (takes argument, default 74)",
@ -123,4 +121,3 @@ struct sr_output_format output_text_ascii = {
data_ascii, data_ascii,
event, event,
}; };

View File

@ -24,7 +24,6 @@
#include <sigrok.h> #include <sigrok.h>
#include "text.h" #include "text.h"
int init_bits(struct sr_output *o) int init_bits(struct sr_output *o)
{ {
return init(o, DEFAULT_BPL_BITS, MODE_BITS); 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; return SR_OK;
} }
struct sr_output_format output_text_bits = { struct sr_output_format output_text_bits = {
"bits", "bits",
"Bits (takes argument, default 64)", "Bits (takes argument, default 64)",
@ -110,4 +108,3 @@ struct sr_output_format output_text_bits = {
data_bits, data_bits,
event, event,
}; };

View File

@ -24,7 +24,6 @@
#include <sigrok.h> #include <sigrok.h>
#include "text.h" #include "text.h"
int init_hex(struct sr_output *o) int init_hex(struct sr_output *o)
{ {
return init(o, DEFAULT_BPL_HEX, MODE_HEX); 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; return SR_OK;
} }
struct sr_output_format output_text_hex = { struct sr_output_format output_text_hex = {
"hex", "hex",
"Hexadecimal (takes argument, default 192)", "Hexadecimal (takes argument, default 192)",
@ -99,4 +97,3 @@ struct sr_output_format output_text_hex = {
data_hex, data_hex,
event, event,
}; };

View File

@ -26,7 +26,6 @@
#include "config.h" #include "config.h"
#include "text.h" #include "text.h"
void flush_linebufs(struct context *ctx, char *outbuf) void flush_linebufs(struct context *ctx, char *outbuf)
{ {
static int max_probename_len = 0; 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; return SR_OK;
} }