projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm_arch.h: allow to specify __ARM_ARCH__ elsewhere.
[oweals/openssl.git]
/
crypto
/
conf
/
conf_def.c
diff --git
a/crypto/conf/conf_def.c
b/crypto/conf/conf_def.c
index d8bce8732a2ddff20d978ce9f49c8c3c95ba1d18..cf951320af8ee344e60d4fd863be34dc3cebce8c 100644
(file)
--- a/
crypto/conf/conf_def.c
+++ b/
crypto/conf/conf_def.c
@@
-129,7
+129,7
@@
static CONF *def_create(CONF_METHOD *meth)
{
CONF *ret;
{
CONF *ret;
- ret =
(CONF *)
OPENSSL_malloc(sizeof(CONF) + sizeof(unsigned short *));
+ ret = OPENSSL_malloc(sizeof(CONF) + sizeof(unsigned short *));
if (ret)
if (meth->init(ret) == 0)
{
if (ret)
if (meth->init(ret) == 0)
{
@@
-145,7
+145,7
@@
static int def_init_default(CONF *conf)
return 0;
conf->meth = &default_method;
return 0;
conf->meth = &default_method;
- conf->meth_data =
(void *)
CONF_type_default;
+ conf->meth_data = CONF_type_default;
conf->data = NULL;
return 1;
conf->data = NULL;
return 1;
@@
-213,13
+213,12
@@
static int def_load_bio(CONF *conf, BIO *in, long *line)
int bufnum=0,i,ii;
BUF_MEM *buff=NULL;
char *s,*p,*end;
int bufnum=0,i,ii;
BUF_MEM *buff=NULL;
char *s,*p,*end;
- int again
,n
;
+ int again;
long eline=0;
char btmp[DECIMAL_SIZE(eline)+1];
CONF_VALUE *v=NULL,*tv;
CONF_VALUE *sv=NULL;
char *section=NULL,*buf;
long eline=0;
char btmp[DECIMAL_SIZE(eline)+1];
CONF_VALUE *v=NULL,*tv;
CONF_VALUE *sv=NULL;
char *section=NULL,*buf;
- STACK_OF(CONF_VALUE) *section_sk=NULL,*ts;
char *start,*psection,*pname;
void *h = (void *)(conf->data);
char *start,*psection,*pname;
void *h = (void *)(conf->data);
@@
-250,7
+249,6
@@
static int def_load_bio(CONF *conf, BIO *in, long *line)
CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
goto err;
}
CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
goto err;
}
- section_sk=(STACK_OF(CONF_VALUE) *)sv->value;
bufnum=0;
again=0;
bufnum=0;
again=0;
@@
-309,7
+307,6
@@
static int def_load_bio(CONF *conf, BIO *in, long *line)
buf=buff->data;
clear_comments(conf, buf);
buf=buff->data;
clear_comments(conf, buf);
- n=strlen(buf);
s=eat_ws(conf, buf);
if (IS_EOF(conf,*s)) continue; /* blank line */
if (*s == '[')
s=eat_ws(conf, buf);
if (IS_EOF(conf,*s)) continue; /* blank line */
if (*s == '[')
@@
-343,7
+340,6
@@
again:
CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
goto err;
}
CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
goto err;
}
- section_sk=(STACK_OF(CONF_VALUE) *)sv->value;
continue;
}
else
continue;
}
else
@@
-406,13
+402,9
@@
again:
CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
goto err;
}
CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
goto err;
}
- ts=(STACK_OF(CONF_VALUE) *)tv->value;
}
else
}
else
- {
tv=sv;
tv=sv;
- ts=section_sk;
- }
#if 1
if (_CONF_add_string(conf, tv, v) == 0)
{
#if 1
if (_CONF_add_string(conf, tv, v) == 0)
{
@@
-465,9
+457,6
@@
err:
static void clear_comments(CONF *conf, char *p)
{
static void clear_comments(CONF *conf, char *p)
{
- char *to;
-
- to=p;
for (;;)
{
if (IS_FCOMMENT(conf,*p))
for (;;)
{
if (IS_FCOMMENT(conf,*p))
@@
-722,7
+711,7
@@
static char *scan_dquote(CONF *conf, char *p)
return(p);
}
return(p);
}
-static void dump_value(CONF_VALUE *a, BIO *out)
+static void dump_value
_doall_arg
(CONF_VALUE *a, BIO *out)
{
if (a->name)
BIO_printf(out, "[%s] %s=%s\n", a->section, a->name, a->value);
{
if (a->name)
BIO_printf(out, "[%s] %s=%s\n", a->section, a->name, a->value);
@@
-730,11
+719,12
@@
static void dump_value(CONF_VALUE *a, BIO *out)
BIO_printf(out, "[[%s]]\n", a->section);
}
BIO_printf(out, "[[%s]]\n", a->section);
}
-static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE
*, BIO *
)
+static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE
, BIO
)
static int def_dump(const CONF *conf, BIO *out)
{
static int def_dump(const CONF *conf, BIO *out)
{
- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_value), out);
+ lh_CONF_VALUE_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_value),
+ BIO, out);
return 1;
}
return 1;
}