[PATCH 3/3] libctf, testsuite: fix various warnings in tests
Nick Alcock
nick.alcock@oracle.com
Fri Jun 25 16:12:43 GMT 2021
These warnings are all off by default, but if they do fire you get
spurious ERRORs when running make check-libctf.
libctf/ChangeLog
2021-06-16 Nick Alcock <nick.alcock@oracle.com>
* testsuite/libctf-lookup/enum-symbol.c: Remove unused label.
* testsuite/libctf-lookup/conflicting-type-syms.c: Remove unused
variables.
* testsuite/libctf-regression/pptrtab.c: Likewise.
* testsuite/libctf-regression/type-add-unnamed-struct.c: Likewise.
* testsuite/libctf-writable/pptrtab.c: Likewise.
* testsuite/libctf-writable/reserialize-strtab-corruption.c:
Likewise.
* testsuite/libctf-regression/nonstatic-var-section-ld-r.c: Fix
format string.
* testsuite/libctf-regression/nonstatic-var-section-ld.c:
Likewise.
* testsuite/libctf-regression/nonstatic-var-section-ld.lk: Adjust.
* testsuite/libctf-writable/symtypetab-nonlinker-writeout.c: Fix
initializer.
---
libctf/testsuite/libctf-lookup/conflicting-type-syms.c | 3 ---
libctf/testsuite/libctf-lookup/enum-symbol.c | 3 ---
.../libctf-regression/nonstatic-var-section-ld-r.c | 4 ++--
.../testsuite/libctf-regression/nonstatic-var-section-ld.c | 4 ++--
.../testsuite/libctf-regression/nonstatic-var-section-ld.lk | 2 +-
libctf/testsuite/libctf-regression/pptrtab.c | 1 -
.../testsuite/libctf-regression/type-add-unnamed-struct.c | 2 --
libctf/testsuite/libctf-writable/pptrtab.c | 2 +-
.../libctf-writable/reserialize-strtab-corruption.c | 1 -
.../libctf-writable/symtypetab-nonlinker-writeout.c | 6 ++++--
10 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/libctf/testsuite/libctf-lookup/conflicting-type-syms.c b/libctf/testsuite/libctf-lookup/conflicting-type-syms.c
index ffe6983e250..239b8775964 100644
--- a/libctf/testsuite/libctf-lookup/conflicting-type-syms.c
+++ b/libctf/testsuite/libctf-lookup/conflicting-type-syms.c
@@ -12,9 +12,6 @@ main (int argc, char *argv[])
int err;
ctf_id_t a, b, ignore1, ignore2, tmp;
char *foo;
- ctf_next_t *i = NULL;
- const char *name;
- int val;
if (argc != 2)
{
diff --git a/libctf/testsuite/libctf-lookup/enum-symbol.c b/libctf/testsuite/libctf-lookup/enum-symbol.c
index c67478fe780..1244c900434 100644
--- a/libctf/testsuite/libctf-lookup/enum-symbol.c
+++ b/libctf/testsuite/libctf-lookup/enum-symbol.c
@@ -57,9 +57,6 @@ main (int argc, char *argv[])
fprintf (stderr, "%s: Symbol re-lookup error (caching bug): %s\n", argv[0],
ctf_errmsg (err));
return 1;
- err:
- fprintf (stderr, "Lookup failed: %s\n", ctf_errmsg (ctf_errno (fp)));
- return 1;
nerr:
fprintf (stderr, "iteration failed: %s\n", ctf_errmsg (ctf_errno (fp)));
return 1;
diff --git a/libctf/testsuite/libctf-regression/nonstatic-var-section-ld-r.c b/libctf/testsuite/libctf-regression/nonstatic-var-section-ld-r.c
index 2fa761a1d03..6ae2ea53042 100644
--- a/libctf/testsuite/libctf-regression/nonstatic-var-section-ld-r.c
+++ b/libctf/testsuite/libctf-regression/nonstatic-var-section-ld-r.c
@@ -31,12 +31,12 @@ main (int argc, char *argv[])
ld -r link. */
if ((foo_type = ctf_lookup_variable (fp, "foo")) == CTF_ERR)
- printf ("Cannot look up foo\n", ctf_errmsg (ctf_errno (fp)));
+ printf ("Cannot look up foo: %s\n", ctf_errmsg (ctf_errno (fp)));
else
printf ("foo is of type %lx\n", foo_type);
if ((bar_type = ctf_lookup_variable (fp, "bar")) == CTF_ERR)
- printf ("Cannot look up bar\n", ctf_errmsg (ctf_errno (fp)));
+ printf ("Cannot look up bar: %s\n", ctf_errmsg (ctf_errno (fp)));
else
printf ("bar is of type %lx\n", bar_type);
diff --git a/libctf/testsuite/libctf-regression/nonstatic-var-section-ld.c b/libctf/testsuite/libctf-regression/nonstatic-var-section-ld.c
index 4e3a74842b2..93988eb1e8d 100644
--- a/libctf/testsuite/libctf-regression/nonstatic-var-section-ld.c
+++ b/libctf/testsuite/libctf-regression/nonstatic-var-section-ld.c
@@ -30,12 +30,12 @@ main (int argc, char *argv[])
should have been erased. */
if ((foo_type = ctf_lookup_variable (fp, "foo")) == CTF_ERR)
- printf ("Cannot look up foo\n", ctf_errmsg (ctf_errno (fp)));
+ printf ("Cannot look up foo: %s\n", ctf_errmsg (ctf_errno (fp)));
else
printf ("foo is of type %lx\n", foo_type);
if ((bar_type = ctf_lookup_variable (fp, "bar")) == CTF_ERR)
- printf ("Cannot look up bar\n", ctf_errmsg (ctf_errno (fp)));
+ printf ("Cannot look up bar: %s\n", ctf_errmsg (ctf_errno (fp)));
else
printf ("bar is of type %lx\n", bar_type);
diff --git a/libctf/testsuite/libctf-regression/nonstatic-var-section-ld.lk b/libctf/testsuite/libctf-regression/nonstatic-var-section-ld.lk
index edb397a333a..2ea4d323bfc 100644
--- a/libctf/testsuite/libctf-regression/nonstatic-var-section-ld.lk
+++ b/libctf/testsuite/libctf-regression/nonstatic-var-section-ld.lk
@@ -2,5 +2,5 @@
# link: on
# link_flags: -Wl,--ctf-variables
foo is of type [0-9a-f]*
-Cannot look up bar
+Cannot look up bar: No type information available for symbol.
foo missing from the data object section
diff --git a/libctf/testsuite/libctf-regression/pptrtab.c b/libctf/testsuite/libctf-regression/pptrtab.c
index fe1b8fe2b43..2ef5f9c5cc0 100644
--- a/libctf/testsuite/libctf-regression/pptrtab.c
+++ b/libctf/testsuite/libctf-regression/pptrtab.c
@@ -10,7 +10,6 @@ main (int argc, char *argv[])
ctf_next_t *i = NULL;
ctf_id_t type;
const char *arcname;
- char *type_name;
int err;
if (argc != 2)
diff --git a/libctf/testsuite/libctf-regression/type-add-unnamed-struct.c b/libctf/testsuite/libctf-regression/type-add-unnamed-struct.c
index 16ff0948b17..cf10804814c 100644
--- a/libctf/testsuite/libctf-regression/type-add-unnamed-struct.c
+++ b/libctf/testsuite/libctf-regression/type-add-unnamed-struct.c
@@ -8,10 +8,8 @@ main (int argc, char *argv[])
ctf_dict_t *fp;
ctf_archive_t *ctf;
ctf_dict_t *dyn;
- ctf_next_t *i = NULL;
ctf_id_t type;
ctf_id_t newtype;
- const char *memb;
ctf_membinfo_t mi;
const char *membs[] = { "bar", "baz", "foo", NULL };
const char **walk;
diff --git a/libctf/testsuite/libctf-writable/pptrtab.c b/libctf/testsuite/libctf-writable/pptrtab.c
index 68c356352d7..b8d1e63b997 100644
--- a/libctf/testsuite/libctf-writable/pptrtab.c
+++ b/libctf/testsuite/libctf-writable/pptrtab.c
@@ -7,7 +7,7 @@ main (int argc, char *argv[])
{
ctf_dict_t *pfp;
ctf_dict_t *cfp;
- ctf_id_t base, base2, ptr, ptr2, type, last_type;
+ ctf_id_t base, base2, ptr, type, last_type;
ctf_encoding_t encoding = { CTF_INT_SIGNED, 0, sizeof (int) };
ctf_encoding_t encoding2 = { CTF_INT_SIGNED, 0, sizeof (long) };
char *type_name;
diff --git a/libctf/testsuite/libctf-writable/reserialize-strtab-corruption.c b/libctf/testsuite/libctf-writable/reserialize-strtab-corruption.c
index 1593325da77..2c9ec8d9ed2 100644
--- a/libctf/testsuite/libctf-writable/reserialize-strtab-corruption.c
+++ b/libctf/testsuite/libctf-writable/reserialize-strtab-corruption.c
@@ -13,7 +13,6 @@ main (int argc, char *argv[])
ctf_snapshot_id_t snap;
unsigned char *foo;
size_t foo_size;
- const char *bar;
int err;
char name[64];
diff --git a/libctf/testsuite/libctf-writable/symtypetab-nonlinker-writeout.c b/libctf/testsuite/libctf-writable/symtypetab-nonlinker-writeout.c
index bdc3faa944c..7a2b88d6dfa 100644
--- a/libctf/testsuite/libctf-writable/symtypetab-nonlinker-writeout.c
+++ b/libctf/testsuite/libctf-writable/symtypetab-nonlinker-writeout.c
@@ -174,10 +174,12 @@ try_maybe_reporting (int report)
} *expected;
struct ctf_symtype_expected expected_obj[] = { { "data_a", base2 },
{ "data_b", base3 },
- { "data_c", base }, NULL };
+ { "data_c", base },
+ { NULL, 0 } };
struct ctf_symtype_expected expected_func[] = { { "func_a", func2 },
{ "func_b", func3 },
- { "func_c", func }, NULL };
+ { "func_c", func },
+ { NULL, 0 } };
expected = expected_obj;
while ((symtype = ctf_symbol_next (fp, &i, &symname, 0)) != CTF_ERR)
--
2.32.0.255.gd9b1d14a2a
More information about the Binutils
mailing list