X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstriconv.c;h=7c8c142149e63fa576eecb0c4a456ae566fa176c;hb=f03c8d5562c251bfa6850372bb68d8eb346205f8;hp=29e76dffe5b589a47ca6ba6541f788271c1eefd8;hpb=99099106c3c1cb16ed1e91be970332fe225e278b;p=gnulib.git

diff --git a/lib/xstriconv.c b/lib/xstriconv.c
index 29e76dffe..7c8c14214 100644
--- a/lib/xstriconv.c
+++ b/lib/xstriconv.c
@@ -1,11 +1,11 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
-   This program is free software; you can redistribute it and/or modify
+   This program 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, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -31,7 +30,7 @@
 
 int
 xmem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
-	       char **resultp, size_t *lengthp)
+               char **resultp, size_t *lengthp)
 {
   int retval = mem_cd_iconv (src, srclen, cd, resultp, lengthp);