summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2015-08-25 20:17:14 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-08-27 15:01:22 +0000
commitdc9dbc0059af620efa919ac3e0d3b92abd50e658 (patch)
tree04d268e80a1f4a264a61a886893ee845fb8bf91d
parente590358064a1db077a3dafec473433260a3ba646 (diff)
cbfstool: passing a header is now mandatory for converters
Change-Id: Iea5377af735b06bcaefb999547a8896b1c70763a Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/11330 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--util/cbfstool/cbfstool.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 465580ca30..0939a06002 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -247,8 +247,7 @@ static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset,
buffer_delete(buffer);
// direct assign, no dupe.
memcpy(buffer, &output, sizeof(*buffer));
- if (header)
- header->len = htonl(output.size);
+ header->len = htonl(output.size);
return 0;
}
@@ -279,8 +278,7 @@ static int cbfstool_convert_mkpayload(struct buffer *buffer,
buffer_delete(buffer);
// direct assign, no dupe.
memcpy(buffer, &output, sizeof(*buffer));
- if (header)
- header->len = htonl(output.size);
+ header->len = htonl(output.size);
return 0;
}
@@ -297,8 +295,7 @@ static int cbfstool_convert_mkflatpayload(struct buffer *buffer,
buffer_delete(buffer);
// direct assign, no dupe.
memcpy(buffer, &output, sizeof(*buffer));
- if (header)
- header->len = htonl(output.size);
+ header->len = htonl(output.size);
return 0;
}