[Cocci] Matching format strings

[julia.lawall@lip6.fr (Julia Lawall)]

On Tue, 11 Jul 2017, Ond?ej Kuzn?k wrote:

> On Tue, Jul 11, 2017 at 03:10:36PM +0200, Julia Lawall wrote:
> > On Tue, 11 Jul 2017, Ond?ej Kuzn?k wrote:
> >> On Mon, Jul 10, 2017 at 07:26:36PM +0200, Julia Lawall wrote:
> >>> Try running spatch --parse-c on your directory to get a list at the end of
> >>> the top 10 things it doesn't like.
> >>
> >> One of the system dependent macros SLAP_EVENT_DECL is listed in each of
> >> the 10 things. The macro is used in
> >> https://github.com/openldap/openldap/blob/master/servers/slapd/daemon.c#L2343
> >> to declare some variables used in the corresponding event loop.
> >>
> >> The macro definition looks like this:
> >>
> >> # define SLAP_EVENT_DECL		struct pollfd *revents
> >>
> >> or:
> >>
> >> # define SLAP_EVENT_DECL	fd_set readfds, writefds; char *rflags
> >>
> >> Ignoring this macro is OK I guess, if there is a way to do that with
> >> coccinelle?
> >
> > Just
> >
> > #define SLAP_EVENT_DECL
> >
> > in the .h file. But there will be stray ;s then.  So you might want to put
> > the whole first definition.
>
> It does seem to improve things, thanks. The line 2496 still doesn't
> apply even when I declare SLAP_EVENT_FNAME to something like "name" in
> -macro-file-builtins and I think there were similar ones in other files
> later.
>
> >> Also, moving onto the other patch, I get similar inconsistencies with
> >> ./servers/slapd/back-sql/add.c, --parse-c doesn't list any problematic
> >> statements but the output logs a few parse errors that don't make much
> >> sense to me.
> >
> > Could you send the complete semantic patch that you are currently
> > considering?  Then I can take a look.
>
> Attaching the patches I'm currently working with:
> (-macro-file-builtins macros.h)
> 1. variadic.cocci
> 2. shortcut.cocci
> 3. merge.cocci
>
> The back-sql issue above is when trying to apply 2. (shortcut.cocci).
> But the one I pasted in my last email is simple enough to illustrate the
> issue (trying to merge snprintf and Debug, then get rid of extra if()s)
> even without the python stuff.

Sorry, but I'm lost.  I tried shortcut.cocci on
./servers/slapd/back-sql/add.c, and afterwards
./servers/slapd/back-sql/add.c has no snprintfs.  My command line is:

spatch -macro-file-builtins macros.h --in-place ./servers/slapd/back-sql/add.c shortcut.cocci

julia

>
> Thanks,
>
> --
> Ond?ej Kuzn?k
> Senior Software Engineer
> Symas Corporation                       http://www.symas.com
> Packaged, certified, and supported LDAP solutions powered by OpenLDAP
>