Changeset 24608

Timestamp:

03/27/08 09:46:52 (8 months ago)

Author:

axeld

Message:

* Fixed warnings due to the NULL change.
* Minor cleanup.

Location:

haiku/trunk/src/system/boot/loader

Files:

• elf.cpp (modified) (11 diffs)
• vfs.cpp (modified) (2 diffs)

haiku/trunk/src/system/boot/loader/elf.cpp

@@ -1 @@
-/* 
-** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
-** Distributed under the terms of the Haiku License.
-*/
+/*
+ * Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
 
 
@@ -58 +58 @@
                 switch (d[i].d_tag) {
                         case DT_HASH:
-//                              image->symhash = (uint32 *)(d[i].d_un.d_ptr + image->text_region.delta);
-                                break;
                         case DT_STRTAB:
-//                              image->strtab = (char *)(d[i].d_un.d_ptr + image->text_region.delta);
                                 break;
                         case DT_SYMTAB:
-                                image->syms = (struct Elf32_Sym *)(d[i].d_un.d_ptr + image->text_region.delta);
+                                image->syms = (struct Elf32_Sym *)(d[i].d_un.d_ptr
+                                        + image->text_region.delta);
                                 break;
                         case DT_REL:
-                                image->rel = (struct Elf32_Rel *)(d[i].d_un.d_ptr + image->text_region.delta);
+                                image->rel = (struct Elf32_Rel *)(d[i].d_un.d_ptr
+                                        + image->text_region.delta);
                                 break;
                         case DT_RELSZ:
@@ -73 +72 @@
                                 break;
                         case DT_RELA:
-                                image->rela = (struct Elf32_Rela *)(d[i].d_un.d_ptr + image->text_region.delta);
+                                image->rela = (struct Elf32_Rela *)(d[i].d_un.d_ptr
+                                        + image->text_region.delta);
                                 break;
                         case DT_RELASZ:
@@ -79 +79 @@
                                 break;
                         case DT_JMPREL:
-                                image->pltrel = (struct Elf32_Rel *)(d[i].d_un.d_ptr + image->text_region.delta);
+                                image->pltrel = (struct Elf32_Rel *)(d[i].d_un.d_ptr
+                                        + image->text_region.delta);
                                 break;
                         case DT_PLTRELSZ:
@@ -94 +95 @@
 
         // lets make sure we found all the required sections
-//      if (!image->symhash || !image->syms || !image->strtab)
-        if (/* !image->symhash ||*/ !image->syms /*|| !image->strtab*/)
+        if (image->syms == NULL)
                 return B_ERROR;
 
@@ -141 +141 @@
 
                         // read in symbol table
-                        symbolTable = (Elf32_Sym *)kernel_args_malloc(size = sectionHeaders[i].sh_size);
+                        symbolTable = (Elf32_Sym *)kernel_args_malloc(
+                                size = sectionHeaders[i].sh_size);
                         if (symbolTable == NULL) {
                                 status = B_NO_MEMORY;
@@ -147 +148 @@
                         }
 
-                        length = read_pos(fd, sectionHeaders[i].sh_offset, symbolTable, size);
+                        length = read_pos(fd, sectionHeaders[i].sh_offset, symbolTable,
+                                size);
                         if (length < size) {
                                 TRACE(("error reading in symbol table\n"));
@@ -271 +273 @@
 
                 region->start = ROUNDOWN(header.p_vaddr, B_PAGE_SIZE);
-                region->size = ROUNDUP(header.p_memsz + (header.p_vaddr % B_PAGE_SIZE), B_PAGE_SIZE);
+                region->size = ROUNDUP(header.p_memsz + (header.p_vaddr % B_PAGE_SIZE),
+                        B_PAGE_SIZE);
                 region->delta = -region->start;
 
@@ -339 +342 @@
 
                 length = read_pos(fd, header.p_offset,
-                        (void *)(region->start + (header.p_vaddr % B_PAGE_SIZE)), header.p_filesz);
+                        (void *)(region->start + (header.p_vaddr % B_PAGE_SIZE)),
+                        header.p_filesz);
                 if (length < (ssize_t)header.p_filesz) {
                         status = B_BAD_DATA;
@@ -346 +350 @@
                 }
 
-                // clear anything above the file size (that may also contain the BSS area)
+                // Clear anything above the file size (that may also contain the BSS
+                // area)
 
                 uint32 offset = (header.p_vaddr % B_PAGE_SIZE) + header.p_filesz;
@@ -371 +376 @@
 
 error2:
-        if (image->text_region.start != NULL)
+        if (image->text_region.start != 0)
                 platform_free_region((void *)image->text_region.start, totalSize);
 error1:

haiku/trunk/src/system/boot/loader/vfs.cpp

@@ -1 +1 @@
 /*
- * Copyright 2003-2006, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2003-2008, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
@@ -538 +538 @@
         }
 
-        return NULL;
+        return B_ENTRY_NOT_FOUND;
 }