lib/igt.cocci: Conversion to igt logging

Also update old hunks to match on igt logging instead of fprintf.

v2: Don't forget about perror.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/lib/igt.cocci b/lib/igt.cocci
index a5f7c2d..97aa43f 100644 (file)
--- a/lib/igt.cocci
+++ b/lib/igt.cocci
@@ -4,7 +4,13 @@ expression Ec;
 expression list[n] Ep;
 @@
 - if (Ec) {
-- fprintf( stderr,  Ep );
+(
+- igt_warn( Ep );
+|
+- igt_info( Ep );
+|
+- igt_debug( Ep );
+)
 - igt_fail(...);
 - }
 + igt_assert_f(Ec, Ep);
@@ -16,3 +22,25 @@ expression list[n] Ep;
 - igt_skip(Ep);
 - }
 + igt_skip_on_f(Ec, Ep);
+
+// Enforce use of logging functions
+@@
+expression list[n] Ep;
+@@
+-fprintf(stderr, Ep);
++igt_warn(Ep);
+@@
+expression E;
+@@
+-perror(E);
++igt_warn(E);
+@@
+expression list[n] Ep;
+@@
+-fprintf(stdout, Ep);
++igt_info(Ep);
+@@
+expression list[n] Ep;
+@@
+-printf(Ep);
++igt_info(Ep);