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

Merge remote-tracking branch 'origin' into parallel-wget

Browse Source
This commit is contained in:
Giuseppe Scrivano 2014-03-31 20:55:31 +02:00
commit df96c81cf3
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -1,3 +1,13 @@
2014-03-26 Darshit Shah <darnir@gmail.com>
* ftp.c (getftp): Rearrange parameters to fix compiler warning
* utils.c (get_dir_matches_p): Do not pass a const char** to a function that
expects char**
2014-03-25 Daniel Stenberg <daniel@haxx.se>
* url.c (shorten_length): Remove unused function.
2014-03-19 Yousong Zhou <yszhou4tech@gmail.com> 2014-03-19 Yousong Zhou <yszhou4tech@gmail.com>
* init.c, main.c, options.h: Add option --start-pos for specifying * init.c, main.c, options.h: Add option --start-pos for specifying

8
src/ftp.c
View File

@ -802,8 +802,12 @@ Error in server response, closing control connection.\n"));
abort (); abort ();
} }
if (!opt.server_response) if (!opt.server_response)
logprintf (LOG_VERBOSE, expected_bytes ? "%s\n" : _("done.\n"), {
number_to_static_string (expected_bytes)); logprintf (LOG_VERBOSE, "%s\n",
expected_bytes ?
number_to_static_string (expected_bytes) :
_("done.\n"));
}
} }
if (cmd & DO_RETR && restval > 0 && restval == expected_bytes) if (cmd & DO_RETR && restval > 0 && restval == expected_bytes)

10
src/url.c
View File

@ -1285,16 +1285,6 @@ append_null (struct growable *dest)
*TAIL (dest) = 0; *TAIL (dest) = 0;
} }
/* Shorten DEST to LENGTH. */
static void
shorten_length (size_t length, struct growable *dest)
{
if (length < dest->tail)
dest->tail = length;
append_null (dest);
}
/* Append CH to DEST. */ /* Append CH to DEST. */
static void static void
append_char (char ch, struct growable *dest) append_char (char ch, struct growable *dest)

2
src/utils.c
View File

@ -2519,7 +2519,7 @@ const char *
test_dir_matches_p() test_dir_matches_p()
{ {
static struct { static struct {
const char *dirlist[3]; char *dirlist[3];
const char *dir; const char *dir;
bool result; bool result;
} test_array[] = { } test_array[] = {