1.1 --- a/tools/libfsimage/ext2fs/fsys_ext2fs.c	Tue Jul 15 14:04:02 2008 +0100
     1.2 +++ b/tools/libfsimage/ext2fs/fsys_ext2fs.c	Tue Jul 15 15:03:58 2008 +0100
     1.3 @@ -281,7 +281,7 @@ struct ext2_dir_entry
     1.4  #define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)
     1.5  
     1.6  /* check filesystem types and read superblock into memory buffer */
     1.7 -int
     1.8 +static int
     1.9  ext2fs_mount (fsi_file_t *ffi, const char *options)
    1.10  {
    1.11    int retval = 1;
    1.12 @@ -419,7 +419,7 @@ ext2fs_block_map (fsi_file_t *ffi, int l
    1.13  }
    1.14  
    1.15  /* preconditions: all preconds of ext2fs_block_map */
    1.16 -int
    1.17 +static int
    1.18  ext2fs_read (fsi_file_t *ffi, char *buf, int len)
    1.19  {
    1.20    int logical_block;
    1.21 @@ -526,7 +526,7 @@ int ext2_is_fast_symlink (fsi_file_t *ff
    1.22   *   inode of the file we were trying to look up
    1.23   * side effects: messes up GROUP_DESC buffer area
    1.24   */
    1.25 -int
    1.26 +static int
    1.27  ext2fs_dir (fsi_file_t *ffi, char *dirname)
    1.28  {
    1.29    int current_ino = EXT2_ROOT_INO;	/* start at the root */

     2.1 --- a/tools/libfsimage/fat/fsys_fat.c	Tue Jul 15 14:04:02 2008 +0100
     2.2 +++ b/tools/libfsimage/fat/fsys_fat.c	Tue Jul 15 15:03:58 2008 +0100
     2.3 @@ -54,7 +54,7 @@ struct fat_superblock
     2.4  
     2.5  #define log2 grub_log2
     2.6  
     2.7 -int
     2.8 +static int
     2.9  fat_mount (fsi_file_t *ffi, const char *options)
    2.10  {
    2.11    struct fat_bpb bpb;
    2.12 @@ -179,7 +179,7 @@ fat_mount (fsi_file_t *ffi, const char *
    2.13    return 1;
    2.14  }
    2.15  
    2.16 -int
    2.17 +static int
    2.18  fat_read (fsi_file_t *ffi, char *buf, int len)
    2.19  {
    2.20    int logical_clust;
    2.21 @@ -273,7 +273,7 @@ fat_read (fsi_file_t *ffi, char *buf, in
    2.22    return errnum ? 0 : ret;
    2.23  }
    2.24  
    2.25 -int
    2.26 +static int
    2.27  fat_dir (fsi_file_t *ffi, char *dirname)
    2.28  {
    2.29    char *rest, ch, dir_buf[FAT_DIRENTRY_LENGTH];

     3.1 --- a/tools/libfsimage/iso9660/fsys_iso9660.c	Tue Jul 15 14:04:02 2008 +0100
     3.2 +++ b/tools/libfsimage/iso9660/fsys_iso9660.c	Tue Jul 15 15:03:58 2008 +0100
     3.3 @@ -101,7 +101,7 @@ iso9660_devread (fsi_file_t *ffi, int se
     3.4    return devread(ffi, sector, byte_offset, byte_len, buf);
     3.5  }
     3.6  
     3.7 -int
     3.8 +static int
     3.9  iso9660_mount (fsi_file_t *ffi, const char *options)
    3.10  {
    3.11    unsigned int sector;
    3.12 @@ -141,7 +141,7 @@ iso9660_mount (fsi_file_t *ffi, const ch
    3.13    return 0;
    3.14  }
    3.15  
    3.16 -int
    3.17 +static int
    3.18  iso9660_dir (fsi_file_t *ffi, char *dirname)
    3.19  {
    3.20    struct iso_directory_record *idr;
    3.21 @@ -413,7 +413,7 @@ iso9660_dir (fsi_file_t *ffi, char *dirn
    3.22    return 1;
    3.23  }
    3.24  
    3.25 -int
    3.26 +static int
    3.27  iso9660_read (fsi_file_t *ffi, char *buf, int len)
    3.28  {
    3.29    int sector, blkoffset, size, ret;

     4.1 --- a/tools/libfsimage/reiserfs/fsys_reiserfs.c	Tue Jul 15 14:04:02 2008 +0100
     4.2 +++ b/tools/libfsimage/reiserfs/fsys_reiserfs.c	Tue Jul 15 15:03:58 2008 +0100
     4.3 @@ -555,7 +555,7 @@ journal_init (fsi_file_t *ffi)
     4.4  }
     4.5  
     4.6  /* check filesystem types and read superblock into memory buffer */
     4.7 -int
     4.8 +static int
     4.9  reiserfs_mount (fsi_file_t *ffi, const char *options)
    4.10  {
    4.11    struct reiserfs_super_block super;
    4.12 @@ -872,7 +872,7 @@ search_stat (fsi_file_t *ffi, __u32 dir_
    4.13    return 0;
    4.14  }
    4.15  
    4.16 -int
    4.17 +static int
    4.18  reiserfs_read (fsi_file_t *ffi, char *buf, int len)
    4.19  {
    4.20    unsigned int blocksize;
    4.21 @@ -980,7 +980,7 @@ reiserfs_read (fsi_file_t *ffi, char *bu
    4.22   *   of the file we were trying to look up, filepos is 0 and filemax is 
    4.23   *   the size of the file.
    4.24   */
    4.25 -int
    4.26 +static int
    4.27  reiserfs_dir (fsi_file_t *ffi, char *dirname)
    4.28  {
    4.29    struct reiserfs_de_head *de_head;

     5.1 --- a/tools/libfsimage/ufs/fsys_ufs.c	Tue Jul 15 14:04:02 2008 +0100
     5.2 +++ b/tools/libfsimage/ufs/fsys_ufs.c	Tue Jul 15 15:03:58 2008 +0100
     5.3 @@ -44,7 +44,7 @@ static grub_ino_t dlook(fsi_file_t *, gr
     5.4  static grub_daddr32_t sbmap(fsi_file_t *, grub_daddr32_t);
     5.5  
     5.6  /* read superblock and check fs magic */
     5.7 -int
     5.8 +static int
     5.9  ufs_mount(fsi_file_t *ffi, const char *options)
    5.10  {
    5.11  	if (/*! IS_PC_SLICE_TYPE_SOLARIS(current_slice) || */
    5.12 @@ -62,7 +62,7 @@ ufs_mount(fsi_file_t *ffi, const char *o
    5.13   * The entry point should really be named ufs_open(char *pathname).
    5.14   * For now, keep it consistent with the rest of fsys modules.
    5.15   */
    5.16 -int
    5.17 +static int
    5.18  ufs_dir(fsi_file_t *ffi, char *dirname)
    5.19  {
    5.20  	grub_ino_t inode = ROOTINO;	/* start from root */
    5.21 @@ -102,7 +102,7 @@ ufs_dir(fsi_file_t *ffi, char *dirname)
    5.22  /*
    5.23   * This is the high-level read function.
    5.24   */
    5.25 -int
    5.26 +static int
    5.27  ufs_read(fsi_file_t *ffi, char *buf, int len)
    5.28  {
    5.29    	int off, size, ret = 0, ok;

     6.1 --- a/tools/libfsimage/zfs/fsys_zfs.c	Tue Jul 15 14:04:02 2008 +0100
     6.2 +++ b/tools/libfsimage/zfs/fsys_zfs.c	Tue Jul 15 15:03:58 2008 +0100
     6.3 @@ -1199,7 +1199,7 @@ check_pool_label(fsi_file_t *ffi, int la
     6.4   *	1 - success
     6.5   *	0 - failure
     6.6   */
     6.7 -int
     6.8 +static int
     6.9  zfs_mount(fsi_file_t *ffi, const char *options)
    6.10  {
    6.11  	char *stack;
    6.12 @@ -1284,7 +1284,7 @@ zfs_mount(fsi_file_t *ffi, const char *o
    6.13   *	1 - success
    6.14   *	0 - failure
    6.15   */
    6.16 -int
    6.17 +static int
    6.18  zfs_open(fsi_file_t *ffi, char *filename)
    6.19  {
    6.20  	char *stack;
    6.21 @@ -1377,7 +1377,7 @@ zfs_open(fsi_file_t *ffi, char *filename
    6.22   *	len - the length successfully read in to the buffer
    6.23   *	0   - failure
    6.24   */
    6.25 -int
    6.26 +static int
    6.27  zfs_read(fsi_file_t *ffi, char *buf, int len)
    6.28  {
    6.29  	char *stack;

     7.1 --- a/tools/misc/xenperf.c	Tue Jul 15 14:04:02 2008 +0100
     7.2 +++ b/tools/misc/xenperf.c	Tue Jul 15 15:03:58 2008 +0100
     7.3 @@ -68,7 +68,7 @@ const char *hypercall_name_table[64] =
     7.4  };
     7.5  #undef X
     7.6  
     7.7 -int lock_pages(void *addr, size_t len)
     7.8 +static int lock_pages(void *addr, size_t len)
     7.9  {
    7.10      int e = 0;
    7.11  #ifndef __sun__
    7.12 @@ -77,7 +77,7 @@ int lock_pages(void *addr, size_t len)
    7.13      return (e);
    7.14  }
    7.15  
    7.16 -void unlock_pages(void *addr, size_t len)
    7.17 +static void unlock_pages(void *addr, size_t len)
    7.18  {
    7.19  #ifndef __sun__
    7.20      munlock(addr, len);

     8.1 --- a/tools/python/xen/lowlevel/acm/acm.c	Tue Jul 15 14:04:02 2008 +0100
     8.2 +++ b/tools/python/xen/lowlevel/acm/acm.c	Tue Jul 15 15:03:58 2008 +0100
     8.3 @@ -40,7 +40,7 @@ fprintf(stderr, "ERROR: " _m " (%d = %s)
     8.4  static PyObject *acm_error_obj;
     8.5  
     8.6  /* generic shared function */
     8.7 -void * __getssid(int domid, uint32_t *buflen)
     8.8 +static void *__getssid(int domid, uint32_t *buflen)
     8.9  {
    8.10      struct acm_getssid getssid;
    8.11      int xc_handle;