From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 30 Jul 2020 15:08:39 +0000 (+0200)
Subject: basic/utf8: rename parameter
X-Git-Tag: v247-rc1~411^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=618727dae5ee7eb18e42be3d520496da3431e70a;p=thirdparty%2Fsystemd.git

basic/utf8: rename parameter

Every time I was using this function I had to check whether "newline"
means that newlines are good or bad.
---

diff --git a/src/basic/utf8.c b/src/basic/utf8.c
index c857185ec85..174075be549 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 62e99b72802..52b487955b1 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);