apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Separate conditions for easier debugging

Browse Source
This commit is contained in:
apio 2022-09-19 19:04:14 +02:00
parent 46fe1722ce
commit 86e4fce654
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/src/init/InitRD.cpp
View File

@ -56,7 +56,12 @@ InitRD::File InitRD::open(const char* filename)
while (block < total_blocks) while (block < total_blocks)
{ {
TarHeader* hdr = (TarHeader*)get_block(block); TarHeader* hdr = (TarHeader*)get_block(block);
if (hdr->typeflag == 53 || !is_valid_header(hdr)) if (hdr->typeflag == 53)
{
block++;
continue;
}
if (!is_valid_header(hdr))
{ {
block++; block++;
continue; continue;
@ -79,7 +84,12 @@ void InitRD::for_each(void (*callback)(File& f))
while (block < total_blocks) while (block < total_blocks)
{ {
TarHeader* hdr = (TarHeader*)get_block(block); TarHeader* hdr = (TarHeader*)get_block(block);
if (hdr->typeflag == 53 || !is_valid_header(hdr)) if (hdr->typeflag == 53)
{
block++;
continue;
}
if (!is_valid_header(hdr))
{ {
block++; block++;
continue; continue;