TDE
/
libr
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/libr
0
0
Fork 0
Code Issues Releases Wiki Activity

Rework unbalanced #ifdef blocks to improve code formatting.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/8/head
Michele Calgaro 3 years ago
parent 0cc30de39d
commit 5ba61f25ca
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File

30
src/libr-elf.c
Unescape View File

@ -148,7 +148,7 @@ libr_intstatus expand_section(Elf *e, Elf_Scn *scn, size_t size, int reset)
*/ */
return LIBR_OK; return LIBR_OK;
} }
#endif /* MANUAL_LAYOUT */ #endif
/* /*
* Obtain the data from a section using libelf * Obtain the data from a section using libelf
@ -185,7 +185,7 @@ libr_intstatus set_data(libr_file *file_handle, libr_section *scn, libr_data *da
RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1)); RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1));
if(elf_update(file_handle->elf_handle, ELF_C_WRITE) < 0) if(elf_update(file_handle->elf_handle, ELF_C_WRITE) < 0)
RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1)); RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1));
#endif /* MANUAL_LAYOUT */ #endif
RETURN_OK; RETURN_OK;
} }
@ -230,12 +230,13 @@ libr_intstatus add_section(libr_file *file_handle, char *section, Elf_Scn **rets
{ {
Elf_Scn *scn = NULL, *strscn = NULL; Elf_Scn *scn = NULL, *strscn = NULL;
Elf *e = file_handle->elf_handle; Elf *e = file_handle->elf_handle;
#ifdef MANUAL_LAYOUT
size_t tblsize = 0;
#endif /* MANUAL_LAYOUT */
Elf_Data *data; Elf_Data *data;
GElf_Ehdr ehdr; GElf_Ehdr ehdr;
GElf_Shdr shdr; GElf_Shdr shdr;
#ifdef MANUAL_LAYOUT
GElf_Shdr strshdr;
size_t tblsize = 0;
#endif
if(gelf_getehdr(e, &ehdr) == NULL) if(gelf_getehdr(e, &ehdr) == NULL)
RETURN(LIBR_ERROR_GETEHDR, "Failed to obtain ELF header: %s", elf_errmsg(-1)); RETURN(LIBR_ERROR_GETEHDR, "Failed to obtain ELF header: %s", elf_errmsg(-1));
@ -251,13 +252,10 @@ libr_intstatus add_section(libr_file *file_handle, char *section, Elf_Scn **rets
data->d_align = 1; data->d_align = 1;
#ifdef MANUAL_LAYOUT #ifdef MANUAL_LAYOUT
{
GElf_Shdr strshdr;
if(gelf_getshdr(strscn, &strshdr) != &strshdr) if(gelf_getshdr(strscn, &strshdr) != &strshdr)
RETURN(LIBR_ERROR_GETSHDR, "Failed to obtain ELF section header: %s", elf_errmsg(-1)); RETURN(LIBR_ERROR_GETSHDR, "Failed to obtain ELF section header: %s", elf_errmsg(-1));
data->d_off = strshdr.sh_size; data->d_off = strshdr.sh_size;
#endif /* MANUAL_LAYOUT */ #endif
data->d_size = (size_t) strlen(section)+1; data->d_size = (size_t) strlen(section)+1;
data->d_type = ELF_T_BYTE; data->d_type = ELF_T_BYTE;
@ -267,12 +265,11 @@ libr_intstatus add_section(libr_file *file_handle, char *section, Elf_Scn **rets
#ifdef MANUAL_LAYOUT #ifdef MANUAL_LAYOUT
if(expand_section(e, strscn, data->d_size, false) != LIBR_OK) if(expand_section(e, strscn, data->d_size, false) != LIBR_OK)
return false; return false;
}
#else #else
/* Update the internal offset information */ /* Update the internal offset information */
if(elf_update(e, ELF_C_NULL) < 0) if(elf_update(e, ELF_C_NULL) < 0)
RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1)); RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1));
#endif /* MANUAL_LAYOUT */ #endif
/* seek to the end of the section data */ /* seek to the end of the section data */
if((scn = elf_newscn(e)) == NULL) if((scn = elf_newscn(e)) == NULL)
@ -282,7 +279,7 @@ libr_intstatus add_section(libr_file *file_handle, char *section, Elf_Scn **rets
shdr.sh_addralign = 1; shdr.sh_addralign = 1;
#ifdef MANUAL_LAYOUT #ifdef MANUAL_LAYOUT
shdr.sh_offset = file_handle->file_size; shdr.sh_offset = file_handle->file_size;
#endif /* MANUAL_LAYOUT */ #endif
shdr.sh_size = 0; shdr.sh_size = 0;
shdr.sh_name = data->d_off; shdr.sh_name = data->d_off;
shdr.sh_type = SHT_NOTE; /* TODO: Does "NOTE" type fit best? */ shdr.sh_type = SHT_NOTE; /* TODO: Does "NOTE" type fit best? */
@ -307,6 +304,9 @@ libr_intstatus remove_section(libr_file *file_handle, libr_section *scn)
Elf_Data *data; Elf_Data *data;
GElf_Ehdr ehdr; GElf_Ehdr ehdr;
GElf_Shdr shdr; GElf_Shdr shdr;
#ifdef MANUAL_LAYOUT
GElf_Shdr strshdr;
#endif
if(gelf_getehdr(e, &ehdr) == NULL) if(gelf_getehdr(e, &ehdr) == NULL)
RETURN(LIBR_ERROR_GETEHDR, "Failed to obtain ELF header: %s", elf_errmsg(-1)); RETURN(LIBR_ERROR_GETEHDR, "Failed to obtain ELF header: %s", elf_errmsg(-1));
@ -343,16 +343,12 @@ libr_intstatus remove_section(libr_file *file_handle, libr_section *scn)
if(elf_update(e, ELF_C_NULL) < 0) if(elf_update(e, ELF_C_NULL) < 0)
RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1)); RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1));
#ifdef MANUAL_LAYOUT #ifdef MANUAL_LAYOUT
{
GElf_Shdr strshdr;
if(gelf_getshdr(strscn, &strshdr) != &strshdr) if(gelf_getshdr(strscn, &strshdr) != &strshdr)
RETURN(LIBR_ERROR_GETSHDR, "Failed to obtain ELF section header: %s", elf_errmsg(-1)); RETURN(LIBR_ERROR_GETSHDR, "Failed to obtain ELF section header: %s", elf_errmsg(-1));
strshdr.sh_size -= str_size; strshdr.sh_size -= str_size;
if(gelf_update_shdr(strscn, &strshdr) < 0) if(gelf_update_shdr(strscn, &strshdr) < 0)
RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1)); RETURN(LIBR_ERROR_UPDATE, "Failed to perform dynamic update: %s.", elf_errmsg(-1));
} #endif
#endif /* MANUAL_LAYOUT */
/* Clear the section itself and update the offsets */ /* Clear the section itself and update the offsets */
if(elfx_remscn(e, scn) == 0) if(elfx_remscn(e, scn) == 0)

Write Preview
Loading…
Cancel
Save