mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

STORE: simplify store_loader_cmp()

Browse Source 
We have already made sure that the loader scheme isn't NULL, so
checking if they are NULL or not when comparing registered loaders
is redundant.  We still soft assert it, just to be entirely sure.

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3805)
This commit is contained in:
Richard Levitte 2017-06-29 21:46:02 +02:00
parent 0e288c2af2
commit 6f9c506268
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/store/store_register.c
View File

@ -123,11 +123,8 @@ static unsigned long store_loader_hash(const OSSL_STORE_LOADER *v)
static int store_loader_cmp(const OSSL_STORE_LOADER *a,
const OSSL_STORE_LOADER *b)
{
if (a->scheme != NULL && b->scheme != NULL)
return strcmp(a->scheme, b->scheme);
else if (a->scheme == b->scheme)
return 0;
return a->scheme == NULL ? -1 : 1;
assert(a->scheme != NULL && b->scheme != NULL);
return strcmp(a->scheme, b->scheme);
}
static LHASH_OF(OSSL_STORE_LOADER) *loader_register = NULL;