Skip to content

Commit

Permalink
tools: update astyle config for astyle v3.2.x
Browse files Browse the repository at this point in the history
It appears that '--indent-preprocessor' and
'--max-instatement-indent' are no longer supported command line
options, remove them.

Minor tweak to db_col_init() to appease astyle, no functional
changes.

Signed-off-by: Paul Moore <paul@paul-moore.com>
  • Loading branch information
pcmoore committed May 9, 2023
1 parent 31583fa commit f1c3196
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
10 changes: 4 additions & 6 deletions src/db.c
Original file line number Diff line number Diff line change
Expand Up @@ -1123,14 +1123,12 @@ struct db_filter_col *db_col_init(uint32_t def_action)
return NULL;

/* reset the DB to a known state */
if (db_col_reset(col, def_action) < 0)
goto init_failure;
if (db_col_reset(col, def_action) < 0) {
db_col_release(col);
return NULL;
}

return col;

init_failure:
db_col_release(col);
return NULL;
}

/**
Expand Down
3 changes: 1 addition & 2 deletions tools/check-syntax
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,9 @@ function tool_c_style() {
cat - | astyle --options=none --lineend=linux --mode=c \
--style=linux \
--indent=force-tab=8 \
--indent-preprocessor \
--indent-col1-comments \
--min-conditional-indent=0 \
--max-instatement-indent=80 \
--max-continuation-indent=80 \
--pad-oper \
--align-pointer=name \
--align-reference=name \
Expand Down

0 comments on commit f1c3196

Please sign in to comment.