tools: Make functions static which should not be exported.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

diff --git a/tools/libfsimage/ext2fs/fsys_ext2fs.c b/tools/libfsimage/ext2fs/fsys_ext2fs.c
index 5d186cb585ece609b576da3afcb5ff97b2095d9d..12fc8cafb84e1c12647e50f8fa677d31544ea8c4 100644 (file)
--- a/tools/libfsimage/ext2fs/fsys_ext2fs.c
+++ b/tools/libfsimage/ext2fs/fsys_ext2fs.c
@@ -281,7 +281,7 @@ struct ext2_dir_entry
 #define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)
 
 /* check filesystem types and read superblock into memory buffer */
-int
+static int
 ext2fs_mount (fsi_file_t *ffi, const char *options)
 {
   int retval = 1;
@@ -419,7 +419,7 @@ ext2fs_block_map (fsi_file_t *ffi, int logical_block)
 }
 
 /* preconditions: all preconds of ext2fs_block_map */
-int
+static int
 ext2fs_read (fsi_file_t *ffi, char *buf, int len)
 {
   int logical_block;
@@ -526,7 +526,7 @@ int ext2_is_fast_symlink (fsi_file_t *ffi)
  *   inode of the file we were trying to look up
  * side effects: messes up GROUP_DESC buffer area
  */
-int
+static int
 ext2fs_dir (fsi_file_t *ffi, char *dirname)
 {
   int current_ino = EXT2_ROOT_INO;     /* start at the root */

diff --git a/tools/libfsimage/fat/fsys_fat.c b/tools/libfsimage/fat/fsys_fat.c
index 819465a16b06b8b53501976b24f505014f9215f9..d22d24333403af071c100ec94cb80d944a22b45f 100644 (file)
--- a/tools/libfsimage/fat/fsys_fat.c
+++ b/tools/libfsimage/fat/fsys_fat.c
@@ -54,7 +54,7 @@ struct fat_superblock
 
 #define log2 grub_log2
 
-int
+static int
 fat_mount (fsi_file_t *ffi, const char *options)
 {
   struct fat_bpb bpb;
@@ -179,7 +179,7 @@ fat_mount (fsi_file_t *ffi, const char *options)
   return 1;
 }
 
-int
+static int
 fat_read (fsi_file_t *ffi, char *buf, int len)
 {
   int logical_clust;
@@ -273,7 +273,7 @@ fat_read (fsi_file_t *ffi, char *buf, int len)
   return errnum ? 0 : ret;
 }
 
-int
+static int
 fat_dir (fsi_file_t *ffi, char *dirname)
 {
   char *rest, ch, dir_buf[FAT_DIRENTRY_LENGTH];

diff --git a/tools/libfsimage/iso9660/fsys_iso9660.c b/tools/libfsimage/iso9660/fsys_iso9660.c
index 20254ba4f50f9dc07450b35be8538e1e9eb1fd3d..b991cfce11db371c44d8a895f6a083a70db654e9 100644 (file)
--- a/tools/libfsimage/iso9660/fsys_iso9660.c
+++ b/tools/libfsimage/iso9660/fsys_iso9660.c
@@ -101,7 +101,7 @@ iso9660_devread (fsi_file_t *ffi, int sector, int byte_offset, int byte_len, cha
   return devread(ffi, sector, byte_offset, byte_len, buf);
 }
 
-int
+static int
 iso9660_mount (fsi_file_t *ffi, const char *options)
 {
   unsigned int sector;
@@ -141,7 +141,7 @@ iso9660_mount (fsi_file_t *ffi, const char *options)
   return 0;
 }
 
-int
+static int
 iso9660_dir (fsi_file_t *ffi, char *dirname)
 {
   struct iso_directory_record *idr;
@@ -413,7 +413,7 @@ iso9660_dir (fsi_file_t *ffi, char *dirname)
   return 1;
 }
 
-int
+static int
 iso9660_read (fsi_file_t *ffi, char *buf, int len)
 {
   int sector, blkoffset, size, ret;

diff --git a/tools/libfsimage/reiserfs/fsys_reiserfs.c b/tools/libfsimage/reiserfs/fsys_reiserfs.c
index 9ec173bf6d20774d593480823086af3968b4e535..ce60961ae11a7561b86d6f295a74fa777abf18bf 100644 (file)
--- a/tools/libfsimage/reiserfs/fsys_reiserfs.c
+++ b/tools/libfsimage/reiserfs/fsys_reiserfs.c
@@ -555,7 +555,7 @@ journal_init (fsi_file_t *ffi)
 }
 
 /* check filesystem types and read superblock into memory buffer */
-int
+static int
 reiserfs_mount (fsi_file_t *ffi, const char *options)
 {
   struct reiserfs_super_block super;
@@ -872,7 +872,7 @@ search_stat (fsi_file_t *ffi, __u32 dir_id, __u32 objectid)
   return 0;
 }
 
-int
+static int
 reiserfs_read (fsi_file_t *ffi, char *buf, int len)
 {
   unsigned int blocksize;
@@ -980,7 +980,7 @@ reiserfs_read (fsi_file_t *ffi, char *buf, int len)
  *   of the file we were trying to look up, filepos is 0 and filemax is 
  *   the size of the file.
  */
-int
+static int
 reiserfs_dir (fsi_file_t *ffi, char *dirname)
 {
   struct reiserfs_de_head *de_head;

diff --git a/tools/libfsimage/ufs/fsys_ufs.c b/tools/libfsimage/ufs/fsys_ufs.c
index 4d6db3689e629f9c2d048338ab47c9fc7a3efd4f..be5141125742da54ed4e96fa04c13eca535a9b2d 100644 (file)
--- a/tools/libfsimage/ufs/fsys_ufs.c
+++ b/tools/libfsimage/ufs/fsys_ufs.c
@@ -44,7 +44,7 @@ static grub_ino_t dlook(fsi_file_t *, grub_ino_t, char *);
 static grub_daddr32_t sbmap(fsi_file_t *, grub_daddr32_t);
 
 /* read superblock and check fs magic */
-int
+static int
 ufs_mount(fsi_file_t *ffi, const char *options)
 {
        if (/*! IS_PC_SLICE_TYPE_SOLARIS(current_slice) || */
@@ -62,7 +62,7 @@ ufs_mount(fsi_file_t *ffi, const char *options)
  * The entry point should really be named ufs_open(char *pathname).
  * For now, keep it consistent with the rest of fsys modules.
  */
-int
+static int
 ufs_dir(fsi_file_t *ffi, char *dirname)
 {
        grub_ino_t inode = ROOTINO;     /* start from root */
@@ -102,7 +102,7 @@ ufs_dir(fsi_file_t *ffi, char *dirname)
 /*
  * This is the high-level read function.
  */
-int
+static int
 ufs_read(fsi_file_t *ffi, char *buf, int len)
 {
        int off, size, ret = 0, ok;

diff --git a/tools/libfsimage/zfs/fsys_zfs.c b/tools/libfsimage/zfs/fsys_zfs.c
index d6f9880babe1a60508343719d3c9909f77eed9a3..1409e3cde6eb770a3884889a46c7c342e10bd60b 100644 (file)
--- a/tools/libfsimage/zfs/fsys_zfs.c
+++ b/tools/libfsimage/zfs/fsys_zfs.c
@@ -1199,7 +1199,7 @@ check_pool_label(fsi_file_t *ffi, int label, char *stack)
  *     1 - success
  *     0 - failure
  */
-int
+static int
 zfs_mount(fsi_file_t *ffi, const char *options)
 {
        char *stack;
@@ -1284,7 +1284,7 @@ zfs_mount(fsi_file_t *ffi, const char *options)
  *     1 - success
  *     0 - failure
  */
-int
+static int
 zfs_open(fsi_file_t *ffi, char *filename)
 {
        char *stack;
@@ -1377,7 +1377,7 @@ zfs_open(fsi_file_t *ffi, char *filename)
  *     len - the length successfully read in to the buffer
  *     0   - failure
  */
-int
+static int
 zfs_read(fsi_file_t *ffi, char *buf, int len)
 {
        char *stack;

diff --git a/tools/misc/xenperf.c b/tools/misc/xenperf.c
index e91c5b63620a7075b6d0633586d3237af746c954..36d1f1d7f3eacc1dc651ed289143b5a01bfe5635 100644 (file)
--- a/tools/misc/xenperf.c
+++ b/tools/misc/xenperf.c
@@ -68,7 +68,7 @@ const char *hypercall_name_table[64] =
 };
 #undef X
 
-int lock_pages(void *addr, size_t len)
+static int lock_pages(void *addr, size_t len)
 {
     int e = 0;
 #ifndef __sun__
@@ -77,7 +77,7 @@ int lock_pages(void *addr, size_t len)
     return (e);
 }
 
-void unlock_pages(void *addr, size_t len)
+static void unlock_pages(void *addr, size_t len)
 {
 #ifndef __sun__
     munlock(addr, len);

diff --git a/tools/python/xen/lowlevel/acm/acm.c b/tools/python/xen/lowlevel/acm/acm.c
index 1762aa2fda5df21a410f712c86845e750400ce67..662c7f72d4407282bea04bea2c0c7910cd43432e 100644 (file)
--- a/tools/python/xen/lowlevel/acm/acm.c
+++ b/tools/python/xen/lowlevel/acm/acm.c
@@ -40,7 +40,7 @@ fprintf(stderr, "ERROR: " _m " (%d = %s)\n" , ## _a ,    \
 static PyObject *acm_error_obj;
 
 /* generic shared function */
-void * __getssid(int domid, uint32_t *buflen)
+static void *__getssid(int domid, uint32_t *buflen)
 {
     struct acm_getssid getssid;
     int xc_handle;