diff options
author | Thomas White <taw@physics.org> | 2012-05-31 13:48:42 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2012-05-31 13:48:42 +0200 |
commit | 13770d8553f9696c1c4c0c56703717524c028d86 (patch) | |
tree | 23c9f11f0407207ad24a8f7a4f6c72d52d0e7822 /lib/strnlen.c | |
parent | 6ff1bbbd0deeac54175fc862a6e1b53374ae6306 (diff) | |
parent | b6e0b7972e3dbdace0034d439b992faf3ac8c454 (diff) |
Merge branch 'master' into tom/speed
Conflicts:
.gitignore
Diffstat (limited to 'lib/strnlen.c')
-rw-r--r-- | lib/strnlen.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/strnlen.c b/lib/strnlen.c index 3cefa978..d36180dc 100644 --- a/lib/strnlen.c +++ b/lib/strnlen.c @@ -1,5 +1,5 @@ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify @@ -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> |