Remove NOPROTO definitions and error code comments.

[openssl.git] / crypto / bf / bfspeed.c

diff --git a/crypto/bf/bfspeed.c b/crypto/bf/bfspeed.c
index 30db62b234e7a2d1a3ea196cef44053834102e52..bca36e5a3bd6eb419114a461a6ffc9ebf34b8350 100644 (file)
--- a/crypto/bf/bfspeed.c
+++ b/crypto/bf/bfspeed.c
@@ -98,7 +98,7 @@ struct tms {
 #include <sys/param.h>
 #endif
 
 #include <sys/param.h>
 #endif
 

-#include "blowfish.h"
+#include <openssl/blowfish.h>

 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ


@@ -116,12 +116,7 @@ struct tms {
 #define BUFSIZE        ((long)1024)
 long run=0;
 
 #define BUFSIZE        ((long)1024)
 long run=0;
 

-#ifndef NOPROTO

 double Time_F(int s);
 double Time_F(int s);

-#else
-double Time_F();
-#endif
-

 #ifdef SIGALRM
 #if defined(__STDC__) || defined(sgi) || defined(_AIX)
 #define SIGRETTYPE void
 #ifdef SIGALRM
 #if defined(__STDC__) || defined(sgi) || defined(_AIX)
 #define SIGRETTYPE void


@@ -129,14 +124,8 @@ double Time_F();
 #define SIGRETTYPE int
 #endif
 
 #define SIGRETTYPE int
 #endif
 

-#ifndef NOPROTO

 SIGRETTYPE sig_done(int sig);
 SIGRETTYPE sig_done(int sig);

-#else
-SIGRETTYPE sig_done();
-#endif
-
-SIGRETTYPE sig_done(sig)
-int sig;
+SIGRETTYPE sig_done(int sig)

        {
        signal(SIGALRM,sig_done);
        run=0;
        {
        signal(SIGALRM,sig_done);
        run=0;


@@ -149,8 +138,7 @@ int sig;
 #define START  0
 #define STOP   1
 
 #define START  0
 #define STOP   1
 

-double Time_F(s)
-int s;
+double Time_F(int s)

        {
        double ret;
 #ifdef TIMES
        {
        double ret;
 #ifdef TIMES


@@ -186,9 +174,7 @@ int s;
 #endif
        }
 
 #endif
        }
 

-int main(argc,argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)

        {
        long count;
        static unsigned char buf[BUFSIZE];
        {
        long count;
        static unsigned char buf[BUFSIZE];