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

[wget] / src / xmalloc.c

diff --git a/src/xmalloc.c b/src/xmalloc.c
index bf4b9a3ed22fcee87fe4c77e568d7e5d41915cb4..427eefa8895222a0b836e32ecda5a6a28812d5ec 100644 (file)
--- a/src/xmalloc.c
+++ b/src/xmalloc.c
@@ -1,12 +1,12 @@
 /* Wrappers around malloc and memory debugging support.
-   Copyright (C) 2003-2005 Free Software Foundation, Inc.
+   Copyright (C) 2003-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
-the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+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,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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
-along with Wget; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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
@@ -357,7 +356,7 @@ debugging_free (void *ptr, const char *source_file, int source_line)
     }
   if (!unregister_ptr (ptr))
     {
-      fprintf (stderr, "%s: bad xfree(%0*lx) at %s:%d\n",
+      fprintf (stderr, "%s: bad xfree(0x%0*lx) at %s:%d\n",
               exec_name, PTR_FORMAT (ptr), source_file, source_line);
       abort ();
     }