qi-hardware/antorcha
1
0
Fork 0
mirror of git://projects.qi-hardware.com/antorcha.git synced 2024-11-22 19:15:20 +02:00
Code

fw/image.c: fix use of hash functions; make image pointer setup more readable

Browse Source 
It was almost impossible NOT to read

next_image = p = image == images[0] ? ...
                      ^^^^
as if it was

next_image = p = image = images[0] ? ...
                      ^^^
This commit is contained in:
Werner Almesberger 2012-06-20 16:51:40 -03:00
parent 1668e702e5
commit c6fc8190de
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fw/image.c
View File

@ -64,7 +64,12 @@ static void add_payload(const uint8_t *payload)
static bool image_first(const uint8_t *payload) static bool image_first(const uint8_t *payload)
{ {
hash_init(); hash_init();
next_image = p = image == images[0] ? images[1] : images[0]; hash_merge(image_secret, sizeof(image_secret));
if (image == images[0])
p = images[1];
else
p = images[0];
next_image = p;
end = p+MAX_LINES; end = p+MAX_LINES;
memset(p, 0, (char *) end-(char *) p); memset(p, 0, (char *) end-(char *) p);
add_payload(payload); add_payload(payload);
@ -85,6 +90,7 @@ static bool image_more(uint8_t seq, uint8_t limit, const uint8_t *payload)
hash_merge(payload, PAYLOAD); hash_merge(payload, PAYLOAD);
break; break;
case 1: case 1:
hash_end();
failed = !hash_eq(payload, PAYLOAD, 0); failed = !hash_eq(payload, PAYLOAD, 0);
break; break;
case 0: case 0: