summaryrefslogtreecommitdiff
path: root/gcc/c-family/c-indentation.c
diff options
context:
space:
mode:
authordmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4>2015-09-15 16:53:01 +0000
committerdmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4>2015-09-15 16:53:01 +0000
commitbe8122483a311bdafc87548222bea2f735e2c009 (patch)
treeb8835d6ddb4631db4e8d4f261d3286ea4d207b80 /gcc/c-family/c-indentation.c
parent5ee1325bcde94fdf30cc36398e763aa9e9cde68c (diff)
downloadgcc-be8122483a311bdafc87548222bea2f735e2c009.tar.gz
Change of location_get_source_line signature
gcc/ChangeLog: * input.h (location_get_source_line): Drop "expanded_location" param in favor of a file and line number. * input.c (location_get_source_line): Likewise. (dump_location_info): Update for change in signature of location_get_source_line. * diagnostic.c (diagnostic_print_caret_line): Likewise. gcc/c-family/ChangeLog: * c-format.c (location_from_offset): Update for change in signature of location_get_source_line. * c-indentation.c (get_visual_column): Likewise. (line_contains_hash_if): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227800 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family/c-indentation.c')
-rw-r--r--gcc/c-family/c-indentation.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/gcc/c-family/c-indentation.c b/gcc/c-family/c-indentation.c
index fdfe0a93412..dd3522360b4 100644
--- a/gcc/c-family/c-indentation.c
+++ b/gcc/c-family/c-indentation.c
@@ -45,7 +45,8 @@ get_visual_column (expanded_location exploc,
unsigned int *first_nws = NULL)
{
int line_len;
- const char *line = location_get_source_line (exploc, &line_len);
+ const char *line = location_get_source_line (exploc.file, exploc.line,
+ &line_len);
if (!line)
return false;
unsigned int vis_column = 0;
@@ -84,13 +85,8 @@ get_visual_column (expanded_location exploc,
static bool
line_contains_hash_if (const char *file, int line_num)
{
- expanded_location exploc;
- exploc.file = file;
- exploc.line = line_num;
- exploc.column = 1;
-
int line_len;
- const char *line = location_get_source_line (exploc, &line_len);
+ const char *line = location_get_source_line (file, line_num, &line_len);
if (!line)
return false;