[PATCH] fixup! blspec: Allow the "options" key to be given multiple times

[PATCH] fixup! blspec: Allow the "options" key to be given multiple times

[Ahmad Fatoum]

constness was erroneously cast away. Reinstate const safety.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/blspec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/blspec.c b/common/blspec.c
index 3be26d0a7a14..9e1036c8342c 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -301,7 +301,7 @@ static struct blspec_entry *blspec_entry_open(struct bootentries *bootentries,
 		if (!strcmp(name, "options")) {
 			/* If there was a previous "options" key given, prepend its value
 			 * (as per spec). */
-			char *prev_val = blspec_entry_var_get(entry, name);
+			const char *prev_val = blspec_entry_var_get(entry, name);
 			if (prev_val) {
 				char *opts = xasprintf("%s %s", prev_val, val);
 				blspec_entry_var_set(entry, name, opts);
-- 
2.27.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! blspec: Allow the "options" key to be given multiple times

[Sascha Hauer]

On Tue, Jun 02, 2020 at 09:57:25AM +0200, Ahmad Fatoum wrote:
> constness was erroneously cast away. Reinstate const safety.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  common/blspec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/common/blspec.c b/common/blspec.c
> index 3be26d0a7a14..9e1036c8342c 100644
> --- a/common/blspec.c
> +++ b/common/blspec.c
> @@ -301,7 +301,7 @@ static struct blspec_entry *blspec_entry_open(struct bootentries *bootentries,
>  		if (!strcmp(name, "options")) {
>  			/* If there was a previous "options" key given, prepend its value
>  			 * (as per spec). */
> -			char *prev_val = blspec_entry_var_get(entry, name);
> +			const char *prev_val = blspec_entry_var_get(entry, name);
>  			if (prev_val) {
>  				char *opts = xasprintf("%s %s", prev_val, val);
>  				blspec_entry_var_set(entry, name, opts);
> -- 
> 2.27.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox