summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Kerola2017-03-10 20:56:16 +0100
committerSami Kerola2017-03-17 22:22:26 +0100
commit41427f97d91ab1e533713105034fa7fe57731163 (patch)
tree14aeea2f75b3a3213472d7203086260a44ee23e0
parenttests: do not use plain 0 as NULL [smatch scan] (diff)
downloadkernel-qcow2-util-linux-41427f97d91ab1e533713105034fa7fe57731163.tar.gz
kernel-qcow2-util-linux-41427f97d91ab1e533713105034fa7fe57731163.tar.xz
kernel-qcow2-util-linux-41427f97d91ab1e533713105034fa7fe57731163.zip
tests: add static keyword where needed [smatch scan]
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
-rw-r--r--libmount/src/context.c2
-rw-r--r--libmount/src/lock.c2
-rw-r--r--misc-utils/test_uuidd.c8
-rw-r--r--tests/helpers/test_byteswap.c6
-rw-r--r--tests/helpers/test_pathnames.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/libmount/src/context.c b/libmount/src/context.c
index 44282c07b..e731749b4 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -2414,7 +2414,7 @@ int mnt_context_wait_for_children(struct libmnt_context *cxt,
#ifdef TEST_PROGRAM
-struct libmnt_lock *lock;
+static struct libmnt_lock *lock;
static void lock_fallback(void)
{
diff --git a/libmount/src/lock.c b/libmount/src/lock.c
index c3cd226f4..06eff1344 100644
--- a/libmount/src/lock.c
+++ b/libmount/src/lock.c
@@ -560,7 +560,7 @@ void mnt_unlock_file(struct libmnt_lock *ml)
#ifdef TEST_PROGRAM
-struct libmnt_lock *lock;
+static struct libmnt_lock *lock;
/*
* read number from @filename, increment the number and
diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
index d590f9632..66a9f2d3b 100644
--- a/misc-utils/test_uuidd.c
+++ b/misc-utils/test_uuidd.c
@@ -41,10 +41,10 @@
#define LOG(level,args) if (loglev >= level) { fprintf args; }
-size_t nprocesses = 4;
-size_t nthreads = 4;
-size_t nobjects = 4096;
-size_t loglev = 1;
+static size_t nprocesses = 4;
+static size_t nthreads = 4;
+static size_t nobjects = 4096;
+static size_t loglev = 1;
struct processentry {
pid_t pid;
diff --git a/tests/helpers/test_byteswap.c b/tests/helpers/test_byteswap.c
index 0b996e09b..1b98f7697 100644
--- a/tests/helpers/test_byteswap.c
+++ b/tests/helpers/test_byteswap.c
@@ -19,7 +19,7 @@
#include "bitops.h"
-uint16_t ary16[] = {
+static uint16_t ary16[] = {
0x0001, 0x0100,
0x1234, 0x3412,
0xff00, 0x00ff,
@@ -28,7 +28,7 @@ uint16_t ary16[] = {
0x0000, 0x0000
};
-uint32_t ary32[] = {
+static uint32_t ary32[] = {
0x00000001, 0x01000000,
0x80000000, 0x00000080,
0x12345678, 0x78563412,
@@ -38,7 +38,7 @@ uint32_t ary32[] = {
0x00000000, 0x00000000
};
-uint64_t ary64[] = {
+static uint64_t ary64[] = {
0x0000000000000001, 0x0100000000000000,
0x8000000000000000, 0x0000000000000080,
0x1234567812345678, 0x7856341278563412,
diff --git a/tests/helpers/test_pathnames.c b/tests/helpers/test_pathnames.c
index d5cdad829..2368641f1 100644
--- a/tests/helpers/test_pathnames.c
+++ b/tests/helpers/test_pathnames.c
@@ -29,7 +29,7 @@ struct hlpPath
#define DEF_HLPPATH(_p) { #_p, _p }
-struct hlpPath paths[] =
+static struct hlpPath paths[] =
{
DEF_HLPPATH(_PATH_DEFPATH),
DEF_HLPPATH(_PATH_DEFPATH_ROOT),