summaryrefslogtreecommitdiffstats
path: root/crypto/conf/conf_def.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-02-06 10:54:20 -0500
committerRich Salz <rsalz@openssl.org>2015-02-06 10:54:20 -0500
commit6f91b017bbb7140f816721141ac156d1b828a6b3 (patch)
treee77196a270e92d461ab7193f0fdcf60d337918c7 /crypto/conf/conf_def.c
parent9e9858d1cf28e39cfd214b5c508188d5016728fd (diff)
Live code cleanup: remove #if 1 stuff
For code bracketed by "#if 1" then remove the alternate "#else .. #endif" lines. Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/conf/conf_def.c')
-rw-r--r--crypto/conf/conf_def.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index 5e226705ed..59053e85bd 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -384,25 +384,10 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
}
} else
tv = sv;
-#if 1
if (_CONF_add_string(conf, tv, v) == 0) {
CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE);
goto err;
}
-#else
- v->section = tv->section;
- if (!sk_CONF_VALUE_push(ts, v)) {
- CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE);
- goto err;
- }
- vv = (CONF_VALUE *)lh_insert(conf->data, v);
- if (vv != NULL) {
- sk_CONF_VALUE_delete_ptr(ts, vv);
- OPENSSL_free(vv->name);
- OPENSSL_free(vv->value);
- OPENSSL_free(vv);
- }
-#endif
v = NULL;
}
}