From: Rainer Jung <rjung@apache.org>
Date: Tue, 19 Jan 2016 00:35:04 +0000 (+0000)
Subject: My (recent) version of coccinelle doesn't
X-Git-Tag: 2.5.0-alpha~2386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fc29f05102748f610cfee15d155300839dc510b;p=thirdparty%2Fapache%2Fhttpd.git

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(...).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725397 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/log-message-tags/find-messages.cocci b/docs/log-message-tags/find-messages.cocci
index 8bcd10f0ec0..436302901d5 100644
--- a/docs/log-message-tags/find-messages.cocci
+++ b/docs/log-message-tags/find-messages.cocci
@@ -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|CRIT|ERR|WARNING|NOTICE|INFO|STARTUP|DE
 )
         ,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|CRIT|ERR|WARNING|NOTICE|INFO|STARTUP|DE
 )
         ,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, ...)