Pārlūkot izejas kodu

[LibOS] Remove unused errval from __map_elf_object()

Dmitrii Kuvaiskii 6 gadi atpakaļ
vecāks
revīzija
f420037285
1 mainītis faili ar 2 papildinājumiem un 8 dzēšanām
  1. 2 8
      LibOS/shim/src/elf/shim_rtld.c

+ 2 - 8
LibOS/shim/src/elf/shim_rtld.c

@@ -375,12 +375,10 @@ __map_elf_object (struct shim_handle * file,
         return NULL;
 
     const char * errstring __attribute__((unused)) = NULL;
-    int errval = 0;
     int ret;
 
     if (type != OBJECT_INTERNAL && !file) {
         errstring = "shared object has to be backed by file";
-        errval = -EINVAL;
         goto call_lose;
     }
 
@@ -412,7 +410,6 @@ __map_elf_object (struct shim_handle * file,
         if ((ret = (*seek) (file, header->e_phoff, SEEK_SET)) < 0 ||
             (ret = (*read) (file, new_phdr, maplength)) < 0) {
             errstring = "cannot read file data";
-            errval = ret;
             free(new_phdr);
             goto call_lose;
         }
@@ -446,7 +443,6 @@ __map_elf_object (struct shim_handle * file,
                    We record the load commands and process them all later.  */
                 if (__builtin_expect (!ALIGNED(ph->p_align), 0)) {
                     errstring = "ELF load command alignment not page-aligned";
-                    errval = ENOMEM;
                     goto call_lose;
                 }
 
@@ -454,13 +450,11 @@ __map_elf_object (struct shim_handle * file,
                                        & (ph->p_align - 1)) != 0, 0)) {
                     errstring = "\
                         ELF load command address/offset not properly aligned";
-                    errval = ENOMEM;
                     goto call_lose;
                 }
 
                 if (l->nloadcmds >= MAX_LOADCMDS) {
                     errstring = "too many load commamds";
-                    errval = -EINVAL;
                     goto call_lose;
                 }
 
@@ -535,10 +529,10 @@ __map_elf_object (struct shim_handle * file,
                                         file, c->mapoff, NULL);
 
             /* Remember which part of the address space this object uses.  */
-            errval = (*mmap) (file, (void **) &mappref, ALIGN_UP(maplength),
+            ret = (*mmap) (file, (void **) &mappref, ALIGN_UP(maplength),
                               c->prot, c->flags|MAP_PRIVATE, c->mapoff);
 
-            if (__builtin_expect (errval < 0, 0)) {
+            if (__builtin_expect (ret < 0, 0)) {
 map_error:
                 errstring = "failed to map segment from shared object";
                 goto call_lose;