diff options
Diffstat (limited to 'libctf')
| -rw-r--r-- | libctf/ChangeLog | 14 | ||||
| -rw-r--r-- | libctf/ctf-archive.c | 75 | ||||
| -rw-r--r-- | libctf/ctf-link.c | 8 | ||||
| -rw-r--r-- | libctf/libctf.ver | 2 |
4 files changed, 66 insertions, 33 deletions
diff --git a/libctf/ChangeLog b/libctf/ChangeLog index 71a8e53..804f131 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,5 +1,19 @@ 2020-11-20 Nick Alcock <nick.alcock@oracle.com> + * ctf-archive.c (ctf_arc_open_by_offset): Rename to... + (ctf_dict_open_by_offset): ... this. Adjust callers. + (ctf_arc_open_by_name_internal): Rename to... + (ctf_dict_open_internal): ... this. Adjust callers. + (ctf_arc_open_by_name_sections): Rename to... + (ctf_dict_open_sections): ... this, keeping compatibility function. + (ctf_arc_open_by_name): Rename to... + (ctf_dict_open): ... this, keeping compatibility function. + * libctf.ver: New functions added. + * ctf-link.c (ctf_link_one_input_archive): Adjusted accordingly. + (ctf_link_deduplicating_open_inputs): Likewise. + +2020-11-20 Nick Alcock <nick.alcock@oracle.com> + * ctf-impl.h: Rename ctf_file_t to ctf_dict_t: all declarations adjusted. (ctf_fileops): Rename to... diff --git a/libctf/ctf-archive.c b/libctf/ctf-archive.c index 90780da..72cdef9 100644 --- a/libctf/ctf-archive.c +++ b/libctf/ctf-archive.c @@ -33,10 +33,10 @@ #endif static off_t arc_write_one_ctf (ctf_dict_t * f, int fd, size_t threshold); -static ctf_dict_t *ctf_arc_open_by_offset (const struct ctf_archive *arc, - const ctf_sect_t *symsect, - const ctf_sect_t *strsect, - size_t offset, int *errp); +static ctf_dict_t *ctf_dict_open_by_offset (const struct ctf_archive *arc, + const ctf_sect_t *symsect, + const ctf_sect_t *strsect, + size_t offset, int *errp); static int sort_modent_by_name (const void *one, const void *two, void *n); static void *arc_mmap_header (int fd, size_t headersz); static void *arc_mmap_file (int fd, size_t size); @@ -506,10 +506,10 @@ ctf_arc_close (ctf_archive_t *arc) /* Return the ctf_dict_t with the given name, or NULL if none, setting 'err' if non-NULL. A name of NULL means to open the default file. */ static ctf_dict_t * -ctf_arc_open_by_name_internal (const struct ctf_archive *arc, - const ctf_sect_t *symsect, - const ctf_sect_t *strsect, - const char *name, int *errp) +ctf_dict_open_internal (const struct ctf_archive *arc, + const ctf_sect_t *symsect, + const ctf_sect_t *strsect, + const char *name, int *errp) { struct ctf_archive_modent *modent; const char *search_nametbl; @@ -517,7 +517,7 @@ ctf_arc_open_by_name_internal (const struct ctf_archive *arc, if (name == NULL) name = _CTF_SECTION; /* The default name. */ - ctf_dprintf ("ctf_arc_open_by_name(%s): opening\n", name); + ctf_dprintf ("ctf_dict_open_internal(%s): opening\n", name); modent = (ctf_archive_modent_t *) ((char *) arc + sizeof (struct ctf_archive)); @@ -536,8 +536,8 @@ ctf_arc_open_by_name_internal (const struct ctf_archive *arc, return NULL; } - return ctf_arc_open_by_offset (arc, symsect, strsect, - le64toh (modent->ctf_offset), errp); + return ctf_dict_open_by_offset (arc, symsect, strsect, + le64toh (modent->ctf_offset), errp); } /* Return the ctf_dict_t with the given name, or NULL if none, setting 'err' if @@ -547,17 +547,17 @@ ctf_arc_open_by_name_internal (const struct ctf_archive *arc, Public entry point. */ ctf_dict_t * -ctf_arc_open_by_name_sections (const ctf_archive_t *arc, - const ctf_sect_t *symsect, - const ctf_sect_t *strsect, - const char *name, - int *errp) +ctf_dict_open_sections (const ctf_archive_t *arc, + const ctf_sect_t *symsect, + const ctf_sect_t *strsect, + const char *name, + int *errp) { if (arc->ctfi_is_archive) { ctf_dict_t *ret; - ret = ctf_arc_open_by_name_internal (arc->ctfi_archive, symsect, strsect, - name, errp); + ret = ctf_dict_open_internal (arc->ctfi_archive, symsect, strsect, + name, errp); if (ret) ret->ctf_archive = (ctf_archive_t *) arc; return ret; @@ -581,7 +581,7 @@ ctf_arc_open_by_name_sections (const ctf_archive_t *arc, Public entry point. */ ctf_dict_t * -ctf_arc_open_by_name (const ctf_archive_t *arc, const char *name, int *errp) +ctf_dict_open (const ctf_archive_t *arc, const char *name, int *errp) { const ctf_sect_t *symsect = &arc->ctfi_symsect; const ctf_sect_t *strsect = &arc->ctfi_strsect; @@ -591,21 +591,21 @@ ctf_arc_open_by_name (const ctf_archive_t *arc, const char *name, int *errp) if (strsect->cts_name == NULL) strsect = NULL; - return ctf_arc_open_by_name_sections (arc, symsect, strsect, name, errp); + return ctf_dict_open_sections (arc, symsect, strsect, name, errp); } /* Return the ctf_dict_t at the given ctfa_ctfs-relative offset, or NULL if none, setting 'err' if non-NULL. */ static ctf_dict_t * -ctf_arc_open_by_offset (const struct ctf_archive *arc, - const ctf_sect_t *symsect, - const ctf_sect_t *strsect, size_t offset, - int *errp) +ctf_dict_open_by_offset (const struct ctf_archive *arc, + const ctf_sect_t *symsect, + const ctf_sect_t *strsect, size_t offset, + int *errp) { ctf_sect_t ctfsect; ctf_dict_t *fp; - ctf_dprintf ("ctf_arc_open_by_offset(%lu): opening\n", (unsigned long) offset); + ctf_dprintf ("ctf_dict_open_by_offset(%lu): opening\n", (unsigned long) offset); memset (&ctfsect, 0, sizeof (ctf_sect_t)); @@ -621,6 +621,24 @@ ctf_arc_open_by_offset (const struct ctf_archive *arc, return fp; } +/* Backward compatibility. */ +ctf_dict_t * +ctf_arc_open_by_name (const ctf_archive_t *arc, const char *name, + int *errp) +{ + return ctf_dict_open (arc, name, errp); +} + +ctf_dict_t * +ctf_arc_open_by_name_sections (const ctf_archive_t *arc, + const ctf_sect_t *symsect, + const ctf_sect_t *strsect, + const char *name, + int *errp) +{ + return ctf_dict_open_sections (arc, symsect, strsect, name, errp); +} + /* Return the number of members in an archive. */ size_t ctf_archive_count (const ctf_archive_t *wrapper) @@ -699,8 +717,8 @@ ctf_archive_iter_internal (const ctf_archive_t *wrapper, const char *name; name = &nametbl[le64toh (modent[i].name_offset)]; - if ((f = ctf_arc_open_by_name_internal (arc, symsect, strsect, - name, &rc)) == NULL) + if ((f = ctf_dict_open_internal (arc, symsect, strsect, + name, &rc)) == NULL) return rc; f->ctf_archive = (ctf_archive_t *) wrapper; @@ -837,8 +855,7 @@ ctf_archive_next (const ctf_archive_t *wrapper, ctf_next_t **it, const char **na if (name) *name = name_; - f = ctf_arc_open_by_name_internal (arc, symsect, strsect, - name_, errp); + f = ctf_dict_open_internal (arc, symsect, strsect, name_, errp); f->ctf_archive = (ctf_archive_t *) wrapper; return f; } diff --git a/libctf/ctf-link.c b/libctf/ctf-link.c index c3801e6..192d4fd 100644 --- a/libctf/ctf-link.c +++ b/libctf/ctf-link.c @@ -789,8 +789,8 @@ ctf_link_one_input_archive (void *key, void *value, void *arg_) arg->in_file_name = file_name; arg->done_parent = 0; - if ((arg->in_fp_parent = ctf_arc_open_by_name (input->clin_arc, NULL, - &err)) == NULL) + if ((arg->in_fp_parent = ctf_dict_open (input->clin_arc, + NULL, &err)) == NULL) if (err != ECTF_ARNNAME) { ctf_err_warn (arg->out_fp, 1, 0, @@ -1015,8 +1015,8 @@ ctf_link_deduplicating_open_inputs (ctf_dict_t *fp, ctf_dynhash_t *cu_names, multiple members. We assume, as elsewhere, that the parent is named _CTF_SECTION. */ - if ((parent_fp = ctf_arc_open_by_name (one_input->clin_arc, - _CTF_SECTION, &err)) == NULL) + if ((parent_fp = ctf_dict_open (one_input->clin_arc, _CTF_SECTION, + &err)) == NULL) { if (err != ECTF_NOMEMBNAM) { diff --git a/libctf/libctf.ver b/libctf/libctf.ver index 5f5dc57..cf4fa73 100644 --- a/libctf/libctf.ver +++ b/libctf/libctf.ver @@ -177,6 +177,8 @@ LIBCTF_1.0 { LIBCTF_1.1 { global: + ctf_dict_open; + ctf_dict_open_sections; ctf_dict_close; ctf_parent_dict; } LIBCTF_1.0; |