[src/trunk]: src/lib/libc/citrus/modules revert r1.21, still problem exists f...

[tnozaki <tnozaki%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3e12c9ce25d8
branches:  trunk
changeset: 770279:3e12c9ce25d8
user:      tnozaki <tnozaki%NetBSD.org@localhost>
date:      Mon Oct 10 22:45:45 2011 +0000

description:
revert r1.21, still problem exists for posix2008 mbsnrtowcs(not yet commited),
but i have no time to investigate t_mbrtowc failure.

diffstat:

 lib/libc/citrus/modules/citrus_iso2022.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 648315eaf655 -r 3e12c9ce25d8 lib/libc/citrus/modules/citrus_iso2022.c
--- a/lib/libc/citrus/modules/citrus_iso2022.c  Mon Oct 10 22:18:08 2011 +0000
+++ b/lib/libc/citrus/modules/citrus_iso2022.c  Mon Oct 10 22:45:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: citrus_iso2022.c,v 1.21 2011/10/07 18:59:13 tnozaki Exp $      */
+/*     $NetBSD: citrus_iso2022.c,v 1.22 2011/10/10 22:45:45 tnozaki Exp $      */
 
 /*-
  * Copyright (c)1999, 2002 Citrus Project,
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iso2022.c,v 1.21 2011/10/07 18:59:13 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_iso2022.c,v 1.22 2011/10/10 22:45:45 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <assert.h>
@@ -695,7 +695,7 @@
                        if (n < sp->len) {
                                if (nmatch == n) {
                                        if (result)
-                                               *result = string + n;
+                                               *result = string;
                                        return (_ISO2022INVALID);
                                }
                        } else {
@@ -755,7 +755,7 @@
 
                /* we still need to wait for more characters to come */
                if (result)
-                       *result = string + n;
+                       *result = string;
                return (_ISO2022INVALID);
 
        case CS94:
@@ -765,7 +765,7 @@
 
                /* we still need to wait for more characters to come */
                if (result)
-                       *result = string + n;
+                       *result = string;
                return (_ISO2022INVALID);
        }