Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/citrus/modules UTF8EncodingInfo is an empty struct; ...



details:   https://anonhg.NetBSD.org/src/rev/30a767670407
branches:  trunk
changeset: 574775:30a767670407
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Mar 11 23:32:03 2005 +0000

description:
UTF8EncodingInfo is an empty struct; remove noop code and DIAGASSERT.
>From Joerg Sonnenberger

diffstat:

 lib/libc/citrus/modules/citrus_utf8.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r f0bf31c3151c -r 30a767670407 lib/libc/citrus/modules/citrus_utf8.c
--- a/lib/libc/citrus/modules/citrus_utf8.c     Fri Mar 11 22:52:04 2005 +0000
+++ b/lib/libc/citrus/modules/citrus_utf8.c     Fri Mar 11 23:32:03 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: citrus_utf8.c,v 1.11 2004/12/21 11:25:43 yamt Exp $    */
+/*     $NetBSD: citrus_utf8.c,v 1.12 2005/03/11 23:32:03 christos Exp $        */
 
 /*-
  * Copyright (c)2002 Citrus Project,
@@ -60,7 +60,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_utf8.c,v 1.11 2004/12/21 11:25:43 yamt Exp $");
+__RCSID("$NetBSD: citrus_utf8.c,v 1.12 2005/03/11 23:32:03 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <assert.h>
@@ -200,7 +200,6 @@
        int chlenbak;
 
        _DIAGASSERT(nresult != 0);
-       _DIAGASSERT(ei != NULL);
        _DIAGASSERT(s != NULL);
        _DIAGASSERT(psenc != NULL);
 
@@ -293,7 +292,6 @@
        int cnt, i, ret;
        wchar_t c;
 
-       _DIAGASSERT(ei != NULL);
        _DIAGASSERT(nresult != 0);
        _DIAGASSERT(s != NULL);
 
@@ -370,10 +368,7 @@
 _citrus_UTF8_encoding_module_init(_UTF8EncodingInfo * __restrict ei,
                                  const void * __restrict var, size_t lenvar)
 {
-       _DIAGASSERT(ei != NULL);
-
        _UTF8_init_count();
-       memset((void *)ei, 0, sizeof(*ei));
 
        return 0;
 }



Home | Main Index | Thread Index | Old Index