package/optee-benchmark: fix gcc 10 warning
PATCH 1/1 package/optee-benchmark: fix gcc 10 warning
The function yaml_mapping_start_event_initialize() take yaml_mapping_style_t style as last argument:
int yaml_mapping_start_event_initialize(
yaml_event_t *event,
const yaml_char_t *anchor,
const yaml_char_t *tag,
int implicit,
yaml_mapping_style_t style)
Use YAML_ANY_MAPPING_STYLE instead of YAML_ANY_SEQUENCE_STYLE
Fixes:
main.c:173:5: error: implicit conversion from ?enum yaml_sequence_style_e? to ?yaml_mapping_style_t? {aka ?enum yaml_mapping_style_e?} [-Werror=enum-conversion]
173 | YAML_ANY_SEQUENCE_STYLE))
| ^~~~~~~~~~~~~~~~~~~~~~~--- .../optee-benchmark/0001-main-fix-typo.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/optee-benchmark/0001-main-fix-typo.patch
package/optee-benchmark/0001-main-fix-typo.patch new file +55 -0
@@ -0,0 +1,55 @@ +From ffa935dc881c394a824e063c8fde7dd102e06d8c Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Fri, 8 May 2020 23:39:59 +0200 +Subject: [PATCH] main: fix typo +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The function yaml_mapping_start_event_initialize() +take yaml_mapping_style_t style as last argument: + +int yaml_mapping_start_event_initialize( + yaml_event_t *event, + const yaml_char_t *anchor, + const yaml_char_t *tag, + int implicit, + yaml_mapping_style_t style) + +Use YAML_ANY_MAPPING_STYLE instead of YAML_ANY_SEQUENCE_STYLE + +Fixes: +main.c:173:5: error: implicit conversion from ?enum yaml_sequence_style_e? to ?yaml_mapping_style_t? {aka ?enum yaml_mapping_style_e?} [-Werror=enum-conversion] + 173 | YAML_ANY_SEQUENCE_STYLE)) + | ^~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Romain Naour <[email protected]> +--- + main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/main.c b/main.c +index 29a7c42..1685d3e 100644 +--- a/main.c ++++ b/main.c +@@ -170,7 +170,7 @@ static bool init_emitter(FILE *ts_file) + /* Mapping start */ + if (!yaml_mapping_start_event_initialize(&event, + NULL, NULL , YAML_IMPLICIT, +- YAML_ANY_SEQUENCE_STYLE)) ++ YAML_ANY_MAPPING_STYLE)) + ERROR_GOTO(emitter_delete, + "Failed to initialize YAML mapping start event"); + if (!yaml_emitter_emit(&emitter, &event)) +@@ -263,7 +263,7 @@ static bool fill_timestamp(uint32_t core, uint64_t count, uint64_t addr, + /* Mapping start */ + if (!yaml_mapping_start_event_initialize(&event, + NULL, NULL , YAML_IMPLICIT, +- YAML_ANY_SEQUENCE_STYLE)) ++ YAML_ANY_MAPPING_STYLE)) + ERROR_RETURN_FALSE( + "Failed to initialize YAML mapping start event"); + if (!yaml_emitter_emit(&emitter, &event)) +-- +2.25.4 +
Signature · 1 line
2.25.4
PATCH 1/1 package/optee-benchmark: fix gcc 10 warning
Quoted 3 lines · Romain Naour
The function
yaml_mapping_start_event_initialize()takeyaml_mapping_style_tstyle as last argument:
minor: s/take/takes/
Quoted 10 lines
int yaml_mapping_start_event_initialize(
yaml_event_t*event,
constyaml_char_t*anchor,
constyaml_char_t*tag,
int implicit,
yaml_mapping_style_tstyle)Use
YAML_ANY_MAPPING_STYLEinstead ofYAML_ANY_SEQUENCE_STYLE
Quoted 7 lines
Fixes:
main.c:173:5: error: implicit conversion from ?enumyaml_sequence_style_e? to ?yaml_mapping_style_t? {aka ?enumyaml_mapping_style_e?} [-Werror=enum-conversion]173 | YAML_ANY_SEQUENCE_STYLE)) | ^~~~~~~~~~~~~~~~~~~~~~~Signed-off-by Romain Naour <[email protected]>Cc Etienne Carriere <[email protected]>
I've created https://github.com/linaro-swg/optee_benchmark/pull/15 fix submit your fix.
Thanks again.
Best regards,
etienne
Quoted 69 lines
--- .../optee-benchmark/0001-main-fix-typo.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/optee-benchmark/0001-main-fix-typo.patchpackage/optee-benchmark/0001-main-fix-typo.patch new file +55
-1@@ -0,0 +1,55 @@ +From ffa935dc881c394a824e063c8fde7dd102e06d8c Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Fri, 8 May 2020 23:39:59 +0200 +Subject: [PATCH] main: fix typo +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The function yaml_mapping_start_event_initialize() +take yaml_mapping_style_t style as last argument: + +int yaml_mapping_start_event_initialize( + yaml_event_t *event, + const yaml_char_t *anchor, + const yaml_char_t *tag, + int implicit, + yaml_mapping_style_t style) + +Use YAML_ANY_MAPPING_STYLE instead of YAML_ANY_SEQUENCE_STYLE + +Fixes: +main.c:173:5: error: implicit conversion from ?enum yaml_sequence_style_e? to ?yaml_mapping_style_t? {aka ?enum yaml_mapping_style_e?} [-Werror=enum-conversion] + 173 | YAML_ANY_SEQUENCE_STYLE)) + | ^~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Romain Naour <[email protected]> +--- + main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/main.c b/main.c +index 29a7c42..1685d3e 100644 +--- a/main.c ++++ b/main.c +@@ -170,7 +170,7 @@ static bool init_emitter(FILE *ts_file) + /* Mapping start */ + if (!yaml_mapping_start_event_initialize(&event, + NULL, NULL , YAML_IMPLICIT, +- YAML_ANY_SEQUENCE_STYLE)) ++ YAML_ANY_MAPPING_STYLE)) + ERROR_GOTO(emitter_delete, + "Failed to initialize YAML mapping start event"); + if (!yaml_emitter_emit(&emitter, &event)) +@@ -263,7 +263,7 @@ static bool fill_timestamp(uint32_t core, uint64_t count, uint64_t addr, + /* Mapping start */ + if (!yaml_mapping_start_event_initialize(&event, + NULL, NULL , YAML_IMPLICIT, +- YAML_ANY_SEQUENCE_STYLE)) ++ YAML_ANY_MAPPING_STYLE)) + ERROR_RETURN_FALSE( + "Failed to initialize YAML mapping start event"); + if (!yaml_emitter_emit(&emitter, &event)) +-- +2.25.4 + --2.25.4
Thomas Petazzoni
AppliedPATCH 1/1 package/optee-benchmark: fix gcc 10 warning
In reply to Romain NaourQuoted 17 lines · On Sat, 30 May 2020 19:14:28 +0200 Romain Naour <[email protected]> wrote:
The function
yaml_mapping_start_event_initialize()takeyaml_mapping_style_tstyle as last argument:int yaml_mapping_start_event_initialize(
yaml_event_t*event,
constyaml_char_t*anchor,
constyaml_char_t*tag,
int implicit,
yaml_mapping_style_tstyle)Use
YAML_ANY_MAPPING_STYLEinstead ofYAML_ANY_SEQUENCE_STYLEFixes:
main.c:173:5: error: implicit conversion from ?enumyaml_sequence_style_e? to ?yaml_mapping_style_t? {aka ?enumyaml_mapping_style_e?} [-Werror=enum-conversion]173 | YAML_ANY_SEQUENCE_STYLE)) | ^~~~~~~~~~~~~~~~~~~~~~~
Quoted 6 lines
Signed-off-by Romain Naour <[email protected]>Cc Etienne Carriere <[email protected]>--- .../optee-benchmark/0001-main-fix-typo.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/optee-benchmark/0001-main-fix-typo.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com