OpenE2K
/
dwarves
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: Rename {cus,dwarf,ctf}__load to {cus,dwarf,ctf}__load_file 

Because we already use ctf__load in libctf.c, rename the others to
disambiguate, and also as there are the __load_dir and __load_files
it looks more consistent.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2009-03-24 16:48:41 -03:00
parent 25264fdf74
commit 4848eef743
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codiff.c
View File

@ -811,7 +811,7 @@ failure:
/* If old_file is a character device, leave its cus empty */
if (!S_ISCHR(st.st_mode)) {
err = cus__load(old_cus, NULL, old_filename);
err = cus__load_file(old_cus, NULL, old_filename);
if (err != 0) {
cus__print_error_msg("codiff", old_cus, old_filename, err);
return EXIT_FAILURE;
@ -825,7 +825,7 @@ failure:
/* If old_file is a character device, leave its cus empty */
if (!S_ISCHR(st.st_mode)) {
err = cus__load(new_cus, NULL, new_filename);
err = cus__load_file(new_cus, NULL, new_filename);
if (err != 0) {
cus__print_error_msg("codiff", new_cus, new_filename, err);
return EXIT_FAILURE;

3
ctf_loader.c
View File

@ -865,7 +865,8 @@ static int cu__fixup_ctf_bitfields(struct cu *self)
return err;
}
int ctf__load(struct cus *self, struct conf_load *conf, const char *filename)
int ctf__load_file(struct cus *self, struct conf_load *conf,
const char *filename)
{
struct ctf_state state;
int wordsize, err;

3
ctf_loader.h
View File

@ -11,6 +11,7 @@
struct cus;
struct conf_load;
int ctf__load(struct cus *self, struct conf_load *conf, const char *filename);
int ctf__load_file(struct cus *self, struct conf_load *conf,
const char *filename);
#endif /* _CTF_LOADER_H_ */

2
ctracer.c
View File

@ -933,7 +933,7 @@ failure:
* If a filename was specified, for instance "vmlinux", load it too.
*/
if (filename != NULL) {
err = cus__load(methods_cus, NULL, filename);
err = cus__load_file(methods_cus, NULL, filename);
if (err != 0) {
cus__print_error_msg("ctracer", methods_cus, filename, err);
goto out;

3
dwarf_loader.c
View File

@ -1905,7 +1905,8 @@ static int cus__process_file(struct cus *self, struct conf_load *conf, int fd,
return parms.nr_dwarf_sections_found ? 0 : -1;
}
int dwarf__load(struct cus *self, struct conf_load *conf, const char *filename)
int dwarf__load_file(struct cus *self, struct conf_load *conf,
const char *filename)
{
int fd, err;

3
dwarf_loader.h
View File

@ -11,6 +11,7 @@
struct cus;
struct conf_load;
int dwarf__load(struct cus *self, struct conf_load *conf, const char *filename);
int dwarf__load_file(struct cus *self, struct conf_load *conf,
const char *filename);
#endif /* _DWARF_LOADER_H_ */

10
dwarves.c
View File

@ -2652,7 +2652,7 @@ int cus__load_dir(struct cus *self, struct conf_load *conf,
if (err != 0)
break;
} else if (fnmatch(filename_mask, entry->d_name, 0) == 0) {
err = cus__load(self, conf, pathname);
err = cus__load_file(self, conf, pathname);
if (err != 0)
break;
}
@ -2678,11 +2678,11 @@ static struct debugging_formats {
} debugging_formats__table[] = {
{
.name = "dwarf",
.loader = dwarf__load,
.loader = dwarf__load_file,
},
{
.name = "ctf",
.loader = ctf__load,
.loader = ctf__load_file,
},
{
.name = NULL,
@ -2700,7 +2700,7 @@ static debugging_format_loader_t debugging_formats__loader(const char *name)
return NULL;
}
int cus__load(struct cus *self, struct conf_load *conf, char *filename)
int cus__load_file(struct cus *self, struct conf_load *conf, char *filename)
{
int i = 0, err = 0;
debugging_format_loader_t loader;
@ -2751,7 +2751,7 @@ int cus__load_files(struct cus *self, struct conf_load *conf,
int i = 0;
while (filenames[i] != NULL) {
if (cus__load(self, conf, filenames[i]))
if (cus__load_file(self, conf, filenames[i]))
return -i;
++i;
}

2
dwarves.h
View File

@ -74,7 +74,7 @@ struct cus {
struct cus *cus__new(void);
void cus__delete(struct cus *self);
int cus__load(struct cus *self, struct conf_load *conf, char *filename);
int cus__load_file(struct cus *self, struct conf_load *conf, char *filename);
int cus__load_files(struct cus *self, struct conf_load *conf,
char *filenames[]);
int cus__load_dir(struct cus *self, struct conf_load *conf,