Make a few variables and functions static.

[sigrok-test.git] / decoder / runtc.c

diff --git a/decoder/runtc.c b/decoder/runtc.c
index 2193309881b6ed4cc85591d159a94518db1fb1a9..05ddfd2470e89f2716c95cdaf847c1ecf02c211b 100644 (file)
--- a/decoder/runtc.c
+++ b/decoder/runtc.c
@@ -37,9 +37,10 @@
 #include <sched.h>
 #endif
 
-int debug = FALSE;
-int statistics = FALSE;
-char *coverage_report;
+static int debug = FALSE;
+static int statistics = FALSE;
+static char *coverage_report;
+static struct sr_context *ctx;
 
 struct channel {
        char *name;
@@ -73,10 +74,10 @@ struct cvg {
        GSList *missed_lines;
 };
 
-struct cvg *get_mod_cov(PyObject *py_cov, char *module_name);
-void cvg_add(struct cvg *dst, struct cvg *src);
-struct cvg *cvg_new(void);
-gboolean find_missed_line(struct cvg *cvg, char *linespec);
+static struct cvg *get_mod_cov(PyObject *py_cov, char *module_name);
+static void cvg_add(struct cvg *dst, struct cvg *src);
+static struct cvg *cvg_new(void);
+static gboolean find_missed_line(struct cvg *cvg, char *linespec);
 
 static void logmsg(char *prefix, FILE *out, const char *format, va_list args)
 {
@@ -354,7 +355,7 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
                }
        }
 
-       if (sr_session_load(infile, &sr_sess) != SR_OK)
+       if (sr_session_load(ctx, infile, &sr_sess) != SR_OK)
                return FALSE;
 
        sr_session_dev_list(sr_sess, &devices);
@@ -523,7 +524,7 @@ static PyObject *start_coverage(GSList *pdlist)
        return py_cov;
 }
 
-struct cvg *get_mod_cov(PyObject *py_cov, char *module_name)
+static struct cvg *get_mod_cov(PyObject *py_cov, char *module_name)
 {
        PyObject *py_mod, *py_pathlist, *py_path, *py_func, *py_pd;
        PyObject *py_result, *py_missed, *py_item;
@@ -591,7 +592,7 @@ struct cvg *get_mod_cov(PyObject *py_cov, char *module_name)
        return cvg_mod;
 }
 
-struct cvg *cvg_new(void)
+static struct cvg *cvg_new(void)
 {
        struct cvg *cvg;
 
@@ -600,7 +601,7 @@ struct cvg *cvg_new(void)
        return cvg;
 }
 
-gboolean find_missed_line(struct cvg *cvg, char *linespec)
+static gboolean find_missed_line(struct cvg *cvg, char *linespec)
 {
        GSList *l;
 
@@ -611,7 +612,7 @@ gboolean find_missed_line(struct cvg *cvg, char *linespec)
        return FALSE;
 }
 
-void cvg_add(struct cvg *dst, struct cvg *src)
+static void cvg_add(struct cvg *dst, struct cvg *src)
 {
        GSList *l;
        char *linespec;
@@ -709,7 +710,6 @@ static int report_coverage(PyObject *py_cov, GSList *pdlist)
 
 int main(int argc, char **argv)
 {
-       struct sr_context *ctx;
        PyObject *coverage;
        GSList *pdlist;
        struct pd *pd;