diff mbox series

parser: factorize setting of back pointers

Message ID 20240215151720.115595-1-stefano.babic@swupdate.org
State Accepted
Delegated to: Stefano Babic
Headers show
Series parser: factorize setting of back pointers | expand

Commit Message

Stefano Babic Feb. 15, 2024, 3:17 p.m. UTC 
Create function for Update Settings global structures, that is pointers
to the swcfg structure that contains data for a single installation.

Signed-off-by: Stefano Babic <stefano.babic@swupdate.org>
---
 parser/parser.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--
2.34.1

Comments

Storm, Christian Feb. 20, 2024, 11:37 a.m. UTC | #1 
Hi Stefano,

+static void set_img_globals(struct img_type *img, struct swupdate_cfg *sw)
+{
+ img->bootloader = &sw->bootloader;
+}

Nitpicking, but this seems wrongly indented?

Kind regards,
Christian

--
Dr. Christian Storm
Siemens AG, Technology, T CED OES-DE
Otto-Hahn-Ring 6, 81739 Munich, Germany
Stefano Babic Feb. 20, 2024, 12:01 p.m. UTC | #2 
On 20.02.24 12:37, Storm, Christian wrote:
> Hi Stefano,
>
>> +static void set_img_globals(struct img_type *img, struct swupdate_cfg
>> *sw)
>> +{
>> +img->bootloader = &sw->bootloader;
>> +}
>
> Nitpicking, but this seems wrongly indented?
>

I checked on my tree, and it is ok, that is there is a tab there.
Thanks, I will check again when I merge.

Best regards,
Stefano
diff mbox series

Patch

diff --git a/parser/parser.c b/parser/parser.c
index c7616cb8..1d9a38db 100644
--- a/parser/parser.c
+++ b/parser/parser.c
@@ -381,6 +381,11 @@  static int is_image_higher(struct swver *sw_ver_list,
     return false;
 }

+static void set_img_globals(struct img_type *img, struct swupdate_cfg *sw)
+{
+	img->bootloader = &sw->bootloader;
+}
+
 static int run_embscript(parsertype p, void *elem, struct img_type *img,
 			 lua_State *L, const char *embscript)
 {
@@ -598,6 +603,8 @@  static int _parse_scripts(parsertype p, void *cfg, void *setting, const char **n

 		add_properties(p, elem, script);

+		set_img_globals(script, swcfg);
+
 		skip = run_embscript(p, elem, script, L, swcfg->embscript);
 		if (skip < 0) {
 			free_image(script);
@@ -863,7 +870,7 @@  static int _parse_images(parsertype p, void *cfg, void *setting, const char **no

 		add_properties(p, elem, image);

-		image->bootloader = &swcfg->bootloader;
+		set_img_globals(image, swcfg);

 		skip = run_embscript(p, elem, image, L, swcfg->embscript);
 		if (skip < 0) {
@@ -959,7 +966,7 @@  static int _parse_files(parsertype p, void *cfg, void *setting, const char **nod

 		add_properties(p, elem, file);

-		file->bootloader = &swcfg->bootloader;
+		set_img_globals(file, swcfg);

 		skip = run_embscript(p, elem, file, L, swcfg->embscript);
 		if (skip < 0) {