removed 'const' warnings.

[wget] / src / url.c

diff --git a/src/url.c b/src/url.c
index bcdf750bf3ebc0e32cc18fa2d1b312f0e393037e..e44dfcd2313282426d68e5b5e8591682d7296df7 100644 (file)
--- a/src/url.c
+++ b/src/url.c
@@ -1,6 +1,7 @@
 /* URL handling.
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+   Inc.
 
 This file is part of GNU Wget.
 
@@ -33,9 +34,7 @@ as that of the covered work.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <errno.h>
 #include <assert.h>
 
@@ -631,7 +630,7 @@ init_seps (enum url_scheme scheme)
     *p++ = '?';
   if (flags & scm_has_fragment)
     *p++ = '#';
-  *p++ = '\0';
+  *p = '\0';
   return seps;
 }
 
@@ -1503,9 +1502,9 @@ url_file_name (const struct url *u, char *replaced_filename)
 {
   struct growable fnres;        /* stands for "file name result" */
 
-  const char *u_file, *u_query;
+  const char *u_file;
   char *fname, *unique;
-  char *index_filename = "index.html"; /* The default index file is index.html */
+  const char *index_filename = "index.html"; /* The default index file is index.html */
 
   fnres.base = NULL;
   fnres.size = 0;
@@ -1562,12 +1561,11 @@ url_file_name (const struct url *u, char *replaced_filename)
       u_file = *u->file ? u->file : index_filename;
       append_uri_pathel (u_file, u_file + strlen (u_file), false, &fnres);
 
-      /* Append "?query" to the file name. */
-      u_query = u->query && *u->query ? u->query : NULL;
-      if (u_query)
+      /* Append "?query" to the file name, even if empty */
+      if (u->query)
        {
          append_char (FN_QUERY_SEP, &fnres);
-         append_uri_pathel (u_query, u_query + strlen (u_query),
+         append_uri_pathel (u->query, u->query + strlen (u->query),
                             true, &fnres);
        }
     }