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

src/ChangeLog

@@ -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>
 
 	* init.c, main.c, options.h: Add option --start-pos for specifying

src/ftp.c

@@ -802,8 +802,12 @@ Error in server response, closing control connection.\n"));
           abort ();
         }
         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)

src/url.c

@@ -1285,16 +1285,6 @@ append_null (struct growable *dest)
   *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. */
 static void
 append_char (char ch, struct growable *dest)

src/utils.c

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