diff --git a/lib/libc/citrus/citrus_iconv.c b/lib/libc/citrus/citrus_iconv.c
index 89d69dcc64fa..a5d5517ee853 100644
--- a/lib/libc/citrus/citrus_iconv.c
+++ b/lib/libc/citrus/citrus_iconv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: citrus_iconv.c,v 1.6 2004/12/30 05:03:48 christos Exp $	*/
+/*	$NetBSD: citrus_iconv.c,v 1.7 2008/07/25 14:05:25 christos Exp $	*/
 
 /*-
  * Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_iconv.c,v 1.6 2004/12/30 05:03:48 christos Exp $");
+__RCSID("$NetBSD: citrus_iconv.c,v 1.7 2008/07/25 14:05:25 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -326,7 +326,7 @@ _citrus_iconv_open(struct _citrus_iconv * __restrict * __restrict rcv,
 		   const char * __restrict src, const char * __restrict dst)
 {
 	int ret;
-	struct _citrus_iconv_shared *ci;
+	struct _citrus_iconv_shared *ci = NULL;
 	struct _citrus_iconv *cv;
 	char realsrc[PATH_MAX], realdst[PATH_MAX];
 	char buf[PATH_MAX], path[PATH_MAX];
diff --git a/lib/libc/citrus/citrus_mapper.c b/lib/libc/citrus/citrus_mapper.c
index d91fa4b0b8e0..cef71bac663a 100644
--- a/lib/libc/citrus/citrus_mapper.c
+++ b/lib/libc/citrus/citrus_mapper.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: citrus_mapper.c,v 1.6 2004/12/30 05:05:01 christos Exp $	*/
+/*	$NetBSD: citrus_mapper.c,v 1.7 2008/07/25 14:05:25 christos Exp $	*/
 
 /*-
  * Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_mapper.c,v 1.6 2004/12/30 05:05:01 christos Exp $");
+__RCSID("$NetBSD: citrus_mapper.c,v 1.7 2008/07/25 14:05:25 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -319,7 +319,7 @@ _citrus_mapper_open(struct _citrus_mapper_area *__restrict ma,
 {
 	int ret;
 	char linebuf[PATH_MAX];
-	const char *module, *variable;
+	const char *module, *variable = NULL;
 	struct _citrus_mapper *cm;
 	int hashval;
 
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index c7fc2bef144e..15270b726161 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpcb_clnt.c,v 1.23 2008/04/25 23:51:41 dogcow Exp $	*/
+/*	$NetBSD: rpcb_clnt.c,v 1.24 2008/07/25 14:05:25 christos Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
 #else
-__RCSID("$NetBSD: rpcb_clnt.c,v 1.23 2008/04/25 23:51:41 dogcow Exp $");
+__RCSID("$NetBSD: rpcb_clnt.c,v 1.24 2008/07/25 14:05:25 christos Exp $");
 #endif
 #endif
 
@@ -337,6 +337,7 @@ getclnthandle(host, nconf, targaddr)
 	/* Get the address of the rpcbind.  Check cache first */
 	client = NULL;
 	addr_to_delete.len = 0;
+	addr_to_delete.buf = NULL;
 	rwlock_rdlock(&rpcbaddr_cache_lock);
 	ad_cache = check_cache(host, nconf->nc_netid);
 	if (ad_cache != NULL) {