diff options
author | David Malcolm <dmalcolm@redhat.com> | 2017-10-17 19:41:01 +0000 |
---|---|---|
committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2017-10-17 19:41:01 +0000 |
commit | 89b6abbb7e4ba154dc5dd2458cd3ea93ddabd800 (patch) | |
tree | 6ce19e9d8c4044bd590ad1020c56f9554ed8559c /gcc/substring-locations.h | |
parent | 9efb55ac054852c4ea4f082504363c2a66f41dfe (diff) | |
download | gcc-89b6abbb7e4ba154dc5dd2458cd3ea93ddabd800.zip gcc-89b6abbb7e4ba154dc5dd2458cd3ea93ddabd800.tar.gz gcc-89b6abbb7e4ba154dc5dd2458cd3ea93ddabd800.tar.bz2 |
Simplify format_warning_at_substring API
The format_warning_at_substring API has a rather clunk way of indicating
the location of the pertinent param (if any): a source_range * is passed
in, which can be NULL. Doing so requires extracting a range from the
location_t and passing around a pointer to it, or NULL, as needed.
This patch simplifies things by eliminating the source_range * in
favor of a location_t, with UNKNOWN_LOCATION used to signify that
no param location is available.
gcc/c-family/ChangeLog:
* c-format.c (format_warning_at_char): Pass UNKNOWN_LOCATION
rather than NULL to format_warning_va.
(check_format_types): Likewise when calling format_type_warning.
Remove code to extract source_ranges and source_range * in favor
of just a location_t.
(format_type_warning): Convert source_range * param to a
location_t.
gcc/ChangeLog:
* gimple-ssa-sprintf.c (fmtwarn): Update for changed signature of
format_warning_at_substring.
(maybe_warn): Convert source_range * param to a location_t. Pass
UNKNOWN_LOCATION rather than NULL to fmtwarn.
(format_directive): Remove code to extract source_ranges and
source_range * in favor of just a location_t.
(parse_directive): Pass UNKNOWN_LOCATION rather than NULL to
fmtwarn.
* substring-locations.c (format_warning_va): Convert
source_range * param to a location_t.
(format_warning_at_substring): Likewise.
* substring-locations.h (format_warning_va): Likewise.
(format_warning_at_substring): Likewise.
From-SVN: r253827
Diffstat (limited to 'gcc/substring-locations.h')
-rw-r--r-- | gcc/substring-locations.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/substring-locations.h b/gcc/substring-locations.h index a91cc6c..3d7796d 100644 --- a/gcc/substring-locations.h +++ b/gcc/substring-locations.h @@ -77,13 +77,13 @@ class substring_loc /* Functions for emitting a warning about a format string. */ extern bool format_warning_va (const substring_loc &fmt_loc, - const source_range *param_range, + location_t param_loc, const char *corrected_substring, int opt, const char *gmsgid, va_list *ap) ATTRIBUTE_GCC_DIAG (5,0); extern bool format_warning_at_substring (const substring_loc &fmt_loc, - const source_range *param_range, + location_t param_loc, const char *corrected_substring, int opt, const char *gmsgid, ...) ATTRIBUTE_GCC_DIAG (5,0); |