1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From: Ruben Undheim <ruben.undheim@gmail.com>
Date: Sat, 28 Jul 2018 06:18:41 +0000
Subject: Fix for various warnings in GCC-8
---
lib/core/test/testhash.c | 6 +++---
lib/core/test/testtime.c | 2 +-
test/Makefile.am | 2 +-
test/volte/testutil.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/core/test/testhash.c b/lib/core/test/testhash.c
index d277930..60c8c13 100644
--- a/lib/core/test/testhash.c
+++ b/lib/core/test/testhash.c
@@ -20,12 +20,12 @@ static void dump_hash(hash_t *h, char str[][MAX_LTH])
char *val = hash_this_val(hi);
str[i][0]='\0';
- sprintf(str[i], "%sKey %s (%d) Value %s\n",
- str[i], key, len, val);
+ sprintf(str[i]+strlen(str[i]), "Key %s (%d) Value %s\n",
+ key, len, val);
i++;
}
str[i][0]='\0';
- sprintf(str[i], "%s#entries %d\n", str[i], i);
+ sprintf(str[i]+strlen(str[i]), "#entries %d\n", i);
/* Sort the result strings so that they can be checked for expected results easily,
* without having to worry about platform quirks
diff --git a/lib/core/test/testtime.c b/lib/core/test/testtime.c
index d5049c0..0f151ac 100644
--- a/lib/core/test/testtime.c
+++ b/lib/core/test/testtime.c
@@ -41,7 +41,7 @@ static void test_gmtstr(abts_case *tc, void *data)
ABTS_NOT_IMPL(tc, "time_exp_gmt");
}
ABTS_TRUE(tc, rv == CORE_OK);
- sprintf(str, "%04d-%02d-%02d %02d:%02d:%02d.%06d %+05d [%d %s]%s",
+ snprintf(str, STR_SIZE, "%04d-%02d-%02d %02d:%02d:%02d.%06d %+05d [%d %s]%s",
xt.tm_year + 1900,
xt.tm_mon,
xt.tm_mday,
diff --git a/test/Makefile.am b/test/Makefile.am
index c3cdbdd..c2d147b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -40,7 +40,7 @@ AM_CPPFLAGS = \
AM_CFLAGS = \
-Wall -Werror \
- -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations \
+ -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-format-truncation \
@OSCPPFLAGS@ \
$(NULL)
diff --git a/test/volte/testutil.c b/test/volte/testutil.c
index 813f13b..cb64a86 100644
--- a/test/volte/testutil.c
+++ b/test/volte/testutil.c
@@ -74,7 +74,7 @@ status_t test_initialize(int argc, const char *const argv[], char *config_path)
path_remove_last_component(dir, argv[0]);
if (strstr(dir, ".libs"))
path_remove_last_component(dir, dir);
- sprintf(conf, "%s/sample-volte.conf", dir);
+ snprintf(conf, C_PATH_MAX-1, "%s/sample-volte.conf", dir);
}
fd_logger_register(test_fd_logger_handler);
|
