Module Name: xsrc
Committed By: riz
Date: Mon Aug 22 17:47:07 UTC 2011
Modified Files:
xsrc/xfree/xc/extras/freetype2/src/lzw [netbsd-5]: zopen.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1661):
Additional pullup to fix build on some architectures
xfree/xc/extras/freetype2/src/lzw/zopen.c: revision 1.3
Don't assign errno here.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.10.1 -r1.1.1.1.10.2 \
xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c
diff -u xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c:1.1.1.1.10.1 xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c:1.1.1.1.10.2
--- xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c:1.1.1.1.10.1 Fri Aug 19 20:54:36 2011
+++ xsrc/xfree/xc/extras/freetype2/src/lzw/zopen.c Mon Aug 22 17:47:07 2011
@@ -1,5 +1,5 @@
/* $XFree86: xc/extras/freetype2/src/lzw/zopen.c,v 1.2 2004/12/16 22:15:48 tsi Exp $ */
-/* $NetBSD: zopen.c,v 1.1.1.1.10.1 2011/08/19 20:54:36 riz Exp $ */
+/* $NetBSD: zopen.c,v 1.1.1.1.10.2 2011/08/22 17:47:07 riz Exp $ */
/*-
* Copyright (c) 1985, 1986, 1992, 1993
@@ -47,7 +47,7 @@
#if 0
static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93";
#else
-static char rcsid[] = "$NetBSD: zopen.c,v 1.1.1.1.10.1 2011/08/19 20:54:36 riz Exp $";
+static char rcsid[] = "$NetBSD: zopen.c,v 1.1.1.1.10.2 2011/08/22 17:47:07 riz Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -242,7 +242,6 @@
if (code >= free_ent) {
if (code > free_ent || oldcode == -1) {
/* Bad stream. */
- errno = EINVAL;
return (-1);
}
*stackp++ = finchar;
