Fix compiler warnings

[wget] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index 8887e9c0ab47a1738f158f5fad3c4b5687f3c377..e244b8ad83232f09c26e53b09f6892288c1be5a0 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,11 +1,13 @@
 /* Declarations for utils.c.
 /* 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, 2008, 2009, 2010, 2011 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,25 +16,43 @@ 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.
-
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables.  You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL".  If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so.  If you do not wish to do
-so, delete this exception statement from your version.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */

 
 #ifndef UTILS_H
 #define UTILS_H
 
 
 #ifndef UTILS_H
 #define UTILS_H
 

-enum accd {
-   ALLABS = 1
-};
+/* Constant is using when we don`t know attempted size exactly */
+#define UNKNOWN_ATTEMPTED_SIZE -3
+
+/* Macros that interface to malloc, but know about type sizes, and
+   cast the result to the appropriate type.  The casts are not
+   necessary in standard C, but Wget performs them anyway for the sake
+   of pre-standard environments and possibly C++.  */
+
+#define xnew(type) (xmalloc (sizeof (type)))
+#define xnew0(type) (xcalloc (1, sizeof (type)))
+#define xnew_array(type, len) (xmalloc ((len) * sizeof (type)))
+#define xnew0_array(type, len) (xcalloc ((len), sizeof (type)))
+
+#define alloca_array(type, size) ((type *) alloca ((size) * sizeof (type)))
+
+#define xfree free
+/* Free P if it is non-NULL.  C requires free() to behaves this way by
+   default, but Wget's code is historically careful not to pass NULL
+   to free.  This allows us to assert p!=NULL in xfree to check
+   additional errors.  (But we currently don't do that!)  */
+#define xfree_null(p) if (!(p)) ; else xfree (p)

 
 struct hash_table;
 
 
 struct hash_table;
 


@@ -44,18 +64,14 @@ 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 *);
-
-#ifdef DEBUG_MALLOC
-void print_malloc_debug_stats ();
-#endif
+char *time_str (time_t);
+char *datetime_str (time_t);

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


@@ -69,20 +85,21 @@ wgint file_size (const char *);
 int make_directory (const char *);
 char *unique_name (const char *, bool);
 FILE *unique_create (const char *, bool, char **);
 int make_directory (const char *);
 char *unique_name (const char *, bool);
 FILE *unique_create (const char *, bool, char **);

-FILE *fopen_excl (const char *, bool);
+FILE *fopen_excl (const char *, int);

 char *file_merge (const char *, const char *);
 
 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 accept_url (const char *);
+bool accdir (const char *s);

 char *suffix (const char *s);
 bool match_tail (const char *, const char *, bool);
 bool has_wildcards_p (const char *);
 
 bool has_html_suffix_p (const char *);
 
 char *suffix (const char *s);
 bool match_tail (const char *, const char *, bool);
 bool has_wildcards_p (const char *);
 
 bool has_html_suffix_p (const char *);
 

-char *read_whole_line (FILE *);
-struct file_memory *read_file (const char *);
-void read_file_free (struct file_memory *);
+struct file_memory *wget_read_file (const char *);
+void wget_read_file_free (struct file_memory *);

 
 void free_vec (char **);
 char **merge_vecs (char **, char **);
 
 void free_vec (char **);
 char **merge_vecs (char **, char **);


@@ -110,6 +127,7 @@ 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);

+wgint convert_to_bits (wgint);

 
 int determine_screen_width (void);
 int random_number (int);
 
 int determine_screen_width (void);
 int random_number (int);


@@ -121,11 +139,23 @@ 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 *);
+size_t base64_encode (const void *, size_t, char *);
+ssize_t base64_decode (const char *, void *);
+
+#ifdef HAVE_LIBPCRE
+void *compile_pcre_regex (const char *);
+bool match_pcre_regex (const void *, const char *);
+#endif
+
+void *compile_posix_regex (const char *);
+bool match_posix_regex (const void *, const char *);

 
 void stable_sort (void *, size_t, size_t, int (*) (const void *, const void *));
 
 const char *print_decimal (double);
 
 
 void stable_sort (void *, size_t, size_t, int (*) (const void *, const void *));
 
 const char *print_decimal (double);
 

+long get_max_length (const char *path, int length, int name);
+
+extern unsigned char char_prop[];
+

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