diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/conf/conf_api.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/conf/conf_api.c')
| -rw-r--r-- | src/lib/libcrypto/conf/conf_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c index 0032baa711..909d72b4b8 100644 --- a/src/lib/libcrypto/conf/conf_api.c +++ b/src/lib/libcrypto/conf/conf_api.c | |||
| @@ -121,7 +121,7 @@ int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value) | |||
| 121 | v = (CONF_VALUE *)lh_insert(conf->data, value); | 121 | v = (CONF_VALUE *)lh_insert(conf->data, value); |
| 122 | if (v != NULL) | 122 | if (v != NULL) |
| 123 | { | 123 | { |
| 124 | sk_CONF_VALUE_delete_ptr(ts,v); | 124 | (void)sk_CONF_VALUE_delete_ptr(ts,v); |
| 125 | OPENSSL_free(v->name); | 125 | OPENSSL_free(v->name); |
| 126 | OPENSSL_free(v->value); | 126 | OPENSSL_free(v->value); |
| 127 | OPENSSL_free(v); | 127 | OPENSSL_free(v); |