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

Combine duplicated code.

Browse Source
This commit is contained in:
Steven Schubiger 2012-09-29 11:40:01 +02:00 committed by Giuseppe Scrivano
parent 959e5d1e90
commit e9845d2813
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2012-09-28 Steven Schubiger <stsc@member.fsf.org>
* src/recur.c (retrieve_tree): Combine duplicated code.
2012-09-02 Nguyễn Thái Ngọc Duy <pclouds@gmail.com> (tiny change) 2012-09-02 Nguyễn Thái Ngọc Duy <pclouds@gmail.com> (tiny change)
* src/main.c (main): mark more strings for translation. * src/main.c (main): mark more strings for translation.

21
src/recur.c
View File

@ -1,6 +1,6 @@
/* Handling of recursive HTTP retrieving. /* Handling of recursive HTTP retrieving.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
Inc. Inc.
This file is part of GNU Wget. This file is part of GNU Wget.
@ -253,25 +253,22 @@ retrieve_tree (struct url *start_url_parsed, struct iri *pi)
the second time. */ the second time. */
if (dl_url_file_map && hash_table_contains (dl_url_file_map, url)) if (dl_url_file_map && hash_table_contains (dl_url_file_map, url))
{ {
bool is_css_bool;
file = xstrdup (hash_table_get (dl_url_file_map, url)); file = xstrdup (hash_table_get (dl_url_file_map, url));
DEBUGP (("Already downloaded \"%s\", reusing it from \"%s\".\n", DEBUGP (("Already downloaded \"%s\", reusing it from \"%s\".\n",
url, file)); url, file));
/* this sucks, needs to be combined! */ if ((is_css_bool = (css_allowed
if (html_allowed
&& downloaded_html_set
&& string_set_contains (downloaded_html_set, file))
{
descend = true;
is_css = false;
}
if (css_allowed
&& downloaded_css_set && downloaded_css_set
&& string_set_contains (downloaded_css_set, file)) && string_set_contains (downloaded_css_set, file)))
|| (html_allowed
&& downloaded_html_set
&& string_set_contains (downloaded_html_set, file)))
{ {
descend = true; descend = true;
is_css = true; is_css = is_css_bool;
} }
} }
else else