From 4457451f3d3475158e48f7b751eb2ddf7875c894 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 5 Aug 2016 15:50:02 +0200 Subject: [PATCH] gcov: rename line_next to next_file_fn in function_info * gcov.c (output_intermediate_file): Rename function_info::line_next to next_file_fn. (process_file): Likewise. (read_graph_file): Likewise. (accumulate_line_counts): Likewise. (output_lines): Likewise. From-SVN: r239168 --- gcc/ChangeLog | 9 +++++++++ gcc/gcov.c | 16 ++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bc49ac2bfa0..2031b767a25 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2016-08-05 Martin Liska + + * gcov.c (output_intermediate_file): Rename + function_info::line_next to next_file_fn. + (process_file): Likewise. + (read_graph_file): Likewise. + (accumulate_line_counts): Likewise. + (output_lines): Likewise. + 2016-08-05 Richard Biener * tree-ssa-threadupdate.c (thread_block_1): Remove unnecessary diff --git a/gcc/gcov.c b/gcc/gcov.c index 40701a11e5a..19e2cba74ab 100644 --- a/gcc/gcov.c +++ b/gcc/gcov.c @@ -194,7 +194,7 @@ typedef struct function_info unsigned src; /* Next function in same source file. */ - struct function_info *line_next; + struct function_info *next_file_fn; /* Next function. */ struct function_info *next; @@ -667,7 +667,7 @@ output_intermediate_file (FILE *gcov_file, source_t *src) fprintf (gcov_file, "file:%s\n", src->name); /* source file name */ - for (fn = src->functions; fn; fn = fn->line_next) + for (fn = src->functions; fn; fn = fn->next_file_fn) { /* function:,, */ fprintf (gcov_file, "function:%d,%s,%s\n", fn->line, @@ -736,10 +736,10 @@ process_file (const char *file_name) ascending order, so a simple scan is quick. Note we're building this list in reverse order. */ for (prev = &sources[src].functions; - (probe = *prev); prev = &probe->line_next) + (probe = *prev); prev = &probe->next_file_fn) if (probe->line <= line) break; - fn->line_next = probe; + fn->next_file_fn = probe; *prev = fn; /* Mark last line in files touched by function. */ @@ -1220,7 +1220,7 @@ read_graph_file (void) fn->src = src_idx; fn->line = lineno; - fn->line_next = NULL; + fn->next_file_fn = NULL; fn->next = NULL; *fns_end = fn; fns_end = &fn->next; @@ -2152,8 +2152,8 @@ accumulate_line_counts (source_t *src) /* Reverse the function order. */ for (fn = src->functions, fn_p = NULL; fn; fn_p = fn, fn = fn_n) { - fn_n = fn->line_next; - fn->line_next = fn_p; + fn_n = fn->next_file_fn; + fn->next_file_fn = fn_p; } src->functions = fn_p; @@ -2429,7 +2429,7 @@ output_lines (FILE *gcov_file, const source_t *src) for (line_num = 1, line = &src->lines[line_num]; line_num < src->num_lines; line_num++, line++) { - for (; fn && fn->line == line_num; fn = fn->line_next) + for (; fn && fn->line == line_num; fn = fn->next_file_fn) { arc_t *arc = fn->blocks[EXIT_BLOCK].pred; gcov_type return_count = fn->blocks[EXIT_BLOCK].count; -- 2.30.2