github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-03-14 20:00:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct two merging mistakes in src/convert.h and src/http.c. Replace bootstrap.

Browse Source
This commit is contained in:
Ilim Ugur 2012-08-14 20:24:18 +03:00
parent eb01e9d442
commit fa9aaf2ce6
3 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bootstrap
View File

@ -197,8 +197,6 @@ use_git=true
# otherwise find the first of the NAMES that can be run (i.e.,
# supports --version). If found, set ENVVAR to the program name,
# die otherwise.
#
# FIXME: code duplication, see also gnu-web-doc-update.
find_tool ()
{
find_tool_envvar=$1
@ -456,14 +454,6 @@ check_versions() {
if [ 126 -le $? ]; then
warn "Error: '$app' not found"
ret=1
else
latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
if [ ! "$latest_ver" = "$inst_ver" ]; then
warnf_ '%s\n' \
"Error: '$app' version == $inst_ver is too old" \
" '$app' version >= $req_ver is required"
ret=1
fi
fi
else
# Require app to produce a new enough version string.

8
src/convert.h
View File

@ -99,14 +99,6 @@ typedef enum
downloaded_file_t downloaded_file (downloaded_file_t, const char *);
void register_download (const char *, const char *);
void register_redirection (const char *, const char *);
void register_html (const char *);
void register_css (const char *);
void register_delete_file (const char *);
void convert_all_links (void);
void convert_cleanup (void);
char *html_quote_string (const char *);
#endif /* CONVERT_H */

8
src/http.c
View File

@ -2193,12 +2193,12 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
using_ssl = pconn->ssl;
if (family == AF_INET6)
logprintf (LOG_VERBOSE, _("Reusing existing connection to [%s]:%d.\n"),
quotearg_style (escape_quoting_style, pconn.host),
pconn.port);
quotearg_style (escape_quoting_style, pconn->host),
pconn->port);
else
logprintf (LOG_VERBOSE, _("Reusing existing connection to %s:%d.\n"),
quotearg_style (escape_quoting_style, pconn.host),
pconn.port);
quotearg_style (escape_quoting_style, pconn->host),
pconn->port);
DEBUGP (("Reusing fd %d.\n", sock));
if (pconn->authorized)
#endif