Module Name: src
Committed By: wiz
Date: Sun Feb 12 13:51:29 UTC 2012
Modified Files:
src/lib/libc/citrus/modules: citrus_iconv_std.c citrus_ues.c
citrus_utf1632.c
Log Message:
Remove unused variables. From cppcheck via Henning Petersen in PR 45997.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/citrus/modules/citrus_iconv_std.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/citrus/modules/citrus_ues.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/citrus/modules/citrus_utf1632.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/citrus/modules/citrus_iconv_std.c
diff -u src/lib/libc/citrus/modules/citrus_iconv_std.c:1.15 src/lib/libc/citrus/modules/citrus_iconv_std.c:1.16
--- src/lib/libc/citrus/modules/citrus_iconv_std.c:1.15 Mon Nov 13 19:08:19 2006
+++ src/lib/libc/citrus/modules/citrus_iconv_std.c Sun Feb 12 13:51:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_iconv_std.c,v 1.15 2006/11/13 19:08:19 tnozaki Exp $ */
+/* $NetBSD: citrus_iconv_std.c,v 1.16 2012/02/12 13:51:29 wiz Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iconv_std.c,v 1.15 2006/11/13 19:08:19 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_iconv_std.c,v 1.16 2012/02/12 13:51:29 wiz Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -418,7 +418,6 @@ _citrus_iconv_std_iconv_init_context(str
{
const struct _citrus_iconv_std_shared *is = cv->cv_shared->ci_closure;
struct _citrus_iconv_std_context *sc;
- int ret;
size_t szpssrc, szpsdst, sz;
char *ptr;
Index: src/lib/libc/citrus/modules/citrus_ues.c
diff -u src/lib/libc/citrus/modules/citrus_ues.c:1.2 src/lib/libc/citrus/modules/citrus_ues.c:1.3
--- src/lib/libc/citrus/modules/citrus_ues.c:1.2 Tue Dec 7 22:01:22 2010
+++ src/lib/libc/citrus/modules/citrus_ues.c Sun Feb 12 13:51:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_ues.c,v 1.2 2010/12/07 22:01:22 joerg Exp $ */
+/* $NetBSD: citrus_ues.c,v 1.3 2012/02/12 13:51:29 wiz Exp $ */
/*-
* Copyright (c)2006 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_ues.c,v 1.2 2010/12/07 22:01:22 joerg Exp $");
+__RCSID("$NetBSD: citrus_ues.c,v 1.3 2012/02/12 13:51:29 wiz Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -212,7 +212,7 @@ _citrus_UES_mbrtowc_priv(_UESEncodingInf
_UESState * __restrict psenc, size_t * __restrict nresult)
{
const char *s0;
- int ch, head, tail, i, num;
+ int ch, head, tail, num;
wchar_t hi, wc;
_DIAGASSERT(ei != NULL);
Index: src/lib/libc/citrus/modules/citrus_utf1632.c
diff -u src/lib/libc/citrus/modules/citrus_utf1632.c:1.11 src/lib/libc/citrus/modules/citrus_utf1632.c:1.12
--- src/lib/libc/citrus/modules/citrus_utf1632.c:1.11 Sat Mar 20 18:15:32 2010
+++ src/lib/libc/citrus/modules/citrus_utf1632.c Sun Feb 12 13:51:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_utf1632.c,v 1.11 2010/03/20 18:15:32 tnozaki Exp $ */
+/* $NetBSD: citrus_utf1632.c,v 1.12 2012/02/12 13:51:29 wiz Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_utf1632.c,v 1.11 2010/03/20 18:15:32 tnozaki Exp $");
+__RCSID("$NetBSD: citrus_utf1632.c,v 1.12 2012/02/12 13:51:29 wiz Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -250,7 +250,6 @@ _citrus_UTF1632_wcrtomb_priv(_UTF1632Enc
wchar_t wc, _UTF1632State *psenc,
size_t *nresult)
{
- int ret;
wchar_t wc2;
static const char _bom[4] = {
#if BYTE_ORDER == BIG_ENDIAN