[src/trunk]: src/lib/libc/citrus/modules The correct fix for lib/51000 is not...

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

details:   https://anonhg.NetBSD.org/src/rev/bb42614b38cd
branches:  trunk
changeset: 457621:bb42614b38cd
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Mon Jul 08 06:45:01 2019 +0000

description:
The correct fix for lib/51000 is not to remove the apparently dead assignment
but to add the missing usage.

>From https://bitbucket.org/tnozaki/netbsd/commits/24b35fdce250
Thanks to Takehiko Nozaki

diffstat:

 lib/libc/citrus/modules/citrus_johab.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 59e3797e2d18 -r bb42614b38cd lib/libc/citrus/modules/citrus_johab.c
--- a/lib/libc/citrus/modules/citrus_johab.c    Mon Jul 08 03:22:38 2019 +0000
+++ b/lib/libc/citrus/modules/citrus_johab.c    Mon Jul 08 06:45:01 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_johab.c,v 1.6 2016/05/31 03:34:14 dholland Exp $ */
+/* $NetBSD: citrus_johab.c,v 1.7 2019/07/08 06:45:01 mlelstv Exp $ */
 
 /*-
  * Copyright (c)2006 Citrus Project,
@@ -27,7 +27,7 @@
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_johab.c,v 1.6 2016/05/31 03:34:14 dholland Exp $");
+__RCSID("$NetBSD: citrus_johab.c,v 1.7 2019/07/08 06:45:01 mlelstv Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -349,9 +349,10 @@
                l = ((idx >> 8) & 0xFF) - n;
                t = (idx & 0xFF) - 0x21;
                linear = (l * 94) + t;
-               /*l = (linear / 188) + m;*/
+               l = (linear / 188) + m;
                t = linear % 188;
                t += (t <= 0x4D) ? 0x31 : 0x43;
+               *wc = (wchar_t)((l << 8) | t);
                break;
        default:
                return EILSEQ;