d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdwarf: Remove unnecessary NULL checks.

Browse Source 
All callers of _dwarf_add_expr() and _dwarf_expr_into_block() pass a
non-NULL expr pointer, and these functions assume that expr is non-NULL
anyway.

CID:		1193305, 1193306
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2020-02-04 21:14:34 +00:00
parent 0783b70974
commit 75bd29add2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/elftoolchain/libdwarf/dwarf_pro_expr.c
View File

@ -36,10 +36,10 @@ _dwarf_add_expr(Dwarf_P_Expr expr, Dwarf_Small opcode, Dwarf_Unsigned val1,
Dwarf_Debug dbg;
int len;
dbg = expr != NULL ? expr->pe_dbg : NULL;
dbg = expr->pe_dbg;
if (_dwarf_loc_expr_add_atom(expr->pe_dbg, NULL, NULL, opcode, val1,
val2, &len, error) != DW_DLE_NONE)
if (_dwarf_loc_expr_add_atom(dbg, NULL, NULL, opcode, val1, val2, &len,
error) != DW_DLE_NONE)
return (NULL);
assert(len > 0);
@ -67,7 +67,7 @@ _dwarf_expr_into_block(Dwarf_P_Expr expr, Dwarf_Error *error)
Dwarf_Debug dbg;
int len, pos, ret;
dbg = expr != NULL ? expr->pe_dbg : NULL;
dbg = expr->pe_dbg;
if (expr->pe_block != NULL) {
free(expr->pe_block);
@ -88,7 +88,7 @@ _dwarf_expr_into_block(Dwarf_P_Expr expr, Dwarf_Error *error)
pos = 0;
STAILQ_FOREACH(ee, &expr->pe_eelist, ee_next) {
assert((Dwarf_Unsigned) pos < expr->pe_length);
ret = _dwarf_loc_expr_add_atom(expr->pe_dbg,
ret = _dwarf_loc_expr_add_atom(dbg,
&expr->pe_block[pos], &expr->pe_block[expr->pe_length],
ee->ee_loc.lr_atom, ee->ee_loc.lr_number,
ee->ee_loc.lr_number2, &len, error);