From c02d66610b3b79f6fb5052e8890969bc7185b7be Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 20 Mar 2020 12:57:42 +1030 Subject: [PATCH] Silence warnings due to plugin API change * testplug.c (parse_symdefstr): Use %hhi to read sym->def, and clear new fields. * testplug2.c (parse_symdefstr): Likewise. * testplug3.c (parse_symdefstr): Likewise. * testplug4.c (parse_symdefstr): Likewise. --- ld/ChangeLog | 8 ++++++++ ld/testplug.c | 5 ++++- ld/testplug2.c | 5 ++++- ld/testplug3.c | 5 ++++- ld/testplug4.c | 5 ++++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 050bb310020..16159d43f63 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2020-03-20 Alan Modra + + * testplug.c (parse_symdefstr): Use %hhi to read sym->def, and + clear new fields. + * testplug2.c (parse_symdefstr): Likewise. + * testplug3.c (parse_symdefstr): Likewise. + * testplug4.c (parse_symdefstr): Likewise. + 2020-03-18 Christophe Lyon * testsuite/ld-arm/non-contiguous-arm4.d: Fix expected output. diff --git a/ld/testplug.c b/ld/testplug.c index 9dd0b91e45b..c126f036073 100644 --- a/ld/testplug.c +++ b/ld/testplug.c @@ -239,12 +239,15 @@ parse_symdefstr (const char *str, struct ld_plugin_symbol *sym) /* Finally we'll use sscanf to parse the numeric fields, then we'll split out the strings which we need to allocate separate storage for anyway so that we can add nul termination. */ - n = sscanf (colon2 + 1, "%i:%i:%lli", &sym->def, &sym->visibility, &size); + n = sscanf (colon2 + 1, "%hhi:%i:%lli", &sym->def, &sym->visibility, &size); if (n != 3) return LDPS_ERR; /* Parsed successfully, so allocate strings and fill out fields. */ sym->size = size; + sym->unused = 0; + sym->section_kind = 0; + sym->symbol_type = 0; sym->resolution = LDPR_UNKNOWN; sym->name = malloc (colon1 - str + 1); if (!sym->name) diff --git a/ld/testplug2.c b/ld/testplug2.c index ecd9a44d731..27553d07813 100644 --- a/ld/testplug2.c +++ b/ld/testplug2.c @@ -218,12 +218,15 @@ parse_symdefstr (const char *str, struct ld_plugin_symbol *sym) /* Finally we'll use sscanf to parse the numeric fields, then we'll split out the strings which we need to allocate separate storage for anyway so that we can add nul termination. */ - n = sscanf (colon2 + 1, "%i:%i:%lli", &sym->def, &sym->visibility, &size); + n = sscanf (colon2 + 1, "%hhi:%i:%lli", &sym->def, &sym->visibility, &size); if (n != 3) return LDPS_ERR; /* Parsed successfully, so allocate strings and fill out fields. */ sym->size = size; + sym->unused = 0; + sym->section_kind = 0; + sym->symbol_type = 0; sym->resolution = LDPR_UNKNOWN; sym->name = malloc (colon1 - str + 1); if (!sym->name) diff --git a/ld/testplug3.c b/ld/testplug3.c index 05fdca02e25..928f4d68426 100644 --- a/ld/testplug3.c +++ b/ld/testplug3.c @@ -217,12 +217,15 @@ parse_symdefstr (const char *str, struct ld_plugin_symbol *sym) /* Finally we'll use sscanf to parse the numeric fields, then we'll split out the strings which we need to allocate separate storage for anyway so that we can add nul termination. */ - n = sscanf (colon2 + 1, "%i:%i:%lli", &sym->def, &sym->visibility, &size); + n = sscanf (colon2 + 1, "%hhi:%i:%lli", &sym->def, &sym->visibility, &size); if (n != 3) return LDPS_ERR; /* Parsed successfully, so allocate strings and fill out fields. */ sym->size = size; + sym->unused = 0; + sym->section_kind = 0; + sym->symbol_type = 0; sym->resolution = LDPR_UNKNOWN; sym->name = malloc (colon1 - str + 1); if (!sym->name) diff --git a/ld/testplug4.c b/ld/testplug4.c index adaedf47c3f..ca899b11da1 100644 --- a/ld/testplug4.c +++ b/ld/testplug4.c @@ -218,12 +218,15 @@ parse_symdefstr (const char *str, struct ld_plugin_symbol *sym) /* Finally we'll use sscanf to parse the numeric fields, then we'll split out the strings which we need to allocate separate storage for anyway so that we can add nul termination. */ - n = sscanf (colon2 + 1, "%i:%i:%lli", &sym->def, &sym->visibility, &size); + n = sscanf (colon2 + 1, "%hhi:%i:%lli", &sym->def, &sym->visibility, &size); if (n != 3) return LDPS_ERR; /* Parsed successfully, so allocate strings and fill out fields. */ sym->size = size; + sym->unused = 0; + sym->section_kind = 0; + sym->symbol_type = 0; sym->resolution = LDPR_UNKNOWN; sym->name = malloc (colon1 - str + 1); if (!sym->name) -- 2.30.2