[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / url.h

diff --git a/src/url.h b/src/url.h
index 750f3f5cda6815606c046b185632a6514817e1b3..f4b6b7e19a13b5eb121a51dcbfab9dad7404e4ec 100644 (file)
--- a/src/url.h
+++ b/src/url.h
@@ -1,11 +1,11 @@
 /* Declarations for url.c.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
@@ -73,28 +72,30 @@ struct url
 
 /* Function declarations */
 
-char *url_escape PARAMS ((const char *));
+char *url_escape (const char *);
 
-struct url *url_parse PARAMS ((const char *, int *));
-const char *url_error PARAMS ((int));
-char *url_full_path PARAMS ((const struct url *));
-void url_set_dir PARAMS ((struct url *, const char *));
-void url_set_file PARAMS ((struct url *, const char *));
-void url_free PARAMS ((struct url *));
+struct url *url_parse (const char *, int *);
+const char *url_error (int);
+char *url_full_path (const struct url *);
+void url_set_dir (struct url *, const char *);
+void url_set_file (struct url *, const char *);
+void url_free (struct url *);
 
-enum url_scheme url_scheme PARAMS ((const char *));
-int url_has_scheme PARAMS ((const char *));
-int scheme_default_port PARAMS ((enum url_scheme));
-void scheme_disable PARAMS ((enum url_scheme));
+enum url_scheme url_scheme (const char *);
+bool url_has_scheme (const char *);
+int scheme_default_port (enum url_scheme);
+void scheme_disable (enum url_scheme);
 
-char *url_string PARAMS ((const struct url *, int));
-char *url_file_name PARAMS ((const struct url *));
+char *url_string (const struct url *, bool);
+char *url_file_name (const struct url *);
 
-char *uri_merge PARAMS ((const char *, const char *));
+char *uri_merge (const char *, const char *);
 
-int mkalldirs PARAMS ((const char *));
+int mkalldirs (const char *);
 
-char *rewrite_shorthand_url PARAMS ((const char *));
-int schemes_are_similar_p PARAMS ((enum url_scheme a, enum url_scheme b));
+char *rewrite_shorthand_url (const char *);
+bool schemes_are_similar_p (enum url_scheme a, enum url_scheme b);
+
+bool are_urls_equal (const char *u1, const char *u2);
 
 #endif /* URL_H */