Skip to content

Parse missed PCI devices #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linuxhw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Parse missed PCI devices #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lkddb/linux/browse_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ def parse_struct(scanner, fields, line, dep, filename, ret=False):
nparam = 0
for param in line:
param = param.replace("\n", " ").strip()
if not param:
param = param.replace("\t", " ").strip()
if param == '':
continue
elif param[0] == ".":
m = field_init_re.match(param)
Expand All @@ -197,11 +198,13 @@ def parse_struct(scanner, fields, line, dep, filename, ret=False):
raise lkddb.ParserError("in parse_line(): %s, %s, %s" % (filename, line, param))
res[field] = value
else:
if nparam >= len(fields):
break
try:
res[fields[nparam]] = param
except IndexError:
logger.exception("Index error: %s, %s, %s, %s" %
(scanner.name, fields, line, filename))
logger.exception("Index error: %s, %s, %s, %s, %s" %
(scanner.name, nparam, fields, line, filename))
return {}
nparam += 1
if res:
Expand Down
2 changes: 1 addition & 1 deletion lkddb/linux/scanners.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def extract_value(field, dictionary):
return eval(val[val.find("=")+1:])
else:
logger.error("error in extract_value: %s, %s --- '%s'" % (field, sorted(dictionary.items()), val))
assert False, "error in extract_value, 1: %s, %s --- '%s'" % (field, sorted(dictionary.items()), val)
return 0
except NameError:
logger.exception("error in extract_value: expected number in field %s from %s" %
(field, dictionary))
Expand Down