Re: linux-next: build warning after merge of the security-testingtree

[James Morris]

On Wed, 10 Mar 2010, Stephen Rothwell wrote:

> Hi James,
> 
> After merging the security-testing tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
> 
> scripts/selinux/genheaders/genheaders.c: In function 'main':
> scripts/selinux/genheaders/genheaders.c:84: warning: initialization discards qualifiers from pointer target type
> 
> Introduced by commit 634a539e16bd7a1ba31c3f832baa725565cc9f96 ("selinux:
> const strings in tables").

Thanks, fix applied per below.

commit 310de047eef6685274045db1e6b39c9f313df428
Author: James Morris <jmorris@xxxxxxxxx>
Date:   Tue Mar 16 08:47:36 2010 +1100

    selinux: fix warning in genheaders
    
    Fix const warning in the genheaders script as a result of
    changes to the headers, as noted here:
    
    http://linux.derkeiler.com/Mailing-Lists/Kernel/2010-03/msg03977.html
    
    Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
    Signed-off-by: James Morris <jmorris@xxxxxxxxx>

diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index 2462696..58a12c2 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
 	fprintf(fout, "\n");
 
 	for (i = 1; i < isids_len; i++) {
-		char *s = initial_sid_to_string[i];
+		const char *s = initial_sid_to_string[i];
 		fprintf(fout, "#define SECINITSID_%s", s);
 		for (j = 0; j < max(1, 40 - strlen(s)); j++)
 			fprintf(fout, " ");

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/