Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make _DIAGNOSTIC happy.

Browse Source
This commit is contained in:
tshiozak 2003-07-10 08:50:43 +00:00
parent 895c758622
commit 8adfd9b778
6 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libc/citrus/citrus_iconv.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_iconv.h,v 1.2 2003/07/01 09:42:15 tshiozak Exp $ */
/* $NetBSD: citrus_iconv.h,v 1.3 2003/07/10 08:50:43 tshiozak Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -58,8 +58,8 @@ _citrus_iconv_convert(struct _citrus_iconv * __restrict cv,
size_t * __restrict nresults)
{
_DIAGASSERT(cv && cv->cv_shared && cv->cv_shared->ci_ops
cv->cv_shared->ci_ops->io_convert && dst);
_DIAGASSERT(cv && cv->cv_shared && cv->cv_shared->ci_ops &&
cv->cv_shared->ci_ops->io_convert && out);
return (*cv->cv_shared->ci_ops->io_convert)(cv, in, inbytes, out,
outbytes, flags, nresults);

4
lib/libc/citrus/citrus_mapper.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_mapper.h,v 1.1 2003/06/25 09:51:36 tshiozak Exp $ */
/* $NetBSD: citrus_mapper.h,v 1.2 2003/07/10 08:50:44 tshiozak Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -95,7 +95,7 @@ _citrus_mapper_init_state(struct _citrus_mapper * __restrict cm,
void * __restrict ps)
{
_DIAGASSERT(cm && cm->cm_ops && cm->cm_ops_mo_init_state);
_DIAGASSERT(cm && cm->cm_ops && cm->cm_ops->mo_init_state);
(*cm->cm_ops->mo_init_state)(cm, ps);
}

8
lib/libc/citrus/citrus_stdenc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_stdenc.c,v 1.1 2003/06/25 09:51:40 tshiozak Exp $ */
/* $NetBSD: citrus_stdenc.c,v 1.2 2003/07/10 08:50:44 tshiozak Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: citrus_stdenc.c,v 1.1 2003/06/25 09:51:40 tshiozak Exp $");
__RCSID("$NetBSD: citrus_stdenc.c,v 1.2 2003/07/10 08:50:44 tshiozak Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -64,7 +64,7 @@ _citrus_stdenc_open(struct _citrus_stdenc * __restrict * __restrict rce,
_DIAGASSERT(encname != NULL);
_DIAGASSERT(!lenvar || variable!=NULL);
_DIAGASSERT(rcc != NULL);
_DIAGASSERT(rce != NULL);
if (!strcmp(encname, _CITRUS_DEFAULT_STDENC_NAME)) {
*rce = &_citrus_stdenc_default;
@ -141,7 +141,7 @@ void
_citrus_stdenc_close(struct _citrus_stdenc *ce)
{
_DIAGASSERT(ci != NULL);
_DIAGASSERT(ce != NULL);
if (ce == &_citrus_stdenc_default)
return;

4
lib/libc/citrus/citrus_stdenc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: citrus_stdenc.h,v 1.2 2003/06/26 12:09:56 tshiozak Exp $ */
/* $NetBSD: citrus_stdenc.h,v 1.3 2003/07/10 08:50:44 tshiozak Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@ -47,7 +47,7 @@ static __inline int
_citrus_stdenc_init_state(struct _citrus_stdenc * __restrict ce,
void * __restrict ps)
{
_DIAGASSERT(ce && ce->ci_ops && ce->ce_ops->eo_init_state);
_DIAGASSERT(ce && ce->ce_ops && ce->ce_ops->eo_init_state);
return (*ce->ce_ops->eo_init_state)(ce, ps);
}

7
lib/libc/net/inet_network.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inet_network.c,v 1.17 2003/05/05 21:35:42 bjh21 Exp $ */
/* $NetBSD: inet_network.c,v 1.18 2003/07/10 08:50:45 tshiozak Exp $ */
/*
* Copyright (c) 1983, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: inet_network.c,v 1.17 2003/05/05 21:35:42 bjh21 Exp $");
__RCSID("$NetBSD: inet_network.c,v 1.18 2003/07/10 08:50:45 tshiozak Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -49,6 +49,9 @@ __RCSID("$NetBSD: inet_network.c,v 1.17 2003/05/05 21:35:42 bjh21 Exp $");
#include <assert.h>
#include <ctype.h>
#ifdef _DIAGNOSTIC
#include <stddef.h> /* for NULL */
#endif
#ifdef __weak_alias
__weak_alias(inet_network,_inet_network)

6
lib/libc/string/wcstok.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wcstok.c,v 1.2 2003/03/07 06:46:39 tshiozak Exp $ */
/* $NetBSD: wcstok.c,v 1.3 2003/07/10 08:50:48 tshiozak Exp $ */
/*-
* Copyright (c) 1998 Softweyr LLC. All rights reserved.
@ -43,7 +43,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: wcstok.c,v 1.2 2003/03/07 06:46:39 tshiozak Exp $");
__RCSID("$NetBSD: wcstok.c,v 1.3 2003/07/10 08:50:48 tshiozak Exp $");
#endif
#include <assert.h>
@ -60,7 +60,7 @@ wcstok(s, delim, last)
wchar_t *tok;
/* s may be NULL */
_DIAGASSERT(delin != NULL);
_DIAGASSERT(delim != NULL);
_DIAGASSERT(last != NULL);
if (s == NULL && (s = *last) == NULL)