diff options
| -rw-r--r-- | libctf/ctf-dump.c | 2 | ||||
| -rw-r--r-- | libctf/ctf-impl.h | 6 | ||||
| -rw-r--r-- | libctf/ctf-lookup.c | 6 | ||||
| -rw-r--r-- | libctf/ctf-open.c | 36 |
4 files changed, 25 insertions, 25 deletions
diff --git a/libctf/ctf-dump.c b/libctf/ctf-dump.c index 11179a6..474c4e0 100644 --- a/libctf/ctf-dump.c +++ b/libctf/ctf-dump.c @@ -441,7 +441,7 @@ ctf_dump_objts (ctf_dict_t *fp, ctf_dump_state_t *state, int functions) if ((functions && fp->ctf_funcidx_names) || (!functions && fp->ctf_objtidx_names)) str = str_append (str, _("Section is indexed.\n")); - else if (fp->ctf_symtab.cts_data == NULL) + else if (fp->ctf_ext_symtab.cts_data == NULL) str = str_append (str, _("No symbol table.\n")); while ((id = ctf_symbol_next (fp, &i, &name, functions)) != CTF_ERR) diff --git a/libctf/ctf-impl.h b/libctf/ctf-impl.h index b712331..8ce489a 100644 --- a/libctf/ctf-impl.h +++ b/libctf/ctf-impl.h @@ -366,9 +366,9 @@ struct ctf_dict struct ctf_header *ctf_header; /* The header from this CTF dict. */ unsigned char ctf_openflags; /* Flags the dict had when opened. */ ctf_sect_t ctf_data; /* CTF data from object file. */ - ctf_sect_t ctf_symtab; /* Symbol table from object file. */ - ctf_sect_t ctf_strtab; /* String table from object file. */ - int ctf_symsect_little_endian; /* Endianness of the ctf_symtab. */ + ctf_sect_t ctf_ext_symtab; /* Symbol table from object file. */ + ctf_sect_t ctf_ext_strtab; /* String table from object file. */ + int ctf_symsect_little_endian; /* Endianness of the ctf_ext_symtab. */ ctf_dynhash_t *ctf_symhash_func; /* (partial) hash, symsect name -> idx. */ ctf_dynhash_t *ctf_symhash_objt; /* ditto, for object symbols. */ size_t ctf_symhash_latest; /* Amount of symsect scanned so far. */ diff --git a/libctf/ctf-lookup.c b/libctf/ctf-lookup.c index 1fcbebe..aa251ba 100644 --- a/libctf/ctf-lookup.c +++ b/libctf/ctf-lookup.c @@ -469,7 +469,7 @@ ctf_symidx_sort (ctf_dict_t *fp, uint32_t *idx, size_t *nidx, static const char * ctf_lookup_symbol_name (ctf_dict_t *fp, unsigned long symidx) { - const ctf_sect_t *sp = &fp->ctf_symtab; + const ctf_sect_t *sp = &fp->ctf_ext_symtab; ctf_link_sym_t sym; int err; @@ -540,7 +540,7 @@ static unsigned long ctf_lookup_symbol_idx (ctf_dict_t *fp, const char *symname, int try_parent, int is_function) { - const ctf_sect_t *sp = &fp->ctf_symtab; + const ctf_sect_t *sp = &fp->ctf_ext_symtab; ctf_link_sym_t sym; void *known_idx; int err; @@ -973,7 +973,7 @@ ctf_lookup_by_sym_or_name (ctf_dict_t *fp, unsigned long symidx, const char *symname, int try_parent, int is_function) { - const ctf_sect_t *sp = &fp->ctf_symtab; + const ctf_sect_t *sp = &fp->ctf_ext_symtab; ctf_id_t type = 0; int err = 0; diff --git a/libctf/ctf-open.c b/libctf/ctf-open.c index f80bf54..2247546 100644 --- a/libctf/ctf-open.c +++ b/libctf/ctf-open.c @@ -1626,8 +1626,8 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect, if (symsect != NULL) { - memcpy (&fp->ctf_symtab, symsect, sizeof (ctf_sect_t)); - memcpy (&fp->ctf_strtab, strsect, sizeof (ctf_sect_t)); + memcpy (&fp->ctf_ext_symtab, symsect, sizeof (ctf_sect_t)); + memcpy (&fp->ctf_ext_strtab, strsect, sizeof (ctf_sect_t)); } if (fp->ctf_data.cts_name != NULL) @@ -1636,14 +1636,14 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect, err = ENOMEM; goto bad; } - if (fp->ctf_symtab.cts_name != NULL) - if ((fp->ctf_symtab.cts_name = strdup (fp->ctf_symtab.cts_name)) == NULL) + if (fp->ctf_ext_symtab.cts_name != NULL) + if ((fp->ctf_ext_symtab.cts_name = strdup (fp->ctf_ext_symtab.cts_name)) == NULL) { err = ENOMEM; goto bad; } - if (fp->ctf_strtab.cts_name != NULL) - if ((fp->ctf_strtab.cts_name = strdup (fp->ctf_strtab.cts_name)) == NULL) + if (fp->ctf_ext_strtab.cts_name != NULL) + if ((fp->ctf_ext_strtab.cts_name = strdup (fp->ctf_ext_strtab.cts_name)) == NULL) { err = ENOMEM; goto bad; @@ -1651,10 +1651,10 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect, if (fp->ctf_data.cts_name == NULL) fp->ctf_data.cts_name = _CTF_NULLSTR; - if (fp->ctf_symtab.cts_name == NULL) - fp->ctf_symtab.cts_name = _CTF_NULLSTR; - if (fp->ctf_strtab.cts_name == NULL) - fp->ctf_strtab.cts_name = _CTF_NULLSTR; + if (fp->ctf_ext_symtab.cts_name == NULL) + fp->ctf_ext_symtab.cts_name = _CTF_NULLSTR; + if (fp->ctf_ext_strtab.cts_name == NULL) + fp->ctf_ext_strtab.cts_name = _CTF_NULLSTR; if (strsect != NULL) { @@ -1836,11 +1836,11 @@ ctf_dict_close (ctf_dict_t *fp) if (fp->ctf_data.cts_name != _CTF_NULLSTR) free ((char *) fp->ctf_data.cts_name); - if (fp->ctf_symtab.cts_name != _CTF_NULLSTR) - free ((char *) fp->ctf_symtab.cts_name); + if (fp->ctf_ext_symtab.cts_name != _CTF_NULLSTR) + free ((char *) fp->ctf_ext_symtab.cts_name); - if (fp->ctf_strtab.cts_name != _CTF_NULLSTR) - free ((char *) fp->ctf_strtab.cts_name); + if (fp->ctf_ext_strtab.cts_name != _CTF_NULLSTR) + free ((char *) fp->ctf_ext_strtab.cts_name); else if (fp->ctf_data_mmapped) ctf_munmap (fp->ctf_data_mmapped, fp->ctf_data_mmapped_len); @@ -1909,13 +1909,13 @@ ctf_getdatasect (const ctf_dict_t *fp) ctf_sect_t ctf_getsymsect (const ctf_dict_t *fp) { - return fp->ctf_symtab; + return fp->ctf_ext_symtab; } ctf_sect_t ctf_getstrsect (const ctf_dict_t *fp) { - return fp->ctf_strtab; + return fp->ctf_ext_strtab; } /* Set the endianness of the symbol table attached to FP. */ @@ -1930,8 +1930,8 @@ ctf_symsect_endianness (ctf_dict_t *fp, int little_endian) our idea of the endianness has changed. */ if (old_endianness != fp->ctf_symsect_little_endian - && fp->ctf_sxlate != NULL && fp->ctf_symtab.cts_data != NULL) - assert (init_symtab (fp, fp->ctf_header, &fp->ctf_symtab) == 0); + && fp->ctf_sxlate != NULL && fp->ctf_ext_symtab.cts_data != NULL) + assert (init_symtab (fp, fp->ctf_header, &fp->ctf_ext_symtab) == 0); } /* Return the CTF handle for the parent CTF dict, if one exists. Otherwise |