From 618727dae5ee7eb18e42be3d520496da3431e70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 30 Jul 2020 17:08:39 +0200 Subject: [PATCH] basic/utf8: rename parameter Every time I was using this function I had to check whether "newline" means that newlines are good or bad. --- src/basic/utf8.c | 4 ++-- src/basic/utf8.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/utf8.c b/src/basic/utf8.c index c857185ec8..174075be54 100644 --- a/src/basic/utf8.c +++ b/src/basic/utf8.c @@ -123,7 +123,7 @@ int utf8_encoded_to_unichar(const char *str, char32_t *ret_unichar) { return 0; } -bool utf8_is_printable_newline(const char* str, size_t length, bool newline) { +bool utf8_is_printable_newline(const char* str, size_t length, bool allow_newline) { const char *p; assert(str); @@ -140,7 +140,7 @@ bool utf8_is_printable_newline(const char* str, size_t length, bool newline) { r = utf8_encoded_to_unichar(p, &val); if (r < 0 || unichar_is_control(val) || - (!newline && val == '\n')) + (!allow_newline && val == '\n')) return false; length -= encoded_len; diff --git a/src/basic/utf8.h b/src/basic/utf8.h index 62e99b7280..52b487955b 100644 --- a/src/basic/utf8.h +++ b/src/basic/utf8.h @@ -18,7 +18,7 @@ char *utf8_is_valid(const char *s) _pure_; char *ascii_is_valid(const char *s) _pure_; char *ascii_is_valid_n(const char *str, size_t len); -bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pure_; +bool utf8_is_printable_newline(const char* str, size_t length, bool allow_newline) _pure_; #define utf8_is_printable(str, length) utf8_is_printable_newline(str, length, true) char *utf8_escape_invalid(const char *s);