projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings.
[openssl.git]
/
crypto
/
x509
/
by_file.c
diff --git
a/crypto/x509/by_file.c
b/crypto/x509/by_file.c
index 5eb6cf20518f070bf88979e0ce4ad9fdf2e4725b..00ee5e8bbc4dc54f8aa2bdb13ff75106d20d37f1 100644
(file)
--- a/
crypto/x509/by_file.c
+++ b/
crypto/x509/by_file.c
@@
-70,13
+70,8
@@
#ifndef NO_STDIO
#ifndef NO_STDIO
-#ifndef NOPROTO
-static int by_file_ctrl(X509_LOOKUP *ctx,int cmd,char *argc,
- long argl,char **ret);
-#else
-static int by_file_ctrl();
-#endif
-
+static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
+ long argl, char **ret);
X509_LOOKUP_METHOD x509_file_lookup=
{
"Load file into cache",
X509_LOOKUP_METHOD x509_file_lookup=
{
"Load file into cache",
@@
-96,7
+91,7
@@
X509_LOOKUP_METHOD *X509_LOOKUP_file(void)
return(&x509_file_lookup);
}
return(&x509_file_lookup);
}
-static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, char *argp, long argl,
+static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, c
onst c
har *argp, long argl,
char **ret)
{
int ok=0,ok2=0;
char **ret)
{
int ok=0,ok2=0;
@@
-154,7
+149,7
@@
int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
{
for (;;)
{
{
for (;;)
{
- x=PEM_read_bio_X509(in,NULL,NULL);
+ x=PEM_read_bio_X509(in,NULL,NULL
,NULL
);
if (x == NULL)
{
if ((ERR_GET_REASON(ERR_peek_error()) ==
if (x == NULL)
{
if ((ERR_GET_REASON(ERR_peek_error()) ==
@@
-221,7
+216,7
@@
int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
{
for (;;)
{
{
for (;;)
{
- x=PEM_read_bio_X509_CRL(in,NULL,NULL);
+ x=PEM_read_bio_X509_CRL(in,NULL,NULL
,NULL
);
if (x == NULL)
{
if ((ERR_GET_REASON(ERR_peek_error()) ==
if (x == NULL)
{
if ((ERR_GET_REASON(ERR_peek_error()) ==