summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-06-27 23:36:08 +1000
committerDamien Miller <djm@mindrot.org>2001-06-27 23:36:08 +1000
commit79b332dd6748980cf9c8af39e3194a7e272b9256 (patch)
treea0cbb7fba6e8746a658cd94d52ff45293e628c63
parent649d999b4bab2d2ff5fadf7c77f2d685ece4708c (diff)
- (djm) Fix a few warnings the above turned up
-rw-r--r--entropy.c6
-rw-r--r--openbsd-compat/glob.c4
-rw-r--r--openbsd-compat/strlcat.c1
-rw-r--r--openbsd-compat/strlcpy.c1
4 files changed, 7 insertions, 5 deletions
diff --git a/entropy.c b/entropy.c
index 8bd540dc..554a72b0 100644
--- a/entropy.c
+++ b/entropy.c
@@ -40,7 +40,7 @@
#include "pathnames.h"
#include "log.h"
-RCSID("$Id: entropy.c,v 1.36 2001/03/18 22:38:16 djm Exp $");
+RCSID("$Id: entropy.c,v 1.37 2001/06/27 13:36:08 djm Exp $");
#ifndef offsetof
# define offsetof(type, member) ((size_t) &((type *)0)->member)
@@ -68,7 +68,7 @@ RCSID("$Id: entropy.c,v 1.36 2001/03/18 22:38:16 djm Exp $");
# define SAVED_IDS_WORK_WITH_SETEUID
#endif
-void
+static void
check_openssl_version(void)
{
if (SSLeay() != OPENSSL_VERSION_NUMBER)
@@ -182,7 +182,7 @@ done:
#else /* !USE_PRNGD */
#ifdef RANDOM_POOL
/* Collect entropy from /dev/urandom or pipe */
-int
+static int
get_random_bytes(unsigned char *buf, int len)
{
int random_pool;
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 4f70149c..365d4334 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -37,8 +37,8 @@
#include "includes.h"
#include <ctype.h>
-long
-get_arg_max()
+static long
+get_arg_max(void)
{
#ifdef ARG_MAX
return(ARG_MAX);
diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c
index 7631d969..d80739fc 100644
--- a/openbsd-compat/strlcat.c
+++ b/openbsd-compat/strlcat.c
@@ -36,6 +36,7 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.5 2001/01/13 16:17:24 millert Exp
#include <sys/types.h>
#include <string.h>
+#include "strlcat.h"
/*
* Appends src to string dst of size siz (unlike strncat, siz is the
diff --git a/openbsd-compat/strlcpy.c b/openbsd-compat/strlcpy.c
index 276c25c3..99b06dd9 100644
--- a/openbsd-compat/strlcpy.c
+++ b/openbsd-compat/strlcpy.c
@@ -36,6 +36,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp
#include <sys/types.h>
#include <string.h>
+#include "strlcpy.h"
/*
* Copy src to string dst of size siz. At most siz-1 characters