Commit 98c6b31e authored by Lev Walkin's avatar Lev Walkin Committed by GitHub

Merge pull request #87 from elfring/Remove_unnecessary_checks1

Delete unnecessary checks before some function calls
parents 792b22b9 f3d1861b
......@@ -673,10 +673,8 @@ _range_canonicalize(asn1cnst_range_t *range) {
range->right = tmp;
}
if(range->elements) {
free(range->elements);
range->elements = 0;
}
free(range->elements);
range->elements = 0;
range->el_size = 0;
return 0;
}
......
......@@ -166,7 +166,7 @@ asn1f_fetch_tags(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *expr, struct a
arg.expr = expr;
count = asn1f_fetch_tags_impl(&arg, &tags, 0, 0, flags);
if(count <= 0 && tags) {
if (count <= 0) {
free(tags);
tags = 0;
}
......
......@@ -23,14 +23,10 @@ void
asn1p_constraint_free(asn1p_constraint_t *ct) {
if(ct) {
if(ct->containedSubtype)
asn1p_value_free(ct->containedSubtype);
if(ct->value)
asn1p_value_free(ct->value);
if(ct->range_start)
asn1p_value_free(ct->range_start);
if(ct->range_stop)
asn1p_value_free(ct->range_stop);
asn1p_value_free(ct->containedSubtype);
asn1p_value_free(ct->value);
asn1p_value_free(ct->range_start);
asn1p_value_free(ct->range_stop);
if(ct->elements) {
while(ct->el_count--) {
......
......@@ -246,20 +246,13 @@ asn1p_expr_free(asn1p_expr_t *expr) {
}
free(expr->Identifier);
if(expr->reference)
asn1p_ref_free(expr->reference);
if(expr->constraints)
asn1p_constraint_free(expr->constraints);
if(expr->combined_constraints)
asn1p_constraint_free(expr->combined_constraints);
if(expr->lhs_params)
asn1p_paramlist_free(expr->lhs_params);
if(expr->value)
asn1p_value_free(expr->value);
if(expr->marker.default_value)
asn1p_value_free(expr->marker.default_value);
if(expr->with_syntax)
asn1p_wsyntx_free(expr->with_syntax);
asn1p_ref_free(expr->reference);
asn1p_constraint_free(expr->constraints);
asn1p_constraint_free(expr->combined_constraints);
asn1p_paramlist_free(expr->lhs_params);
asn1p_value_free(expr->value);
asn1p_value_free(expr->marker.default_value);
asn1p_wsyntx_free(expr->with_syntax);
if(expr->data && expr->data_free)
expr->data_free(expr->data);
......
......@@ -27,8 +27,7 @@ asn1p_paramlist_free(asn1p_paramlist_t *pl) {
if(pl->params) {
int i = pl->params_count;
while(i--) {
if(pl->params[i].governor)
asn1p_ref_free(pl->params[i].governor);
asn1p_ref_free(pl->params[i].governor);
free(pl->params[i].argument);
pl->params[i].governor = 0;
pl->params[i].argument = 0;
......@@ -82,8 +81,7 @@ asn1p_paramlist_add_param(asn1p_paramlist_t *pl, asn1p_ref_t *gov, char *arg) {
pl->params_count++;
return 0;
} else {
if(pl->params[pl->params_count].governor)
asn1p_ref_free(pl->params[pl->params_count].governor);
asn1p_ref_free(pl->params[pl->params_count].governor);
return -1;
}
}
......
......@@ -2318,8 +2318,7 @@ yyreduce:
{
(yyval.a_oid) = asn1p_oid_new();
asn1p_oid_add_arc((yyval.a_oid), &(yyvsp[(1) - (1)].a_oid_arc));
if((yyvsp[(1) - (1)].a_oid_arc).name)
free((yyvsp[(1) - (1)].a_oid_arc).name);
free((yyvsp[(1) - (1)].a_oid_arc).name);
}
break;
......@@ -2328,8 +2327,7 @@ yyreduce:
{
(yyval.a_oid) = (yyvsp[(1) - (2)].a_oid);
asn1p_oid_add_arc((yyval.a_oid), &(yyvsp[(2) - (2)].a_oid_arc));
if((yyvsp[(2) - (2)].a_oid_arc).name)
free((yyvsp[(2) - (2)].a_oid_arc).name);
free((yyvsp[(2) - (2)].a_oid_arc).name);
}
break;
......@@ -2826,7 +2824,7 @@ yyreduce:
ret = asn1p_paramlist_add_param((yyval.a_plist), (yyvsp[(1) - (1)].a_parg).governor, (yyvsp[(1) - (1)].a_parg).argument);
checkmem(ret == 0);
if((yyvsp[(1) - (1)].a_parg).governor) asn1p_ref_free((yyvsp[(1) - (1)].a_parg).governor);
if((yyvsp[(1) - (1)].a_parg).argument) free((yyvsp[(1) - (1)].a_parg).argument);
free((yyvsp[(1) - (1)].a_parg).argument);
}
break;
......@@ -2838,7 +2836,7 @@ yyreduce:
ret = asn1p_paramlist_add_param((yyval.a_plist), (yyvsp[(3) - (3)].a_parg).governor, (yyvsp[(3) - (3)].a_parg).argument);
checkmem(ret == 0);
if((yyvsp[(3) - (3)].a_parg).governor) asn1p_ref_free((yyvsp[(3) - (3)].a_parg).governor);
if((yyvsp[(3) - (3)].a_parg).argument) free((yyvsp[(3) - (3)].a_parg).argument);
free((yyvsp[(3) - (3)].a_parg).argument);
}
break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment