X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fcookies.c;h=854139046c65f009ed7d1928ac2291f110b59b8c;hp=1258472a13d1d6f02226e4030db417978a2c7668;hb=d763f8bf6d6e13ce006ffab616cc8a77e747a633;hpb=76780021d822779f839bbf85883292e15eb3f587

diff --git a/src/cookies.c b/src/cookies.c
index 1258472a..85413904 100644
--- a/src/cookies.c
+++ b/src/cookies.c
@@ -43,8 +43,6 @@ as that of the covered work.  */
    sites that do send Set-Cookie2 also emit Set-Cookie for
    compatibility.  */
 
-#define USE_GNULIB_ALLOC
-
 #include "wget.h"
 
 #include <stdio.h>
@@ -443,7 +441,8 @@ parse_set_cookie (const char *set_cookie, bool silent)
   if (!silent)
     logprintf (LOG_NOTQUIET,
                _("Syntax error in Set-Cookie: %s at position %d.\n"),
-               escnonprint (set_cookie), (int) (ptr - set_cookie));
+               quotearg_style (escape_quoting_style, set_cookie), 
+               (int) (ptr - set_cookie));
   delete_cookie (cookie);
   return NULL;
 }
@@ -588,7 +587,7 @@ check_domain_match (const char *cookie_domain, const char *host)
 
     if (dccount == 2)
       {
-        int i;
+        size_t i;
         int known_toplevel = false;
         static const char *known_toplevel_domains[] = {
           ".com", ".edu", ".net", ".org", ".gov", ".mil", ".int"
@@ -685,7 +684,8 @@ cookie_handle_set_cookie (struct cookie_jar *jar,
         {
           logprintf (LOG_NOTQUIET,
                      _("Cookie coming from %s attempted to set domain to %s\n"),
-                     escnonprint (host), escnonprint (cookie->domain));
+                     quotearg_style (escape_quoting_style, host), 
+                     quotearg_style (escape_quoting_style, cookie->domain));
           xfree (cookie->domain);
           goto copy_domain;
         }