From e316f1970d9c51ab167be0835a4cfbadf92e9653 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Fri, 12 Aug 2022 13:28:46 +1000 Subject: tree: Change signature of extract_programmer_param_str() Results can be reproduced with the following invocation; ``` $ find -name '*.c' -exec sed -i 's/extract_programmer_param_str(/extract_programmer_param_str(NULL, /g' '{}' \; ``` This allows for a pointer to the actual programmer parameters to be passed instead of a global. Change-Id: I781a328fa280e0a9601050dd99a75af72c39c899 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/66654 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Anastasia Klimchuk --- internal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal.c') diff --git a/internal.c b/internal.c index 57412a2d8..8e267cdb2 100644 --- a/internal.c +++ b/internal.c @@ -128,7 +128,7 @@ static int get_params(int *boardenable, int *boardmismatch, *board_vendor = NULL; *board_model = NULL; - arg = extract_programmer_param_str("boardenable"); + arg = extract_programmer_param_str(NULL, "boardenable"); if (arg && !strcmp(arg,"force")) { *boardenable = 1; } else if (arg && !strlen(arg)) { @@ -142,7 +142,7 @@ static int get_params(int *boardenable, int *boardmismatch, } free(arg); - arg = extract_programmer_param_str("boardmismatch"); + arg = extract_programmer_param_str(NULL, "boardmismatch"); if (arg && !strcmp(arg,"force")) { *boardmismatch = 1; } else if (arg && !strlen(arg)) { @@ -156,7 +156,7 @@ static int get_params(int *boardenable, int *boardmismatch, } free(arg); - arg = extract_programmer_param_str("laptop"); + arg = extract_programmer_param_str(NULL, "laptop"); if (arg && !strcmp(arg, "force_I_want_a_brick")) *force_laptop = 1; else if (arg && !strcmp(arg, "this_is_not_a_laptop")) @@ -172,7 +172,7 @@ static int get_params(int *boardenable, int *boardmismatch, } free(arg); - arg = extract_programmer_param_str("mainboard"); + arg = extract_programmer_param_str(NULL, "mainboard"); if (arg && strlen(arg)) { if (board_parse_parameter(arg, board_vendor, board_model)) { free(arg); -- cgit v1.2.3