Switch to new version numbering scheme.

[openssl.git] / apps / dgst.c

diff --git a/apps/dgst.c b/apps/dgst.c
index eb7462d0b12207057755956ef437afca488ee7d6..9107a5230d1917064ca65d8abbce7e8ba6bfe7aa 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -60,12 +60,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef BUFSIZE
 #define BUFSIZE        1024*8
@@ -73,15 +73,8 @@
 #undef PROG
 #define PROG   dgst_main
 
-#ifndef NOPROTO
 void do_fp(unsigned char *buf,BIO *f,int sep);
-#else
-void do_fp();
-#endif
-
-int MAIN(argc,argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
        unsigned char *buf=NULL;
        int i,err=0;
@@ -112,7 +105,7 @@ char **argv;
 
        argc--;
        argv++;
-       for (i=0; i<argc; i++)
+       while (argc > 0)
                {
                if ((*argv)[0] != '-') break;
                if (strcmp(*argv,"-c") == 0)
@@ -203,10 +196,7 @@ end:
        EXIT(err);
        }
 
-void do_fp(buf,bp,sep)
-unsigned char *buf;
-BIO *bp;
-int sep;
+void do_fp(unsigned char *buf, BIO *bp, int sep)
        {
        int len;
        int i;