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

[wget] / src / cookies.h

diff --git a/src/cookies.h b/src/cookies.h
index d9dc477c8e44943c2318704ff52028dca85d3649..48058ae60c6bb662177a3344a769afa9bb7a8a01 100644 (file)
--- a/src/cookies.h
+++ b/src/cookies.h
@@ -1,11 +1,11 @@
 /* Support for cookies.
 /* Support for cookies.

-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-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 (at
+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, but
 your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful, but


@@ -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
 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


@@ -32,16 +31,15 @@ so, delete this exception statement from your version.  */
 
 struct cookie_jar;
 
 
 struct cookie_jar;
 

-struct cookie_jar *cookie_jar_new PARAMS ((void));
-void cookie_jar_delete PARAMS ((struct cookie_jar *));
+struct cookie_jar *cookie_jar_new (void);
+void cookie_jar_delete (struct cookie_jar *);

 
 

-void cookie_jar_process_set_cookie PARAMS ((struct cookie_jar *, const char *,
-                                           int, const char *, const char *));
-char *cookie_jar_generate_cookie_header PARAMS ((struct cookie_jar *,
-                                                const char *, int,
-                                                const char *, int));
+void cookie_handle_set_cookie (struct cookie_jar *, const char *, int,
+                              const char *, const char *);
+char *cookie_header (struct cookie_jar *, const char *, int,
+                    const char *, bool);

 
 

-void cookie_jar_load PARAMS ((struct cookie_jar *, const char *));
-void cookie_jar_save PARAMS ((struct cookie_jar *, const char *));
+void cookie_jar_load (struct cookie_jar *, const char *);
+void cookie_jar_save (struct cookie_jar *, const char *);

 
 #endif /* COOKIES_H */
 
 #endif /* COOKIES_H */