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

[wget] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index 043924d4464251fab4a7f24452fcc3f4ad45e853..cb2dbbca191107ac5ed84a5d0dcde826b3eb4248 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,11 +1,11 @@
 /* Declarations for utils.c.
 /* Declarations for utils.c.

-   Copyright (C) 2005 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
 
 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,10 +29,6 @@ so, delete this exception statement from your version.  */
 #ifndef UTILS_H
 #define UTILS_H
 
 #ifndef UTILS_H
 #define UTILS_H
 

-enum accd {
-   ALLABS = 1
-};
-

 struct hash_table;
 
 struct file_memory {
 struct hash_table;
 
 struct file_memory {


@@ -44,8 +39,8 @@ struct file_memory {
 
 #define HYPHENP(x) (*(x) == '-' && !*((x) + 1))
 
 
 #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 ();
 
 #ifdef DEBUG_MALLOC
 void print_malloc_debug_stats ();


@@ -55,7 +50,7 @@ char *xstrdup_lower (const char *);
 
 char *strdupdelim (const char *, const char *);
 char **sepstring (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);
 void fork_to_background (void);
 
 char *aprintf (const char *, ...) GCC_FORMAT_ATTR (1, 2);


@@ -72,8 +67,9 @@ FILE *unique_create (const char *, bool, char **);
 FILE *fopen_excl (const char *, bool);
 char *file_merge (const char *, const 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 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 *);
 char *suffix (const char *s);
 bool match_tail (const char *, const char *, bool);
 bool has_wildcards_p (const char *);


@@ -94,11 +90,19 @@ void string_set_to_array (struct hash_table *, char **);
 void string_set_free (struct hash_table *);
 void free_keys_and_values (struct hash_table *);
 
 void string_set_free (struct hash_table *);
 void free_keys_and_values (struct hash_table *);
 

-char *with_thousand_seps (wgint);
-#ifndef with_thousand_seps_sum
-char *with_thousand_seps_sum (SUM_SIZE_INT);
+const char *with_thousand_seps (wgint);
+
+/* human_readable must be able to accept wgint and SUM_SIZE_INT
+   arguments.  On machines where wgint is 32-bit, declare it to accept
+   double.  */
+#if SIZEOF_WGINT >= 8
+# define HR_NUMTYPE wgint
+#else
+# define HR_NUMTYPE double

 #endif
 #endif

-char *human_readable (wgint);
+char *human_readable (HR_NUMTYPE);
+
+

 int numdigit (wgint);
 char *number_to_string (char *, wgint);
 char *number_to_static_string (wgint);
 int numdigit (wgint);
 char *number_to_string (char *, wgint);
 char *number_to_static_string (wgint);


@@ -113,9 +117,11 @@ void xsleep (double);
 /* How many bytes it will take to store LEN bytes in base64.  */
 #define BASE64_LENGTH(len) (4 * (((len) + 2) / 3))
 
 /* 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 *));
 
 
 void stable_sort (void *, size_t, size_t, int (*) (const void *, const void *));
 

+const char *print_decimal (double);
+

 #endif /* UTILS_H */
 #endif /* UTILS_H */