From 226785838ae29964a0cb063d959273ab8e133da7 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 25 Mar 2014 11:56:58 +0100
Subject: [PATCH 1/2] url: remove shorten_string

The function wasn't used and caused a compiler warning:

url.c:1288:1: warning: 'shorten_length' defined but not used [-Wunused-function]
---
 src/ChangeLog |  4 ++++
 src/url.c     | 10 ----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 9b10ee8d..0d471ca8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/src/url.c b/src/url.c
index f32c7269..eda1f54e 100644
--- a/src/url.c
+++ b/src/url.c
@@ -1284,16 +1284,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)

From 97787110a2b6e99f80b277dbffdbbc4b0d608a55 Mon Sep 17 00:00:00 2001
From: Darshit Shah <darnir@gmail.com>
Date: Wed, 26 Mar 2014 00:51:04 +0100
Subject: [PATCH 2/2] Fix compiler warnings

---
 src/ChangeLog | 6 ++++++
 src/ftp.c     | 8 ++++++--
 src/utils.c   | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d471ca8..4f88172b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/src/ftp.c b/src/ftp.c
index 5282588d..00d753a8 100644
--- a/src/ftp.c
+++ b/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)
diff --git a/src/utils.c b/src/utils.c
index 4354668c..01be3ea2 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2509,7 +2509,7 @@ const char *
 test_dir_matches_p()
 {
   static struct {
-    const char *dirlist[3];
+    char *dirlist[3];
     const char *dir;
     bool result;
   } test_array[] = {