Make get_utf8_encode() directly aware of ugly_no_encode and remove get_ugly_no_encode()

[wget] / src / iri.c

diff --git a/src/iri.c b/src/iri.c
index 5108d999c01561832f81dbe2f20e0b634bbe4e15..1f421d43f9cc3856cabb9ea944f05eb0f4112efc 100644 (file)
--- a/src/iri.c
+++ b/src/iri.c
@@ -381,7 +381,7 @@ void set_utf8_encode (bool encode)
 
 bool get_utf8_encode (void)
 {
-  return utf8_encode;
+  return (!ugly_no_encode && utf8_encode);
 }
 
 void set_ugly_no_encode (bool ugly)
@@ -389,8 +389,3 @@ void set_ugly_no_encode (bool ugly)
   ugly_no_encode = ugly;
 }
 
-bool get_ugly_no_encode (void)
-{
-  return ugly_no_encode;
-}
-