X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Futils.h;h=8b1a8a11db0deccf794f09a6f11a12936b5e38ab;hp=bac112ed713d3e6cd7ffb2dd53f994550df35a25;hb=2f6aa1d7417df1dfc58597777686fbd77179b9fd;hpb=76780021d822779f839bbf85883292e15eb3f587

diff --git a/src/utils.h b/src/utils.h
index bac112ed..8b1a8a11 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,6 +1,7 @@
 /* Declarations for utils.c.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008 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.
 
@@ -31,8 +32,6 @@ as that of the covered work.  */
 #ifndef UTILS_H
 #define UTILS_H
 
-#ifdef USE_GNULIB_ALLOC
-
 /* Constant is using when we don`t know attempted size exactly */
 #define UNKNOWN_ATTEMPTED_SIZE -3
 
@@ -55,8 +54,6 @@ as that of the covered work.  */
    additional errors.  (But we currently don't do that!)  */
 #define xfree_null(p) if (!(p)) ; else xfree (p)
 
-#endif /* USE_GNULIB_ALLOC */
-
 struct hash_table;
 
 struct file_memory {
@@ -70,10 +67,6 @@ struct file_memory {
 char *time_str (time_t);
 char *datetime_str (time_t);
 
-#ifdef DEBUG_MALLOC
-void print_malloc_debug_stats ();
-#endif
-
 char *xstrdup_lower (const char *);
 
 char *strdupdelim (const char *, const char *);
@@ -92,7 +85,7 @@ wgint file_size (const 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 *);
 
 int fnmatch_nocase (const char *, const char *, int);
@@ -105,8 +98,8 @@ 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 **);
@@ -152,4 +145,6 @@ void stable_sort (void *, size_t, size_t, int (*) (const void *, const void *));
 
 const char *print_decimal (double);
 
+extern unsigned char char_prop[];
+
 #endif /* UTILS_H */