X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funiwidth%2Fu32-width.c;h=32c41336188e1cbde35ade1ea4a2b5dddf4534b5;hb=87c5f6fccee477f7e2c67ea4c95e51a3afd83a41;hp=3d937651594a9f1e8b80158a80ce7c1ee1840b5f;hpb=0a7bf9475354b4b19c045341af5fc8feb944d985;p=gnulib.git diff --git a/lib/uniwidth/u32-width.c b/lib/uniwidth/u32-width.c index 3d9376515..32c413361 100644 --- a/lib/uniwidth/u32-width.c +++ b/lib/uniwidth/u32-width.c @@ -1,21 +1,19 @@ /* Determine display width of UTF-32 string. - Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006, 2009-2010 Free Software Foundation, Inc. Written by Bruno Haible , 2002. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published + by 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 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library 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. */ + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ #include @@ -34,11 +32,11 @@ u32_width (const uint32_t *s, size_t n, const char *encoding) int w; if (uc == 0) - break; /* end of string reached */ + break; /* end of string reached */ w = uc_width (uc, encoding); if (w >= 0) /* ignore control characters in the string */ - width += w; + width += w; } return width;