moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Saint Xavier 2008-07-20 19:29:51 +02:00
parent 24d68b7a25
commit 169a16fc7d
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/iri.c
View File

@ -381,7 +381,7 @@ void set_utf8_encode (bool encode)
bool get_utf8_encode (void) bool get_utf8_encode (void)
{ {
return utf8_encode; return (!ugly_no_encode && utf8_encode);
} }
void set_ugly_no_encode (bool ugly) void set_ugly_no_encode (bool ugly)
@ -389,8 +389,3 @@ void set_ugly_no_encode (bool ugly)
ugly_no_encode = ugly; ugly_no_encode = ugly;
} }
bool get_ugly_no_encode (void)
{
return ugly_no_encode;
}

1
src/iri.h
View File

@ -52,7 +52,6 @@ bool get_utf8_encode (void);
/* ugly ugly ugly */ /* ugly ugly ugly */
void set_ugly_no_encode (bool ugly); void set_ugly_no_encode (bool ugly);
bool get_ugly_no_encode (void);
#else /* ENABLE_IRI */ #else /* ENABLE_IRI */

2
src/url.c
View File

@ -671,7 +671,7 @@ url_parse (const char *url, int *error)
goto error; goto error;
} }
if (opt.enable_iri && get_utf8_encode () && !get_ugly_no_encode ()) if (opt.enable_iri && get_utf8_encode ())
{ {
const char *new; const char *new;
bool utf8_encode; bool utf8_encode;