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

[wget] / src / convert.h

diff --git a/src/convert.h b/src/convert.h
index e9ca04012ac36631b5bc618c6cabb947c1603975..93efa769cd317d444baf256bc724ae38a3eb5895 100644 (file)
--- a/src/convert.h
+++ b/src/convert.h
@@ -1,11 +1,11 @@
 /* Declarations for convert.c
 /* Declarations for convert.c

-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003-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
 
 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,
  (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
 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
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the


@@ -30,6 +29,10 @@ so, delete this exception statement from your version.  */
 #ifndef CONVERT_H
 #define CONVERT_H
 
 #ifndef CONVERT_H
 #define CONVERT_H
 

+struct hash_table;             /* forward decl */
+extern struct hash_table *dl_url_file_map;
+extern struct hash_table *downloaded_html_set;
+

 enum convert_options {
   CO_NOCONVERT = 0,            /* don't convert this URL */
   CO_CONVERT_TO_RELATIVE,      /* convert to relative, e.g. to
 enum convert_options {
   CO_NOCONVERT = 0,            /* don't convert this URL */
   CO_CONVERT_TO_RELATIVE,      /* convert to relative, e.g. to


@@ -89,13 +92,15 @@ typedef enum
   CHECK_FOR_FILE
 } downloaded_file_t;
 
   CHECK_FOR_FILE
 } downloaded_file_t;
 

-downloaded_file_t downloaded_file PARAMS ((downloaded_file_t, const char *));
+downloaded_file_t downloaded_file (downloaded_file_t, const char *);
+
+void register_download (const char *, const char *);
+void register_redirection (const char *, const char *);
+void register_html (const char *, const char *);
+void register_delete_file (const char *);
+void convert_all_links (void);
+void convert_cleanup (void);

 
 

-void register_download PARAMS ((const char *, const char *));
-void register_redirection PARAMS ((const char *, const char *));
-void register_html PARAMS ((const char *, const char *));
-void register_delete_file PARAMS ((const char *));
-void convert_all_links PARAMS ((void));
-void convert_cleanup PARAMS ((void));
+char *html_quote_string (const char *);

 
 #endif /* CONVERT_H */
 
 #endif /* CONVERT_H */