Merge with mainline

[wget] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index 8887e9c0ab47a1738f158f5fad3c4b5687f3c377..8f30c14013557a74fba82f85c38e131344b027b0 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,11 +1,12 @@
 /* Declarations for utils.c.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 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 +15,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
@@ -30,10 +30,6 @@ so, delete this exception statement from your version.  */
 #ifndef UTILS_H
 #define UTILS_H
 
-enum accd {
-   ALLABS = 1
-};
-
 struct hash_table;
 
 struct file_memory {
@@ -44,8 +40,8 @@ struct file_memory {
 
 #define HYPHENP(x) (*(x) == '-' && !*((x) + 1))
 
-char *time_str (time_t *);
-char *datetime_str (time_t *);
+char *time_str (time_t);
+char *datetime_str (time_t);
 
 #ifdef DEBUG_MALLOC
 void print_malloc_debug_stats ();
@@ -55,7 +51,7 @@ char *xstrdup_lower (const char *);
 
 char *strdupdelim (const char *, const char *);
 char **sepstring (const char *);
-bool frontcmp (const char *, const char *);
+bool subdir_p (const char *, const char *);
 void fork_to_background (void);
 
 char *aprintf (const char *, ...) GCC_FORMAT_ATTR (1, 2);
@@ -72,8 +68,9 @@ FILE *unique_create (const char *, bool, char **);
 FILE *fopen_excl (const char *, bool);
 char *file_merge (const char *, const char *);
 
+int fnmatch_nocase (const char *, const char *, int);
 bool acceptable (const char *);
-bool accdir (const char *s, enum accd);
+bool accdir (const char *s);
 char *suffix (const char *s);
 bool match_tail (const char *, const char *, bool);
 bool has_wildcards_p (const char *);
@@ -121,8 +118,8 @@ void xsleep (double);
 /* How many bytes it will take to store LEN bytes in base64.  */
 #define BASE64_LENGTH(len) (4 * (((len) + 2) / 3))
 
-int base64_encode (const char *, int, char *);
-int base64_decode (const char *, char *);
+int base64_encode (const void *, int, char *);
+int base64_decode (const char *, void *);
 
 void stable_sort (void *, size_t, size_t, int (*) (const void *, const void *));