From 0ca6691c2ec20ff264d882854c339795579991f5 Mon Sep 17 00:00:00 2001 From: Guilherme Maciel Ferreira Date: Thu, 15 Jan 2015 02:48:05 -0200 Subject: imagetool: move common code to imagetool module The get_type() and verify_print_header() functions have the same code on both dumpimage.c and mkimage.c modules. Signed-off-by: Guilherme Maciel Ferreira --- tools/imagetool.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'tools/imagetool.c') diff --git a/tools/imagetool.c b/tools/imagetool.c index 98717bdedd..e4de7af984 100644 --- a/tools/imagetool.c +++ b/tools/imagetool.c @@ -8,6 +8,8 @@ #include "imagetool.h" +#include + /* * Callback function to register a image type within a tool */ @@ -62,3 +64,52 @@ void register_image_type(struct image_type_params *tparams) { register_func(tparams); } + +struct image_type_params *imagetool_get_type( + int type, + struct image_type_params *tparams) +{ + struct image_type_params *curr; + + for (curr = tparams; curr != NULL; curr = curr->next) { + if (curr->check_image_type) { + if (!curr->check_image_type(type)) + return curr; + } + } + return NULL; +} + +int imagetool_verify_print_header( + void *ptr, + struct stat *sbuf, + struct image_type_params *tparams, + struct image_tool_params *params) +{ + int retval = -1; + struct image_type_params *curr; + + for (curr = tparams; curr != NULL; curr = curr->next) { + if (curr->verify_header) { + retval = curr->verify_header((unsigned char *)ptr, + sbuf->st_size, params); + + if (retval == 0) { + /* + * Print the image information if verify is + * successful + */ + if (curr->print_header) { + curr->print_header(ptr); + } else { + fprintf(stderr, + "%s: print_header undefined for %s\n", + params->cmdname, curr->name); + } + break; + } + } + } + + return retval; +} -- cgit v1.2.1