From bb2df7254a0fdad7de4707830e579f3a49e75a91 Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Mon, 10 Oct 2005 17:37:45 +0000
Subject: fix a few warnings, keep the crypt stuff for later. okay otto@

---
 lib/libc/gen/opendir.c       | 18 +-----------------
 lib/libc/locale/rune_local.h |  5 ++++-
 lib/libc/stdio/fscanf.c      |  4 ++--
 lib/libc/stdio/local.h       |  3 ++-
 lib/libc/stdlib/hcreate.c    |  4 ++--
 5 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index 00d2cb75746..e407dd4b815 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opendir.c,v 1.14 2005/08/08 08:05:34 espie Exp $ */
+/*	$OpenBSD: opendir.c,v 1.15 2005/10/10 17:37:43 espie Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -40,22 +40,6 @@
 #include <string.h>
 #include <unistd.h>
 
-static int direntcmp(const void *, const void *);
-
-/*
- * Comparison function for sorting dirent structures that never returns 0;
- * this causes qsort() to emulate a stable sort.
- */
-static int
-direntcmp(const void *d1, const void *d2)
-{
-	int i;
-
-	i = strcmp((*(struct dirent **)d1)->d_name,
-	    (*(struct dirent **)d2)->d_name);
-	return (i != 0 ? i : (char *)d2 - (char *)d1);
-}
-
 /*
  * Open a directory.
  */
diff --git a/lib/libc/locale/rune_local.h b/lib/libc/locale/rune_local.h
index c482d5e53b1..8efe8b48f20 100644
--- a/lib/libc/locale/rune_local.h
+++ b/lib/libc/locale/rune_local.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: rune_local.h,v 1.1 2005/08/07 10:16:24 espie Exp $ */
+/* 	$OpenBSD: rune_local.h,v 1.2 2005/10/10 17:37:44 espie Exp $ */
 /*	$NetBSD: rune_local.h,v 1.7 2003/03/02 22:18:15 tshiozak Exp $	*/
 
 /*-
@@ -43,4 +43,7 @@ extern int _newrunelocale(const char *);
 extern int __make_ctype_tabs(_RuneLocale *);
 extern void __install_currentrunelocale_ctype();
 
+/* ___runetype_mb.c */
+extern _RuneType ___runetype_mb(wint_t);
+
 #endif
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index 8b4b49642e7..2f3fcebb21b 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fscanf.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */
+/*	$OpenBSD: fscanf.c,v 1.9 2005/10/10 17:37:44 espie Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,7 +41,7 @@ fscanf(FILE *fp, const char *fmt, ...)
 	va_list ap;
 
 	va_start(ap, fmt);
-	ret = __svfscanf(fp, fmt, ap);
+	ret = vfscanf(fp, fmt, ap);
 	va_end(ap);
 	return (ret);
 }
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index ca3533ece1b..e5863e5a604 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.h,v 1.11 2005/06/17 20:40:32 espie Exp $	*/
+/*	$OpenBSD: local.h,v 1.12 2005/10/10 17:37:44 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -55,6 +55,7 @@ int	__swhatbuf(FILE *, size_t *, int *);
 int	_fwalk(int (*)(FILE *));
 int	__swsetup(FILE *);
 int	__sflags(const char *, int *);
+wint_t __fgetwc_unlock(FILE *);
 
 extern void __atexit_register_cleanup(void (*)(void));
 extern int __sdidinit;
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
index e9b5ceed113..f8df1bcd7c9 100644
--- a/lib/libc/stdlib/hcreate.c
+++ b/lib/libc/stdlib/hcreate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hcreate.c,v 1.2 2005/08/08 08:05:36 espie Exp $	*/
+/*	$OpenBSD: hcreate.c,v 1.3 2005/10/10 17:37:44 espie Exp $	*/
 /*	$NetBSD: hcreate.c,v 1.5 2004/04/23 02:48:12 simonb Exp $	*/
 
 /*
@@ -57,7 +57,7 @@
 #include <sys/queue.h>
 
 #ifndef _DIAGASSERT
-#define _DIAGASSERT
+#define _DIAGASSERT(x)
 #endif
 
 /*
-- 
cgit v1.2.3