i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style fixes to elf.cpp.

Browse Source
This commit is contained in:
Alex Smith
2012-06-26 10:59:03 +01:00
parent 5a17b2f1b2
commit a820f12943
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/elf.cpp
+7 -7
View File
@@ -76,11 +76,11 @@ struct ELF32Class {
static inline status_t static inline status_t
AllocateRegion(AddrType* _address, AddrType size, uint8 protection, AllocateRegion(AddrType* _address, AddrType size, uint8 protection,
void **_mappedAddress) void** _mappedAddress)
{ {
status_t status = platform_allocate_region((void**)_address, size, status_t status = platform_allocate_region((void**)_address, size,
protection, false); protection, false);
if (status < B_OK) if (status != B_OK)
return status; return status;
*_mappedAddress = (void*)*_address; *_mappedAddress = (void*)*_address;
@@ -123,7 +123,7 @@ struct ELF64Class {
status_t status = platform_allocate_region(&address, size, protection, status_t status = platform_allocate_region(&address, size, protection,
false); false);
if (status < B_OK) if (status != B_OK)
return status; return status;
*_mappedAddress = address; *_mappedAddress = address;
@@ -282,7 +282,7 @@ ELFLoader<Class>::Load(int fd, preloaded_image* _image)
// can automatically allocate an address, but shall prefer the specified // can automatically allocate an address, but shall prefer the specified
// base address. // base address.
if (Class::AllocateRegion(&firstRegion->start, totalSize, if (Class::AllocateRegion(&firstRegion->start, totalSize,
B_READ_AREA | B_WRITE_AREA, &mappedRegion) < B_OK) { B_READ_AREA | B_WRITE_AREA, &mappedRegion) != B_OK) {
status = B_NO_MEMORY; status = B_NO_MEMORY;
goto error1; goto error1;
} }
@@ -379,7 +379,7 @@ ELFLoader<Class>::Relocate(preloaded_image* _image)
(int)image->rel_len / (int)sizeof(RelType))); (int)image->rel_len / (int)sizeof(RelType)));
status = boot_arch_elf_relocate_rel(image, image->rel, image->rel_len); status = boot_arch_elf_relocate_rel(image, image->rel, image->rel_len);
if (status < B_OK) if (status != B_OK)
return status; return status;
} }
@@ -398,7 +398,7 @@ ELFLoader<Class>::Relocate(preloaded_image* _image)
status = boot_arch_elf_relocate_rela(image, (RelaType*)pltrel, status = boot_arch_elf_relocate_rela(image, (RelaType*)pltrel,
image->pltrel_len); image->pltrel_len);
} }
if (status < B_OK) if (status != B_OK)
return status; return status;
} }
@@ -407,7 +407,7 @@ ELFLoader<Class>::Relocate(preloaded_image* _image)
(int)image->rela_len / (int)sizeof(RelaType))); (int)image->rela_len / (int)sizeof(RelaType)));
status = boot_arch_elf_relocate_rela(image, image->rela, status = boot_arch_elf_relocate_rela(image, image->rela,
image->rela_len); image->rela_len);
if (status < B_OK) if (status != B_OK)
return status; return status;
} }