summaryrefslogtreecommitdiffstats
path: root/scripts/coccinelle
diff options
context:
space:
mode:
authorMarkus Armbruster2020-07-22 10:40:45 +0200
committerMarkus Armbruster2020-07-24 12:56:44 +0200
commitcb3fa1e4c05a4ad2563b39cdb1146e617f3b5424 (patch)
treeb7004e48b3d0c6bd7fba96df173c1d7282849f7c /scripts/coccinelle
parentMerge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20200... (diff)
downloadqemu-cb3fa1e4c05a4ad2563b39cdb1146e617f3b5424.tar.gz
qemu-cb3fa1e4c05a4ad2563b39cdb1146e617f3b5424.tar.xz
qemu-cb3fa1e4c05a4ad2563b39cdb1146e617f3b5424.zip
coccinelle/err-bad-newline: Fix for Python 3, and add patterns
Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20200722084048.1726105-2-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'scripts/coccinelle')
-rw-r--r--scripts/coccinelle/err-bad-newline.cocci24
1 files changed, 22 insertions, 2 deletions
diff --git a/scripts/coccinelle/err-bad-newline.cocci b/scripts/coccinelle/err-bad-newline.cocci
index 1316cc86a6..5394421873 100644
--- a/scripts/coccinelle/err-bad-newline.cocci
+++ b/scripts/coccinelle/err-bad-newline.cocci
@@ -1,22 +1,42 @@
// Error messages should not contain newlines. This script finds
// messages that do. Fixing them is manual.
@r@
-expression errp, eno, cls, fmt;
+expression errp, err, eno, cls, fmt, ap;
position p;
@@
(
+error_vreport(fmt, ap)@p
+|
+warn_vreport(fmt, ap)@p
+|
+info_vreport(fmt, ap)@p
+|
error_report(fmt, ...)@p
|
+warn_report(fmt, ...)@p
+|
+info_report(fmt, ...)@p
+|
+error_report_once(fmt, ...)@p
+|
+warn_report_once(fmt, ...)@p
+|
error_setg(errp, fmt, ...)@p
|
error_setg_errno(errp, eno, fmt, ...)@p
|
error_setg_win32(errp, eno, cls, fmt, ...)@p
|
+error_propagate_prepend(errp, err, fmt, ...)@p
+|
+error_vprepend(errp, fmt, ap)@p
+|
error_prepend(errp, fmt, ...)@p
|
error_setg_file_open(errp, eno, cls, fmt, ...)@p
|
+warn_reportf_err(errp, fmt, ...)@p
+|
error_reportf_err(errp, fmt, ...)@p
|
error_set(errp, cls, fmt, ...)@p
@@ -26,4 +46,4 @@ fmt << r.fmt;
p << r.p;
@@
if "\\n" in str(fmt):
- print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)
+ print("%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt))