wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix code formatting

Browse source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1223)
This commit is contained in:
mrpre 2016-07-01 08:55:18 +08:00 committed by Rich Salz
parent 0a1d3a8152
commit 152d264616
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crypto/lhash/lhash.c
View file

@ -72,17 +72,11 @@ void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data)
unsigned long hash;
OPENSSL_LH_NODE *nn, **rn;
void *ret;
int val = 0;
lh->error = 0;
if (lh->up_load <= (lh->num_items * LH_LOAD_MULT / lh->num_nodes))
val = expand(lh);
if(val){
lh->error++;
return (NULL);
}
if ((lh->up_load <= (lh->num_items * LH_LOAD_MULT / lh->num_nodes)) && !expand(lh))
return NULL; /* 'lh->error++' already done in 'expand' */
rn = getrn(lh, data, &hash);
if (*rn == NULL) {
@ -222,7 +216,7 @@ static int expand(OPENSSL_LHASH *lh)
/* fputs("realloc error in lhash",stderr); */
lh->error++;
lh->p = 0;
return -1;
return 0;
}
for (i = (int)lh->num_alloc_nodes; i < j; i++) /* 26/02/92 eay */
n[i] = NULL; /* 02/03/92 eay */
@ -232,7 +226,7 @@ static int expand(OPENSSL_LHASH *lh)
lh->p = 0;
lh->b = n;
}
return 0;
return 1;
}
static void contract(OPENSSL_LHASH *lh)