Skip to content

Commit de5bd6c

Browse files
committed
Merge tag 'gcc-plugins-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull gcc-plugins fixes from Kees Cook: "Tiny gcc-plugin fixes for v5.12-rc2. These issues are small but have been reported a couple times now by static analyzers, so best to get them fixed to reduce the noise. :) - Fix coding style issues (Jason Yan)" * tag 'gcc-plugins-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: gcc-plugins: latent_entropy: remove unneeded semicolon gcc-plugins: structleak: remove unneeded variable 'ret'
2 parents 8b24ef4 + 5477edc commit de5bd6c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

scripts/gcc-plugins/latent_entropy_plugin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ static unsigned int latent_entropy_execute(void)
524524
while (bb != EXIT_BLOCK_PTR_FOR_FN(cfun)) {
525525
perturb_local_entropy(bb, local_entropy);
526526
bb = bb->next_bb;
527-
};
527+
}
528528

529529
/* 4. mix local entropy into the global entropy variable */
530530
perturb_latent_entropy(local_entropy);

scripts/gcc-plugins/structleak_plugin.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ static void initialize(tree var)
170170
static unsigned int structleak_execute(void)
171171
{
172172
basic_block bb;
173-
unsigned int ret = 0;
174173
tree var;
175174
unsigned int i;
176175

@@ -200,7 +199,7 @@ static unsigned int structleak_execute(void)
200199
initialize(var);
201200
}
202201

203-
return ret;
202+
return 0;
204203
}
205204

206205
#define PASS_NAME structleak

0 commit comments

Comments
 (0)