[svn] Applied Christian Fraenkel's patch "custom certificate patch for wget-1.7+dev;

[wget] / src / wget.h

diff --git a/src/wget.h b/src/wget.h
index b3c9ca053797b8a88665a14d039c340704054c2c..86fa953d99f69807d797bb6d87ea4979de5f6c2f 100644 (file)
--- a/src/wget.h
+++ b/src/wget.h
@@ -101,12 +101,11 @@ void logputs PARAMS ((enum log_options, const char *));
 #ifndef DEBUG_MALLOC
 
 #define xmalloc  xmalloc_real
-#define xfree    xfree_real
 #define xrealloc xrealloc_real
 #define xstrdup  xstrdup_real
+#define xfree    free
 
 void *xmalloc_real PARAMS ((size_t));
-void xfree_real PARAMS ((void *));
 void *xrealloc_real PARAMS ((void *, size_t));
 char *xstrdup_real PARAMS ((const char *));
 
@@ -225,7 +224,7 @@ char *xstrdup_debug PARAMS ((const char *, const char *, int));
 /* [Is this weird hack really necessary on any compilers?  No ANSI C compiler
     should complain about "extern const char *exec_name;" followed by
     "const char *exec_name;".  Are we doing this for K&R compilers, or...??
-    -- Dan Harkless <dan-wget@dilvish.speed.net>] */
+    -- Dan Harkless <wget@harkless.org>] */
 #ifndef OPTIONS_DEFINED_HERE
 extern const char *exec_name;
 #endif
@@ -246,19 +245,20 @@ enum
    This is, of course, utter crock.  */
 typedef enum
 {
-  NOCONERROR, HOSTERR, CONSOCKERR, CONERROR,
+  NOCONERROR, HOSTERR, CONSOCKERR, CONERROR, CONSSLERR,
   CONREFUSED, NEWLOCATION, NOTENOUGHMEM, CONPORTERR,
   BINDERR, BINDOK, LISTENERR, ACCEPTERR, ACCEPTOK,
   CONCLOSED, FTPOK, FTPLOGINC, FTPLOGREFUSED, FTPPORTERR,
   FTPNSFOD, FTPRETROK, FTPUNKNOWNTYPE, FTPRERR,
-  FTPREXC, FTPSRVERR, FTPRETRINT, FTPRESTFAIL,
+  FTPREXC, FTPSRVERR, FTPRETRINT, FTPRESTFAIL, URLHTTPS,
   URLOK, URLHTTP, URLFTP, URLFILE, URLUNKNOWN, URLBADPORT,
   URLBADHOST, FOPENERR, FWRITEERR, HOK, HLEXC, HEOF,
   HERR, RETROK, RECLEVELEXC, FTPACCDENIED, WRONGCODE,
   FTPINVPASV, FTPNOPASV,
   RETRFINISHED, READERR, TRYLIMEXC, URLBADPATTERN,
   FILEBADFILE, RANGEERR, RETRBADPATTERN, RETNOTSUP,
-  ROBOTSOK, NOROBOTS, PROXERR, AUTHFAILED, QUOTEXC, WRITEFAILED
+  ROBOTSOK, NOROBOTS, PROXERR, AUTHFAILED, QUOTEXC, WRITEFAILED,
+  SSLERRCERTFILE,SSLERRCERTKEY,SSLERRCTXCREATE
 } uerr_t;
 
 typedef unsigned char  boolean;