summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/db.c10
-rwxr-xr-xtools/check-syntax3
2 files changed, 5 insertions, 8 deletions
diff --git a/src/db.c b/src/db.c
index 02d462e..ddc01c3 100644
--- a/src/db.c
+++ b/src/db.c
@@ -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;
}
/**
diff --git a/tools/check-syntax b/tools/check-syntax
index a8df9f9..6a80035 100755
--- a/tools/check-syntax
+++ b/tools/check-syntax
@@ -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 \