From 16744f9e96d0f1e203d4a67ad2bfd0c50e3c437a Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Fri, 12 Aug 2022 11:30:27 +1000 Subject: [PATCH] flashrom.c: Move write_buf_to_include_args() to cli_classic.c The write_buf_to_include_args() helper is only ever used by the cli frontend therefore make it static local to the user. BUG=b:242246291 TEST=builds Change-Id: Ia16bf4b8e46a011aa45f98089d43904b077833a0 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/66648 Tested-by: build bot (Jenkins) Reviewed-by: Evan Benn Reviewed-by: Sam McNally Reviewed-by: Thomas Heijligen --- cli_classic.c | 27 +++++++++++++++++++++++++++ flashrom.c | 27 --------------------------- include/flash.h | 1 - 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index 267f3c611..bac31d1c1 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -392,6 +392,33 @@ static int read_buf_from_include_args(const struct flashrom_layout *const layout return 0; } +/** + * @brief Writes content from buffer to one or more files. + * + * Writes content from supplied buffer to files. If a filename is specified for + * individual regions using the partial read syntax ('-i [:]') + * then this will write files using data from the corresponding region in the + * supplied buffer. + * + * @param layout The layout to be used. + * @param buf Chip-sized buffer to read data from + * @return 0 on success + */ +static int write_buf_to_include_args(const struct flashrom_layout *const layout, unsigned char *buf) +{ + const struct romentry *entry = NULL; + + while ((entry = layout_next_included(layout, entry))) { + if (!entry->file) + continue; + if (write_buf_to_file(buf + entry->start, + entry->end - entry->start + 1, entry->file)) + return 1; + } + + return 0; +} + static int do_read(struct flashctx *const flash, const char *const filename) { int ret; diff --git a/flashrom.c b/flashrom.c index d438053af..e529249b9 100644 --- a/flashrom.c +++ b/flashrom.c @@ -870,33 +870,6 @@ notfound: return chip - flashchips; } -/** - * @brief Writes content from buffer to one or more files. - * - * Writes content from supplied buffer to files. If a filename is specified for - * individual regions using the partial read syntax ('-i [:]') - * then this will write files using data from the corresponding region in the - * supplied buffer. - * - * @param layout The layout to be used. - * @param buf Chip-sized buffer to read data from - * @return 0 on success - */ -int write_buf_to_include_args(const struct flashrom_layout *const layout, unsigned char *buf) -{ - const struct romentry *entry = NULL; - - while ((entry = layout_next_included(layout, entry))) { - if (!entry->file) - continue; - if (write_buf_to_file(buf + entry->start, - entry->end - entry->start + 1, entry->file)) - return 1; - } - - return 0; -} - /** * @brief Reads the included layout regions into a buffer. * diff --git a/include/flash.h b/include/flash.h index fe1005a47..a1b83dab6 100644 --- a/include/flash.h +++ b/include/flash.h @@ -424,7 +424,6 @@ void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename); -int write_buf_to_include_args(const struct flashrom_layout *const layout, unsigned char *buf); int prepare_flash_access(struct flashctx *, bool read_it, bool write_it, bool erase_it, bool verify_it); void finalize_flash_access(struct flashctx *); int register_chip_restore(chip_restore_fn_cb_t func, struct flashctx *flash, uint8_t status);