diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-03-30 21:59:43 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-04-28 20:46:49 +0200 |
commit | c190b0e65fe62e9fe58a8a04c6695a263da90161 (patch) | |
tree | 789475d41faa3cdb8541770a7f1e90ae53a12574 /libgcc | |
parent | 76cae6482e0e618d1f8709b3c5d14642378281c7 (diff) |
gcov: Move gcov_open() to caller of read_gcda_file()
This allows to reuse read_gcda_file() to read multiple objects from a single
file.
libgcc/
* libgcov-util.c (read_gcda_file): Do not open file.
(ftw_read_file): Open file here.
Diffstat (limited to 'libgcc')
-rw-r--r-- | libgcc/libgcov-util.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libgcc/libgcov-util.c b/libgcc/libgcov-util.c index 906ea645547..6093a74531d 100644 --- a/libgcc/libgcov-util.c +++ b/libgcc/libgcov-util.c @@ -268,17 +268,10 @@ read_gcda_file (const char *filename) k_ctrs_mask[i] = 0; k_ctrs_types = 0; - if (!gcov_open (filename, 1)) - { - fnotice (stderr, "%s:cannot open\n", filename); - return NULL; - } - /* Read magic. */ if (!gcov_magic (gcov_read_unsigned (), GCOV_DATA_MAGIC)) { fnotice (stderr, "%s:not a gcov data file\n", filename); - gcov_close (); return NULL; } @@ -287,7 +280,6 @@ read_gcda_file (const char *filename) if (version != GCOV_VERSION) { fnotice (stderr, "%s:incorrect gcov version %d vs %d \n", filename, version, GCOV_VERSION); - gcov_close (); return NULL; } @@ -379,7 +371,6 @@ read_gcda_file (const char *filename) } read_gcda_finalize (obj_info); - gcov_close (); return obj_info; } @@ -412,7 +403,14 @@ ftw_read_file (const char *filename, if (verbose) fnotice (stderr, "reading file: %s\n", filename); + if (!gcov_open (filename, 1)) + { + fnotice (stderr, "%s:cannot open\n", filename); + return 0; + } + (void)read_gcda_file (xstrdup (filename)); + gcov_close (); return 0; } |