2009-11-18 14:56:20

by Alan

Subject: [PATCH] selinux: Fix warnings

scripts/selinux/genheaders/genheaders.c:20: warning: no previous prototype
for ‘usage’
scripts/selinux/genheaders/genheaders.c:26: warning: no previous prototype
for ‘stoupperx’

Signed-off-by: Alan Cox <[email protected]>
---

scripts/selinux/genheaders/genheaders.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index 3b16145..771b86f 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -17,13 +17,13 @@ struct security_class_mapping {

const char *progname;

-void usage(void)
+static void usage(void)
{
printf("usage: %s flask.h av_permissions.h\n", progname);
exit(1);
}

-char *stoupperx(const char *s)
+static char *stoupperx(const char *s)
{
char *s2 = strdup(s);
char *p;

2009-11-18 16:04:29

by Cong Wang

Subject: Re: [PATCH] selinux: Fix warnings

On Wed, Nov 18, 2009 at 02:39:51PM +0000, Alan Cox wrote:
>scripts/selinux/genheaders/genheaders.c:20: warning: no previous prototype
>for ‘usage’
>scripts/selinux/genheaders/genheaders.c:26: warning: no previous prototype
>for ‘stoupperx’
>
>Signed-off-by: Alan Cox <[email protected]>

Acked-by: WANG Cong <[email protected]>

>---
>
> scripts/selinux/genheaders/genheaders.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>
>diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
>index 3b16145..771b86f 100644
>--- a/scripts/selinux/genheaders/genheaders.c
>+++ b/scripts/selinux/genheaders/genheaders.c
>@@ -17,13 +17,13 @@ struct security_class_mapping {
>
> const char *progname;
>
>-void usage(void)
>+static void usage(void)
> {
> printf("usage: %s flask.h av_permissions.h\n", progname);
> exit(1);
> }
>
>-char *stoupperx(const char *s)
>+static char *stoupperx(const char *s)
> {
> char *s2 = strdup(s);
> char *p;
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to [email protected]
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at http://www.tux.org/lkml/

--
Live like a child, think like the god.

2009-11-18 22:09:18

by James Morris

Subject: Re: [PATCH] selinux: Fix warnings

On Thu, 19 Nov 2009, Am?rico Wang wrote:

> On Wed, Nov 18, 2009 at 02:39:51PM +0000, Alan Cox wrote:
> >scripts/selinux/genheaders/genheaders.c:20: warning: no previous prototype
> >for ?usage?
> >scripts/selinux/genheaders/genheaders.c:26: warning: no previous prototype
> >for ?stoupperx?
> >
> >Signed-off-by: Alan Cox <[email protected]>
>
> Acked-by: WANG Cong <[email protected]>
>

Thanks.


Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

> >---
> >
> > scripts/selinux/genheaders/genheaders.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> >
> >diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
> >index 3b16145..771b86f 100644
> >--- a/scripts/selinux/genheaders/genheaders.c
> >+++ b/scripts/selinux/genheaders/genheaders.c
> >@@ -17,13 +17,13 @@ struct security_class_mapping {
> >
> > const char *progname;
> >
> >-void usage(void)
> >+static void usage(void)
> > {
> > printf("usage: %s flask.h av_permissions.h\n", progname);
> > exit(1);
> > }
> >
> >-char *stoupperx(const char *s)
> >+static char *stoupperx(const char *s)
> > {
> > char *s2 = strdup(s);
> > char *p;
> >
> >--
> >To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> >the body of a message to [email protected]
> >More majordomo info at http://vger.kernel.org/majordomo-info.html
> >Please read the FAQ at http://www.tux.org/lkml/
>
> --
> Live like a child, think like the god.
>
>

--
James Morris
<[email protected]>