Derrick Stolee <derrickstolee@xxxxxxxxxx> writes: >> - if (option_origin != NULL) > > This technically wouldn't hit your rule, since "E" isn't just the > variable name, as we typically do with our style. Is that something > that Coccinelle automatically simplifies? > >> + if (option_origin != NULL) { > > Do you want to take this opportunity to drop the "!= NULL" here? > >> + free(remote_name); >> remote_name = xstrdup(option_origin); >> + } >> > if (remote_name == NULL) > > Or do you want to keep similar style from the surrounding code? I think that it is better to leave that particular clean-up to the equals-null.cocci topic started by Elia; I know having them separate would cause a merge conflict, but even if I change them here, it will result in the same merge conflict anyway ;-)