httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1725397 - /httpd/httpd/trunk/docs/log-message-tags/find-messages.cocci
Date Tue, 19 Jan 2016 00:35:04 GMT
Author: rjung
Date: Tue Jan 19 00:35:04 2016
New Revision: 1725397

URL: http://svn.apache.org/viewvc?rev=1725397&view=rev
Log:
My (recent) version of coccinelle doesn't
want an identifier "format". Maybe it is reserved
now. Let's use "fmt" instead.

Furthermore I needed to make sure, that fmt isn't
already an APLOGNO, otherwise I got APLOGNO()
in front of already existing APLOGNO(...).

Modified:
    httpd/httpd/trunk/docs/log-message-tags/find-messages.cocci

Modified: httpd/httpd/trunk/docs/log-message-tags/find-messages.cocci
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/find-messages.cocci?rev=1725397&r1=1725396&r2=1725397&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/find-messages.cocci (original)
+++ httpd/httpd/trunk/docs/log-message-tags/find-messages.cocci Tue Jan 19 00:35:04 2016
@@ -1,6 +1,6 @@
 @r1@
 expression rv, s;
-constant char [] format;
+constant char[] fmt !~ "^APLOGNO";
 identifier level =~ "^APLOG_(EMERG|ALERT|CRIT|ERR|WARNING|NOTICE|INFO|STARTUP|DEBUG)$";
 identifier fn =~ "^ap_log_(|r|c|p)error$";
 
@@ -15,11 +15,11 @@ identifier fn =~ "^ap_log_(|r|c|p)error$
 )
         ,rv, s
 +       , APLOGNO()
-        ,format, ...)
+        ,fmt, ...)
 
 @r2@
 expression rv, s, c;
-constant char [] format;
+constant char[] fmt !~ "^APLOGNO";
 identifier level =~ "^APLOG_(EMERG|ALERT|CRIT|ERR|WARNING|NOTICE|INFO|STARTUP|DEBUG)$";
 
 @@
@@ -33,11 +33,11 @@ identifier level =~ "^APLOG_(EMERG|ALERT
 )
         ,rv, s, c
 +       , APLOGNO()
-        ,format, ...)
+        ,fmt, ...)
 
 @r3@
 expression rv, p, s, cert;
-constant char [] format;
+constant char[] fmt !~ "^APLOGNO";
 identifier level =~ "^APLOG_(EMERG|ALERT|CRIT|ERR|WARNING|NOTICE|INFO|STARTUP|DEBUG)$";
 
 @@
@@ -51,11 +51,11 @@ identifier level =~ "^APLOG_(EMERG|ALERT
 )
         ,rv, p, s , cert
 +       , APLOGNO()
-        ,format, ...)
+        ,fmt, ...)
 
 @r4@
 expression rv, rc, cert;
-constant char [] format;
+constant char[] fmt !~ "^APLOGNO";
 identifier level =~ "^APLOG_(EMERG|ALERT|CRIT|ERR|WARNING|NOTICE|INFO|STARTUP|DEBUG)$";
 identifier fn =~ "^ssl_log_(r|c)xerror$";
 
@@ -70,6 +70,5 @@ identifier fn =~ "^ssl_log_(r|c)xerror$"
 )
         ,rv, rc , cert
 +       , APLOGNO()
-        ,format, ...)
-
+        ,fmt, ...)
 



Mime
View raw message