We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.

1 files changed, 1 insertions, 32 deletions

diff --git a/src/lib/libc/crypt/bcrypt.c b/src/lib/libc/crypt/bcrypt.c
index f3ea849f00..dec0093dd8 100644
--- a/src/lib/libc/crypt/bcrypt.c
+++ b/src/lib/libc/crypt/bcrypt.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bcrypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $     */
+/*      $OpenBSD: bcrypt.c,v 1.16 2002/02/19 19:39:36 millert Exp $     */
 
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -97,16 +97,8 @@ const static u_int8_t index_64[128] =
 };
 #define CHAR64(c)  ( (c) > 127 ? 255 : index_64[(c)])
 
-#ifdef __STDC__
 static void
 decode_base64(u_int8_t *buffer, u_int16_t len, u_int8_t *data)
-#else
-static void
-decode_base64(buffer, len, data)
-        u_int8_t *buffer;
-        u_int16_t len;
-        u_int8_t *data;
-#endif
 {
         u_int8_t *bp = buffer;
         u_int8_t *p = data;
@@ -140,17 +132,8 @@ decode_base64(buffer, len, data)
         }
 }
 
-#ifdef __STDC__
 static void
 encode_salt(char *salt, u_int8_t *csalt, u_int16_t clen, u_int8_t logr)
-#else
-static void
-encode_salt(salt, csalt, clen, logr)
-        char   *salt;
-        u_int8_t *csalt;
-        u_int16_t clen;
-        u_int8_t logr;
-#endif
 {
         salt[0] = '$';
         salt[1] = BCRYPT_VERSION;
@@ -166,14 +149,8 @@ encode_salt(salt, csalt, clen, logr)
    seems sensible.
  */
 
-#ifdef __STDC__
 char *
 bcrypt_gensalt(u_int8_t log_rounds)
-#else
-char *
-bcrypt_gensalt(log_rounds)
-        u_int8_t log_rounds;
-#endif
 {
         u_int8_t csalt[BCRYPT_MAXSALT];
         u_int16_t i;
@@ -296,16 +273,8 @@ bcrypt(key, salt)
         return encrypted;
 }
 
-#ifdef __STDC__
 static void
 encode_base64(u_int8_t *buffer, u_int8_t *data, u_int16_t len)
-#else
-static void
-encode_base64(buffer, data, len)
-        u_int8_t *buffer;
-        u_int8_t *data;
-        u_int16_t len;
-#endif
 {
         u_int8_t *bp = buffer;
         u_int8_t *p = data;