diff options
-rw-r--r-- | entropy.c | 6 | ||||
-rw-r--r-- | openbsd-compat/glob.c | 4 | ||||
-rw-r--r-- | openbsd-compat/strlcat.c | 1 | ||||
-rw-r--r-- | openbsd-compat/strlcpy.c | 1 |
4 files changed, 7 insertions, 5 deletions
@@ -40,7 +40,7 @@ | |||
40 | #include "pathnames.h" | 40 | #include "pathnames.h" |
41 | #include "log.h" | 41 | #include "log.h" |
42 | 42 | ||
43 | RCSID("$Id: entropy.c,v 1.36 2001/03/18 22:38:16 djm Exp $"); | 43 | RCSID("$Id: entropy.c,v 1.37 2001/06/27 13:36:08 djm Exp $"); |
44 | 44 | ||
45 | #ifndef offsetof | 45 | #ifndef offsetof |
46 | # define offsetof(type, member) ((size_t) &((type *)0)->member) | 46 | # 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 $"); | |||
68 | # define SAVED_IDS_WORK_WITH_SETEUID | 68 | # define SAVED_IDS_WORK_WITH_SETEUID |
69 | #endif | 69 | #endif |
70 | 70 | ||
71 | void | 71 | static void |
72 | check_openssl_version(void) | 72 | check_openssl_version(void) |
73 | { | 73 | { |
74 | if (SSLeay() != OPENSSL_VERSION_NUMBER) | 74 | if (SSLeay() != OPENSSL_VERSION_NUMBER) |
@@ -182,7 +182,7 @@ done: | |||
182 | #else /* !USE_PRNGD */ | 182 | #else /* !USE_PRNGD */ |
183 | #ifdef RANDOM_POOL | 183 | #ifdef RANDOM_POOL |
184 | /* Collect entropy from /dev/urandom or pipe */ | 184 | /* Collect entropy from /dev/urandom or pipe */ |
185 | int | 185 | static int |
186 | get_random_bytes(unsigned char *buf, int len) | 186 | get_random_bytes(unsigned char *buf, int len) |
187 | { | 187 | { |
188 | int random_pool; | 188 | int random_pool; |
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 4f70149cb..365d4334f 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c | |||
@@ -37,8 +37,8 @@ | |||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | #include <ctype.h> | 38 | #include <ctype.h> |
39 | 39 | ||
40 | long | 40 | static long |
41 | get_arg_max() | 41 | get_arg_max(void) |
42 | { | 42 | { |
43 | #ifdef ARG_MAX | 43 | #ifdef ARG_MAX |
44 | return(ARG_MAX); | 44 | return(ARG_MAX); |
diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c index 7631d9694..d80739fc6 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 | |||
36 | 36 | ||
37 | #include <sys/types.h> | 37 | #include <sys/types.h> |
38 | #include <string.h> | 38 | #include <string.h> |
39 | #include "strlcat.h" | ||
39 | 40 | ||
40 | /* | 41 | /* |
41 | * Appends src to string dst of size siz (unlike strncat, siz is the | 42 | * 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 276c25c37..99b06dd90 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 | |||
36 | 36 | ||
37 | #include <sys/types.h> | 37 | #include <sys/types.h> |
38 | #include <string.h> | 38 | #include <string.h> |
39 | #include "strlcpy.h" | ||
39 | 40 | ||
40 | /* | 41 | /* |
41 | * Copy src to string dst of size siz. At most siz-1 characters | 42 | * Copy src to string dst of size siz. At most siz-1 characters |