Changeset 48fd597 in mainline


Ignore:
Timestamp:
2017-12-29T18:05:46Z (7 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ee6f434
Parents:
1569a9b
Message:

Fix mixing of error returns in ELF loader.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/elf/elf_load.c

    r1569a9b r48fd597  
    7979        DPRINTF( "- prog dynamic: %p\n", info->finfo.dynamic);
    8080
    81         rc = rtld_prog_process(&info->finfo, &env);
     81        int rc2 = rtld_prog_process(&info->finfo, &env);
     82        switch (rc2) {
     83        case EOK:
     84                rc = EE_OK;
     85                break;
     86        case ENOMEM:
     87                rc = EE_MEMORY;
     88                break;
     89        default:
     90                DPRINTF("Unexpected error code from rtld_prog_process(): %s\n", str_error_name(rc2));
     91                rc = EE_INVALID;
     92        }
     93
    8294        info->env = env;
    8395#else
Note: See TracChangeset for help on using the changeset viewer.