mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
coccinelle: add explicit statement isomorphisms
Coccinelle needs a custom isomorphism file with rules (isomorphisms) how to correctly rewrite conditions with explicit NULL checks (i.e. if (ptr == NULL)) to their shorter form (i.e. if (!ptr)). Coccinelle already contains such isomorphisms in its default .iso file, however, they're in the opposite direction, which results in useless output from coccinelle/equals-null.cocci. With this fix, `spatch` should no longer report patches like: @@ -628,8 +628,9 @@ static int path_deserialize_item(Unit *u f = path_result_from_string(value); if (f < 0) log_unit_debug(u, "Failed to parse result value: %s", value); - else if (f != PATH_SUCCESS) - p->result = f; + else {if (f != PATH_SUCCESS) + p->result = f; + } } else log_unit_debug(u, "Unknown serialization key: %s", key);
This commit is contained in:
parent
aeafd03a2b
commit
b3fd7b53ff
@ -2,6 +2,7 @@
|
||||
|
||||
top="$(git rev-parse --show-toplevel)"
|
||||
files="$(git ls-files ':/*.[ch]')"
|
||||
iso_defs="$top/coccinelle/systemd-definitions.iso"
|
||||
args=
|
||||
|
||||
case "$1" in
|
||||
@ -21,7 +22,7 @@ for SCRIPT in ${@-$top/coccinelle/*.cocci} ; do
|
||||
TMPFILE=`mktemp`
|
||||
echo "+ spatch --sp-file $SCRIPT $args ..."
|
||||
parallel --halt now,fail=1 --keep-order --noswap --max-args=20 \
|
||||
spatch --sp-file $SCRIPT $args ::: $files \
|
||||
spatch --iso-file $iso_defs --sp-file $SCRIPT $args ::: $files \
|
||||
2>"$TMPFILE" || cat "$TMPFILE"
|
||||
echo -e "--x-- Processed $SCRIPT --x--\n"
|
||||
done
|
||||
|
20
coccinelle/systemd-definitions.iso
Normal file
20
coccinelle/systemd-definitions.iso
Normal file
@ -0,0 +1,20 @@
|
||||
/* Statement isomorphisms - replace explicit checks against NULL with a
|
||||
* shorter variant, which relies on C's downgrade-to-bool feature.
|
||||
* The expression metavariables should be declared as pointers, however,
|
||||
* that doesn't work well with complex expressions like:
|
||||
* if (UNIT(p)->default_dependencies != NULL)
|
||||
*/
|
||||
|
||||
Statement
|
||||
@@
|
||||
expression X;
|
||||
statement S;
|
||||
@@
|
||||
if (X == NULL) S => if (!X) S
|
||||
|
||||
Statement
|
||||
@@
|
||||
expression X;
|
||||
statement S;
|
||||
@@
|
||||
if (X != NULL) S => if (X) S
|
Loading…
Reference in New Issue
Block a user