[apparmor] [PATCH] quiet warnings from cache update

[Steve Beattie]

On Tue, Sep 14, 2010 at 11:27:31AM -0700, Kees Cook wrote:
> This is to be applied after John's cache updates, which defines the
> update_mru_tstamp and fixes a minor typo.

> === modified file 'parser/parser.h'
> --- parser/parser.h	2010-08-26 17:37:46 +0000
> +++ parser/parser.h	2010-09-14 18:24:14 +0000
> @@ -241,6 +241,7 @@
>  extern int regex_type;
>  extern int perms_create;
>  extern void pwarn(char *fmt, ...) __attribute__((__format__(__printf__, 1, 2)));
> +extern void update_mru_tstamp(FILE *file);
>  
>  extern FILE *yyin;
>  extern void yyrestart(FILE *fp);
> 

Heh, before committing, John added the extern declaration for
update_mru_tstamp().  I noticed this while merging the caching
patches to the 2.5 branch, and did not include the duplicate entry.
Here's a trivial patch to pull the second declaration back out:

=== modified file 'parser/parser.h'
--- parser/parser.h	2010-09-14 19:37:59 +0000
+++ parser/parser.h	2010-09-15 19:11:38 +0000
@@ -243,7 +243,6 @@
 extern struct timespec mru_tstamp;
 extern void update_mru_tstamp(FILE *file);
 extern void pwarn(char *fmt, ...) __attribute__((__format__(__printf__, 1, 2)));
-extern void update_mru_tstamp(FILE *file);
 
 extern FILE *yyin;
 extern void yyrestart(FILE *fp);

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/apparmor/attachments/20100915/0da26300/attachment.pgp