From 1e6c5b17ce2f1ab05b5b809b71bf334eabe9af6f Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Mon, 19 Aug 2002 00:07:08 +0000
Subject: [PATCH] * mountlist.h: Move some internals ... * mountlist.c: ...
here.
---
src/ChangeLog | 3 +++
src/mountlist.c | 25 ++++++++++++++++++++-----
src/mountlist.h | 12 ------------
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 1e42a273e..c3ef1e1d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
2002-08-18 Pavel Roskin <proski@gnu.org>
+ * mountlist.h: Move some internals ...
+ * mountlist.c: ... here.
+
* main.c: Remove extremely unsafe and poorly designed support
for /tmp/mc.$PID.control file.
* util.c (my_putenv): Remove, it's unused now.
diff --git a/src/mountlist.c b/src/mountlist.c
index f4a4a8c15..3ad595309 100644
--- a/src/mountlist.c
+++ b/src/mountlist.c
@@ -109,6 +109,16 @@ void free (void *ptr);
#define MOUNTED_GETMNTTBL
#endif
+/* A mount table entry. */
+struct mount_entry
+{
+ char *me_devname; /* Device node pathname, including "/dev/". */
+ char *me_mountdir; /* Mount point directory pathname. */
+ char *me_type; /* "nfs", "4.2", etc. */
+ dev_t me_dev; /* Device number of me_mountdir. */
+ struct mount_entry *me_next;
+};
+
#ifdef HAVE_INFOMOUNT_LIST
static struct mount_entry *mount_list = NULL;
@@ -173,7 +183,8 @@ static char *fstype_to_string (short t)
#endif /* MOUNTED_GETMNTINFO && !HAVE_F_FSTYPENAME */
#ifdef MOUNTED_VMOUNT /* AIX. */
-static char *fstype_to_string (int t)
+static char *
+fstype_to_string (int t)
{
struct vfs_ent *e;
@@ -192,7 +203,8 @@ static char *fstype_to_string (int t)
If ALL_FS is zero, do not return entries for filesystems that
are automounter (dummy) entries. */
-struct mount_entry *read_filesystem_list (int need_fs_type, int all_fs)
+static struct mount_entry *
+read_filesystem_list (int need_fs_type, int all_fs)
{
struct mount_entry *mlist;
struct mount_entry *me;
@@ -483,7 +495,8 @@ struct mount_entry *read_filesystem_list (int need_fs_type, int all_fs)
** this hack.
*/
-struct mount_entry *read_filesystem_list(int need_fs_type, int all_fs)
+static struct mount_entry *
+read_filesystem_list(int need_fs_type, int all_fs)
{
struct _disk_entry de;
struct statfs fs;
@@ -543,14 +556,16 @@ struct mount_entry *read_filesystem_list(int need_fs_type, int all_fs)
}
#endif /* HAVE_INFOMOUNT_QNX */
-void init_my_statfs (void)
+void
+init_my_statfs (void)
{
#ifdef HAVE_INFOMOUNT_LIST
mount_list = read_filesystem_list (1, 1);
#endif /* HAVE_INFOMOUNT_LIST */
}
-void my_statfs (struct my_statfs *myfs_stats, char *path)
+void
+my_statfs (struct my_statfs *myfs_stats, char *path)
{
#ifdef HAVE_INFOMOUNT_LIST
int i, len = 0;
diff --git a/src/mountlist.h b/src/mountlist.h
index 2c9dc2304..a83de2d69 100644
--- a/src/mountlist.h
+++ b/src/mountlist.h
@@ -18,18 +18,6 @@
#ifndef __MOUNTLIST_H
#define __MOUNTLIST_H
-/* A mount table entry. */
-struct mount_entry
-{
- char *me_devname; /* Device node pathname, including "/dev/". */
- char *me_mountdir; /* Mount point directory pathname. */
- char *me_type; /* "nfs", "4.2", etc. */
- dev_t me_dev; /* Device number of me_mountdir. */
- struct mount_entry *me_next;
-};
-
-struct mount_entry *read_filesystem_list (int need_fs_type, int all_fs);
-
/* Filesystem status */
struct my_statfs {
int type;