[committed] libstdc++: Simplify print_raw function for debug assertions
Checks
Commit Message
Tested powerpc64le-linux. Pushed to trunk.
-- >8 --
Replace two uses of print_raw where it's clearer to just use fprintf
directly. Then the only remaining use of print_raw is as the print_func
argument of pretty_print. When called by pretty_print the count is
either a positive integer or -1, so we can simplify print_raw itself.
Remove the default argument, because it's never used. Remove the check
for nbc == 0, which never happens (but would be harmless if it did).
Replace the conditional expression with a single call to fprintf, using
INT_MAX as the maximum length.
libstdc++-v3/ChangeLog:
* src/c++11/debug.cc (print_raw): Simplify.
(print_word): Print indentation by calling fprintf directly.
(_Error_formatter::_M_error): Print unindented string by calling
fprintf directly.
---
libstdc++-v3/src/c++11/debug.cc | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
@@ -37,6 +37,7 @@
#include <cstdlib> // for std::abort
#include <cctype> // for std::isspace.
#include <cstring> // for std::strstr.
+#include <climits> // for INT_MAX
#include <algorithm> // for std::min.
@@ -609,14 +610,11 @@ namespace
{ print_word(ctx, word, Length - 1); }
void
- print_raw(PrintContext& ctx, const char* str, ptrdiff_t nbc = -1)
+ print_raw(PrintContext& ctx, const char* str, ptrdiff_t nbc)
{
- if (nbc != 0)
- {
- ctx._M_column += (nbc > 0)
- ? fprintf(stderr, "%.*s", (int)nbc, str)
- : fprintf(stderr, "%s", str);
- }
+ if (nbc == -1)
+ nbc = INT_MAX;
+ ctx._M_column += fprintf(stderr, "%.*s", (int)nbc, str);
}
void
@@ -645,12 +643,9 @@ namespace
|| (ctx._M_column + visual_length < ctx._M_max_length)
|| (visual_length >= ctx._M_max_length && ctx._M_column == 1))
{
- // If this isn't the first line, indent
+ // If this isn't the first line, indent.
if (ctx._M_column == 1 && !ctx._M_first_line)
- {
- const char spacing[PrintContext::_S_indent + 1] = " ";
- print_raw(ctx, spacing, PrintContext::_S_indent);
- }
+ ctx._M_column += fprintf(stderr, "%*c", PrintContext::_S_indent, ' ');
int written = fprintf(stderr, "%.*s", (int)length, word);
@@ -1166,7 +1161,7 @@ namespace __gnu_debug
PrintContext ctx;
if (_M_file)
{
- print_raw(ctx, _M_file);
+ ctx._M_column += fprintf(stderr, "%s", _M_file);
print_literal(ctx, ":");
go_to_next_line = true;
}