2008-08-18 16:50:49

by Cordelia Sam

Subject: [PATCH] audit: Moved variable declaration to beginning of function

got rid of compilation warning:
ISO C90 forbids mixed declarations and code

Signed-off-by: Cordelia Sam <[email protected]>
---
kernel/auditsc.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 972f8e6..59cedfb 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -243,10 +243,11 @@ static inline int open_arg(int flags, int mask)

static int audit_match_perm(struct audit_context *ctx, int mask)
{
+ unsigned n;
if (unlikely(!ctx))
return 0;

- unsigned n = ctx->major;
+ n = ctx->major;
switch (audit_classify_syscall(ctx->arch, n)) {
case 0: /* native */
if ((mask & AUDIT_PERM_WRITE) &&
--
1.5.4.3

2008-08-18 22:26:01

by James Morris

Subject: Re: [PATCH] audit: Moved variable declaration to beginning of function

On Mon, 18 Aug 2008, Cordelia wrote:

> got rid of compilation warning:
> ISO C90 forbids mixed declarations and code
>
> Signed-off-by: Cordelia Sam <[email protected]>
> ---
> kernel/auditsc.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index 972f8e6..59cedfb 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -243,10 +243,11 @@ static inline int open_arg(int flags, int mask)
>
> static int audit_match_perm(struct audit_context *ctx, int mask)
> {
> + unsigned n;
> if (unlikely(!ctx))
> return 0;
>
> - unsigned n = ctx->major;
> + n = ctx->major;
> switch (audit_classify_syscall(ctx->arch, n)) {
> case 0: /* native */
> if ((mask & AUDIT_PERM_WRITE) &&


Reviewed-by: James Morris <[email protected]>

--
James Morris
<[email protected]>