File wget-dont-free-dcgettext.patch of Package wget.31872
Index: wget-1.14/src/html-url.c
===================================================================
--- wget-1.14.orig/src/html-url.c
+++ wget-1.14/src/html-url.c
@@ -807,11 +807,9 @@ get_urls_file (const char *file)
url = url_parse (url_text, &up_error_code, NULL, false);
if (!url)
{
- char *error = url_error (url_text, up_error_code);
logprintf (LOG_NOTQUIET, _("%s: Invalid URL %s: %s\n"),
- file, url_text, error);
+ file, url_text, url_error (url_text, up_error_code));
xfree (url_text);
- xfree (error);
inform_exit_status (URLERROR);
continue;
}
Index: wget-1.14/src/main.c
===================================================================
--- wget-1.14.orig/src/main.c
+++ wget-1.14/src/main.c
@@ -1533,10 +1533,9 @@ outputting to a regular file.\n"));
if (!url_parsed)
{
- char *error = url_error (*t, url_err);
- logprintf (LOG_NOTQUIET, "%s: %s.\n",*t, error);
- xfree (error);
+ logprintf (LOG_NOTQUIET, "%s: %s.\n",*t, url_error (*t, url_err));
inform_exit_status (URLERROR);
+ continue;
}
else
{
Index: wget-1.14/src/res.c
===================================================================
--- wget-1.14.orig/src/res.c
+++ wget-1.14/src/res.c
@@ -555,9 +555,7 @@ res_retrieve_file (const char *url, char
url_parsed = url_parse (robots_url, &url_err, i, true);
if (!url_parsed)
{
- char *error = url_error (robots_url, url_err);
- logprintf (LOG_NOTQUIET, "%s: %s.\n", robots_url, error);
- xfree (error);
+ logprintf (LOG_NOTQUIET, "%s: %s.\n", robots_url, url_error (robots_url, url_err));
err = URLERROR;
}
else
Index: wget-1.14/src/retr.c
===================================================================
--- wget-1.14.orig/src/retr.c
+++ wget-1.14/src/retr.c
@@ -760,11 +760,9 @@ retrieve_url (struct url * orig_parsed,
proxy_url = url_parse (proxy, &up_error_code, NULL, true);
if (!proxy_url)
{
- char *error = url_error (proxy, up_error_code);
logprintf (LOG_NOTQUIET, _("Error parsing proxy URL %s: %s.\n"),
- proxy, error);
+ proxy, url_error (proxy, up_error_code));
xfree (url);
- xfree (error);
RESTORE_POST_DATA;
result = PROXERR;
goto bail;
@@ -848,16 +846,14 @@ retrieve_url (struct url * orig_parsed,
newloc_parsed = url_parse (mynewloc, &up_error_code, iri, true);
if (!newloc_parsed)
{
- char *error = url_error (mynewloc, up_error_code);
logprintf (LOG_NOTQUIET, "%s: %s.\n", escnonprint_uri (mynewloc),
- error);
+ url_error (mynewloc, up_error_code));
if (orig_parsed != u)
{
url_free (u);
}
xfree (url);
xfree (mynewloc);
- xfree (error);
RESTORE_POST_DATA;
goto bail;
}
@@ -1005,9 +1001,7 @@ retrieve_from_file (const char *file, bo
struct url *url_parsed = url_parse (url, &url_err, iri, true);
if (!url_parsed)
{
- char *error = url_error (url, url_err);
- logprintf (LOG_NOTQUIET, "%s: %s.\n", url, error);
- xfree (error);
+ logprintf (LOG_NOTQUIET, "%s: %s.\n", url, url_error (url, url_err));
return URLERROR;
}