Cosmetic changes.

[openssl.git] / crypto / x509 / by_dir.c

diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index dfc71b4159022c701b45cb2e0988b6f8766a9bb9..3e1565ea5be084a51e64f9402c4297d3cb733444 100644 (file)
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -59,12 +59,20 @@
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 #include "cryptlib.h"
-#include "lhash.h"
-#include "x509.h"
+
+#ifndef NO_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef MAC_OS_pre_X
+# include <stat.h>
+#else
+# include <sys/stat.h>
+#endif
+
+#include <openssl/lhash.h>
+#include <openssl/x509.h>
 
 typedef struct lookup_dir_st
        {
@@ -75,21 +83,13 @@ typedef struct lookup_dir_st
        int num_dirs_alloced;
        } BY_DIR;
 
-#ifndef NOPROTO
-static int dir_ctrl(X509_LOOKUP *ctx,int cmd,char *argp,long argl,char **ret);
+static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
+       char **ret);
 static int new_dir(X509_LOOKUP *lu);
 static void free_dir(X509_LOOKUP *lu);
 static int add_cert_dir(BY_DIR *ctx,const char *dir,int type);
 static int get_cert_by_subject(X509_LOOKUP *xl,int type,X509_NAME *name,
        X509_OBJECT *ret);
-#else
-static int dir_ctrl();
-static int new_dir();
-static void free_dir();
-static int add_cert_dir();
-static int get_cert_by_subject();
-#endif
-
 X509_LOOKUP_METHOD x509_dir_lookup=
        {
        "Load certs from files in a directory",
@@ -109,7 +109,7 @@ X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void)
        return(&x509_dir_lookup);
        }
 
-static int dir_ctrl(X509_LOOKUP *ctx, int cmd, char *argp, long argl,
+static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
             char **retp)
        {
        int ret=0;
@@ -197,11 +197,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
                        ss=s;
                        s=p+1;
                        len=(int)(p-ss);
-                       if (len == 0)
-                               {
-                               if (ss == p) break;
-                               continue;
-                               }
+                       if (len == 0) continue;
                        for (j=0; j<ctx->num_dirs; j++)
                                if (strncmp(ctx->dirs[j],ss,(unsigned int)len) == 0)
                                        continue;