From 5da3b429698e41a688adb678346a0d55bc5fbf5c Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 14 Jun 2001 20:08:27 +0000
Subject: [PATCH] * ftpfs.c: Declare functions without declarations static.
 Don't omit `void' in declarations. * cpio.c: Likewise. * direntry.c:
 Likewise. * extfs.c: Likewise. * mcfs.c: Likewise. * tar.c: Likewise. *
 vfs.c: Likewise. * vfs.h: Likewise. * mcserv.c: Likewise. Remove unused
 functions.

---
 vfs/ChangeLog  |  11 +++++
 vfs/cpio.c     |   6 +--
 vfs/direntry.c |   4 +-
 vfs/extfs.c    |   5 +--
 vfs/ftpfs.c    |   6 +--
 vfs/mcfs.c     |   2 +-
 vfs/mcserv.c   | 109 ++++++++++++++++++++++---------------------------
 vfs/tar.c      |   4 +-
 vfs/vfs.c      |  10 ++---
 vfs/vfs.h      |   4 +-
 10 files changed, 79 insertions(+), 82 deletions(-)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index a04ceb5d7..70be4a474 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,5 +1,16 @@
 2001-06-14  Pavel Roskin  <proski@gnu.org>
 
+	* ftpfs.c: Declare functions without declarations static. Don't
+	omit `void' in declarations.
+	* cpio.c: Likewise.
+	* direntry.c: Likewise.
+	* extfs.c: Likewise.
+	* mcfs.c: Likewise.
+	* tar.c: Likewise.
+	* vfs.c: Likewise.
+	* vfs.h: Likewise.
+	* mcserv.c: Likewise. Remove unused functions.
+
 	* util-alone.c: Use indented #error.
 	* vfs.h: Use indented #warning instead of hiding it from non-gcc
 	compilers.
diff --git a/vfs/cpio.c b/vfs/cpio.c
index 8ae16a7e6..a8c631c0f 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -103,7 +103,7 @@ static int cpio_read(void *fh, char *buffer, int count);
 #define CPIO_SEEK_SET(super, where) mc_lseek((super)->u.cpio.fd, CPIO_POS(super) = (where), SEEK_SET)
 #define CPIO_SEEK_CUR(super, where) mc_lseek((super)->u.cpio.fd, CPIO_POS(super) += (where), SEEK_SET)
 
-struct defer_inode * defer_find(struct defer_inode *l, struct defer_inode *i)
+static struct defer_inode * defer_find(struct defer_inode *l, struct defer_inode *i)
 {
     if(!l) return NULL;
     return l->inumber == i->inumber && l->device == i->device ? l : 
@@ -528,7 +528,7 @@ static int cpio_open_archive(vfs *me, vfs_s_super *super, char *name, char *op)
 }
 
 /* Remaining functions are exactly same as for tarfs (and were in fact just copied) */
-void *cpio_super_check(vfs *me, char *archive_name, char *op)
+static void *cpio_super_check(vfs *me, char *archive_name, char *op)
 {
     static struct stat sb;
     if(mc_stat(archive_name, &sb))
@@ -536,7 +536,7 @@ void *cpio_super_check(vfs *me, char *archive_name, char *op)
     return &sb;
 }
 
-int cpio_super_same(vfs *me, struct vfs_s_super *parc, char *archive_name, char *op, void *cookie)
+static int cpio_super_same(vfs *me, struct vfs_s_super *parc, char *archive_name, char *op, void *cookie)
 {	
     struct stat *archive_stat = cookie;	/* stat of main archive */
 
diff --git a/vfs/direntry.c b/vfs/direntry.c
index 77b65161f..0fca072c7 100644
--- a/vfs/direntry.c
+++ b/vfs/direntry.c
@@ -76,7 +76,7 @@ vfs_s_new_entry (vfs *me, char *name, vfs_s_inode *inode)
     return entry;
 }
 
-void
+static void
 vfs_s_free_inode (vfs *me, vfs_s_inode *ino)
 {
     if (!ino)
@@ -406,7 +406,7 @@ vfs_s_new_super (vfs *me)
     return super;
 }
 
-void
+static void
 vfs_s_insert_super (vfs *me, vfs_s_super *super)
 {
     super->next = MEDATA->supers;
diff --git a/vfs/extfs.c b/vfs/extfs.c
index 878236e04..2cf9e4b9b 100644
--- a/vfs/extfs.c
+++ b/vfs/extfs.c
@@ -552,10 +552,7 @@ static char *get_archive_name (struct archive *archive)
 	return archive_name;
 }
 
-/* FIXME: we really should not have non-static procedures - it
- * pollutes namespace.  */
-
-void extfs_run (char *file)
+static void extfs_run (char *file)
 {
     struct archive *archive;
     char *p, *q, *archive_name, *mc_extfsdir;
diff --git a/vfs/ftpfs.c b/vfs/ftpfs.c
index b927a9464..e1221be67 100644
--- a/vfs/ftpfs.c
+++ b/vfs/ftpfs.c
@@ -520,7 +520,7 @@ static struct no_proxy_entry {
 } *no_proxy;
 
 static void
-load_no_proxy_list ()
+load_no_proxy_list (void)
 {
     /* FixMe: shouldn't be hardcoded!!! */
     char	s[BUF_LARGE]; /* provide for BUF_LARGE characters */
@@ -698,7 +698,7 @@ ftpfs_open_socket (vfs *me, vfs_s_super *super)
     return my_socket;
 }
 
-int
+static int
 open_archive_int (vfs *me, vfs_s_super *super)
 {
     int retry_seconds, count_down;
@@ -1442,7 +1442,7 @@ linear_close (vfs *me, vfs_s_fh *fh)
         linear_abort(me, fh);
 }
 
-int ftpfs_ctl (void *fh, int ctlop, int arg)
+static int ftpfs_ctl (void *fh, int ctlop, int arg)
 {
     switch (ctlop) {
         case MCCTL_IS_NOTREADY:
diff --git a/vfs/mcfs.c b/vfs/mcfs.c
index aadde01ce..a75658c6e 100644
--- a/vfs/mcfs.c
+++ b/vfs/mcfs.c
@@ -278,7 +278,7 @@ static int mcfs_open_tcp_link (char *host, char *user,
 }
 
 static int mcfs_get_free_bucket_init = 1;
-static mcfs_connection *mcfs_get_free_bucket ()
+static mcfs_connection *mcfs_get_free_bucket (void)
 {
     int i;
     
diff --git a/vfs/mcserv.c b/vfs/mcserv.c
index 8b740326e..876b285ec 100644
--- a/vfs/mcserv.c
+++ b/vfs/mcserv.c
@@ -156,7 +156,7 @@ static int return_code;
 
 /* {{{ Misc routines */
 
-void send_status (int status, int errno_number)
+static void send_status (int status, int errno_number)
 {
     rpc_send (msock, RPC_INT, status, RPC_INT, errno_number, RPC_END);
     errno = 0;
@@ -166,7 +166,7 @@ void send_status (int status, int errno_number)
 
 /* {{{ File with handle operations */
 
-void do_open (void)
+static void do_open (void)
 {
     int handle, flags, mode;
     char *arg;
@@ -178,7 +178,7 @@ void do_open (void)
     g_free (arg);
 }
 
-void do_read (void)
+static void do_read (void)
 {
     int handle, count, n;
     void *data;
@@ -202,7 +202,7 @@ void do_read (void)
     g_free (data);
 }
 
-void do_write (void)
+static void do_write (void)
 {
     int handle, count, status, written = 0;
     char buf[8192];
@@ -229,7 +229,7 @@ void do_write (void)
     send_status (written, errno);
 }
 
-void do_lseek (void)
+static void do_lseek (void)
 {
     int handle, offset, whence, status;
 
@@ -241,7 +241,7 @@ void do_lseek (void)
     send_status (status, errno);
 }
 
-void do_close (void)
+static void do_close (void)
 {
     int handle, status;
     
@@ -254,7 +254,7 @@ void do_close (void)
 
 /* {{{ Stat family routines */
 
-void send_time (int sock, time_t time)
+static void send_time (int sock, time_t time)
 {
     if (clnt_version == 1) {
 	char   *ct;
@@ -302,7 +302,7 @@ void send_time (int sock, time_t time)
     }
 }
 
-void send_stat_info (struct stat *st)
+static void send_stat_info (struct stat *st)
 {
     long mylong;
     int blocks =
@@ -330,7 +330,7 @@ void send_stat_info (struct stat *st)
     send_time (msock, st->st_ctime);
 }
 
-void do_lstat ()
+static void do_lstat (void)
 {
     struct stat st;
     char   *file;
@@ -344,7 +344,7 @@ void do_lstat ()
     g_free (file);
 }
 
-void do_fstat (void)
+static void do_fstat (void)
 {
     int handle;
     int n;
@@ -359,7 +359,7 @@ void do_fstat (void)
     send_stat_info (&st);
 }
 
-void do_stat ()
+static void do_stat (void)
 {
     struct stat st;
     int    n;
@@ -384,7 +384,7 @@ static struct {
     char *names [OPENDIR_HANDLES];
 } mcfs_DIR;
 
-void close_handle (int handle)
+static void close_handle (int handle)
 {
     if (mcfs_DIR.used > 0) mcfs_DIR.used--;
     if (mcfs_DIR.dirs [handle])
@@ -395,7 +395,7 @@ void close_handle (int handle)
     mcfs_DIR.names [handle] = 0;
 }
 
-void do_opendir (void)
+static void do_opendir (void)
 {
     int handle, i;
     char *arg;
@@ -442,7 +442,7 @@ void do_opendir (void)
 }
 
 /* Sends the complete directory listing, as well as the stat information */
-void do_readdir (void)
+static void do_readdir (void)
 {
     struct dirent *dirent;
     struct stat st;
@@ -475,7 +475,7 @@ void do_readdir (void)
     rpc_send (msock, RPC_INT, 0, RPC_END);
 }
 
-void do_closedir (void)
+static void do_closedir (void)
 {
     int handle;
 
@@ -487,7 +487,7 @@ void do_closedir (void)
 
 /* {{{ Operations with one and two file name argument */
 
-void do_chdir (void)
+static void do_chdir (void)
 {
     char *file;
     int  status;
@@ -499,7 +499,7 @@ void do_chdir (void)
     g_free (file);
 }
 
-void do_rmdir (void)
+static void do_rmdir (void)
 {
     char *file;
     int  status;
@@ -511,7 +511,7 @@ void do_rmdir (void)
     g_free (file);
 }
 
-void do_mkdir (void)
+static void do_mkdir (void)
 {
     char *file;
     int  mode, status;
@@ -523,7 +523,7 @@ void do_mkdir (void)
     g_free (file);
 }
 
-void do_mknod (void)
+static void do_mknod (void)
 {
     char *file;
     int  mode, dev, status;
@@ -535,7 +535,7 @@ void do_mknod (void)
     g_free (file);
 }
 
-void do_readlink (void)
+static void do_readlink (void)
 {
     char buffer [2048];
     char *file;
@@ -551,7 +551,7 @@ void do_readlink (void)
     g_free (file);
 }
 
-void do_unlink (void)
+static void do_unlink (void)
 {
     char *file;
     int  status;
@@ -562,7 +562,7 @@ void do_unlink (void)
     g_free (file);
 }
 
-void do_rename (void)
+static void do_rename (void)
 {
     char *f1, *f2;
     int  status;
@@ -573,7 +573,7 @@ void do_rename (void)
     g_free (f1); g_free (f2);
 }
 
-void do_symlink (void)
+static void do_symlink (void)
 {
     char *f1, *f2;
     int  status;
@@ -584,7 +584,7 @@ void do_symlink (void)
     g_free (f1); g_free (f2);
 }
 
-void do_link (void)
+static void do_link (void)
 {
     char *f1, *f2;
     int  status;
@@ -600,17 +600,17 @@ void do_link (void)
 
 /* {{{ Misc commands */
 
-void do_gethome (void)
+static void do_gethome (void)
 {
     rpc_send (msock, RPC_STRING, (home_dir) ? home_dir : "/", RPC_END);
 }
 
-void do_getupdir (void)
+static void do_getupdir (void)
 {
     rpc_send (msock, RPC_STRING, (up_dir) ? up_dir : "/", RPC_END);
 }
 
-void do_chmod (void)
+static void do_chmod (void)
 {
     char *file;
     int  mode, status;
@@ -621,7 +621,7 @@ void do_chmod (void)
     g_free (file);
 }
 
-void do_chown (void)
+static void do_chown (void)
 {
     char *file;
     int  owner, group, status;
@@ -632,7 +632,7 @@ void do_chown (void)
     g_free (file);
 }
 
-void do_utime (void)
+static void do_utime (void)
 {
     char *file;
     int  status;
@@ -659,7 +659,7 @@ void do_utime (void)
     g_free (file);
 }
 
-void do_quit ()
+static void do_quit (void)
 {
     quit_server = 1;
 }
@@ -671,7 +671,7 @@ struct user_pass {
     char *password;
 };
 
-int
+static int
 mc_pam_conversation (int messages, const struct pam_message **msg,
 		     struct pam_response **resp, void *appdata_ptr)
 {
@@ -715,7 +715,7 @@ static struct pam_conv conv = { &mc_pam_conversation, NULL };
 			     
 
 /* Return 0 if authentication failed, 1 otherwise */
-int
+static int
 mc_pam_auth (char *username, char *password)
 {
     pam_handle_t *pamh;
@@ -769,7 +769,7 @@ static int ftp_answer (int sock, char *text)
     return 0;
 }
 
-int do_ftp_auth (char *username, char *password)
+static int do_ftp_auth (char *username, char *password)
 {
     struct   sockaddr_in local_address;
     unsigned long inaddr;
@@ -820,7 +820,7 @@ int do_ftp_auth (char *username, char *password)
     return 0;
 }
 
-int do_classic_auth (char *username, char *password)
+static int do_classic_auth (char *username, char *password)
 {
     struct passwd *this;
     int ret;
@@ -866,7 +866,7 @@ int do_classic_auth (char *username, char *password)
    - conventional auth (check salt on /etc/passwd, crypt, and compare
    - try to contact the local ftp server and login (if -f flag used)
 */
-int
+static int
 do_auth (char *username, char *password)
 {
     int auth = 0;
@@ -943,7 +943,7 @@ do_auth (char *username, char *password)
 }
 
 #if 0
-int do_rauth (int socket)
+static int do_rauth (int socket)
 {
     struct sockaddr_in from;
     struct hostent *hp;
@@ -962,12 +962,12 @@ int do_rauth (int socket)
 }
 #endif
 
-int do_rauth (int msock)
+static int do_rauth (int msock)
 {
     return 0;
 }
 
-void login_reply (int logged_in)
+static void login_reply (int logged_in)
 {
     rpc_send (msock, RPC_INT,
 	      logged_in ? MC_LOGINOK : MC_INVALID_PASS,
@@ -975,7 +975,7 @@ void login_reply (int logged_in)
 }
 
 /* FIXME: Implement the anonymous login */
-void do_login ()
+static void do_login (void)
 {
     char *username;
     char *password;
@@ -1011,7 +1011,7 @@ void do_login ()
 
 /* This structure must be kept in synch with mcfs.h enums */
 
-struct _command {
+static struct _command {
     char *command;
     void (*callback)(void);
 } commands [] = {
@@ -1046,7 +1046,7 @@ struct _command {
 
 static int ncommands = sizeof(commands)/sizeof(struct _command);
 
-void exec_command (int command)
+static void exec_command (int command)
 {
     if (command < 0 ||
 	command >= ncommands ||
@@ -1058,7 +1058,7 @@ void exec_command (int command)
     (*commands [command].callback)();
 }
 
-void check_version ()
+static void check_version (void)
 {
     int version;
     
@@ -1079,7 +1079,7 @@ void tcp_invalidate_socket (int sock)
     DO_QUIT_VOID();
 }
 
-void server (int sock)
+static void server (int sock)
 {
     int command;
     
@@ -1098,7 +1098,7 @@ void server (int sock)
 
 /* {{{ Net support code */
 
-char *get_client (int portnum)
+static char *get_client (int portnum)
 {
     int sock, clilen, newsocket;
     struct sockaddr_in client_address, server_address;
@@ -1161,7 +1161,7 @@ char *get_client (int portnum)
 }
 
 #ifdef HAVE_PMAP_SET
-void signal_int_handler (int sig)
+static void signal_int_handler (int sig)
 {
     pmap_unset (RPC_PROGNUM, RPC_PROGVER);
 }
@@ -1171,7 +1171,7 @@ void signal_int_handler (int sig)
 #define IPPORT_RESERVED 1024;
 #endif
 
-int get_port_number ()
+static int get_port_number (void)
 {
     int port = 0;
 
@@ -1195,7 +1195,7 @@ int get_port_number ()
     return port;
 }
 
-void register_port (int portnum, int abort_if_fail)
+static void register_port (int portnum, int abort_if_fail)
 {
 #ifdef HAVE_PMAP_SET
     /* Register our service with the portmapper */
@@ -1291,20 +1291,9 @@ int main (int argc, char *argv [])
     exit (return_code);
 }
 
-/* This functions are not used */
-void message (int is_error, char *text, char *msg)
-{
-    printf ("%s %s\n", text, msg);
-}
-
-char *unix_error_string (int a)
-{
-    return "none";
-}
-
+/* FIXME: This function should not be used in mcserv */
 void vfs_die( char *m )
 {
     fprintf (stderr, m);
-	exit (1);
+    exit (1);
 }
-
diff --git a/vfs/tar.c b/vfs/tar.c
index bf7d32c95..ac4f1bb3a 100644
--- a/vfs/tar.c
+++ b/vfs/tar.c
@@ -433,7 +433,7 @@ static int open_archive (vfs *me, vfs_s_super *archive, char *name, char *op)
     return 0;
 }
 
-void *tar_super_check(vfs *me, char *archive_name, char *op)
+static void *tar_super_check(vfs *me, char *archive_name, char *op)
 {
     static struct stat stat_buf;
     if (mc_stat (archive_name, &stat_buf))
@@ -441,7 +441,7 @@ void *tar_super_check(vfs *me, char *archive_name, char *op)
     return &stat_buf;
 }
 
-int tar_super_same(vfs *me, struct vfs_s_super *parc, char *archive_name, char *op, void *cookie)
+static int tar_super_same(vfs *me, struct vfs_s_super *parc, char *archive_name, char *op, void *cookie)
 {	
     struct stat *archive_stat = cookie;	/* stat of main archive */
 
diff --git a/vfs/vfs.c b/vfs/vfs.c
index f853a8e9b..4c45ab5e6 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -109,7 +109,7 @@ get_bucket (void)
 /* vfs_local_ops needs to be the first one */
 static vfs *vfs_list = &vfs_local_ops;
 
-int
+static int
 vfs_register (vfs *vfs)
 {
     if (!vfs)
@@ -125,7 +125,7 @@ vfs_register (vfs *vfs)
     return 1;
 }
 
-vfs *
+static vfs *
 vfs_type_from_op (char *path)
 {
     vfs *vfs;
@@ -238,7 +238,7 @@ vfs_split (char *path, char **inpath, char **op)
     return ret;
 }
 
-vfs *
+static vfs *
 vfs_rosplit (char *path)
 {
     char *semi;
@@ -591,7 +591,7 @@ MC_HANDLEOP (fstat, (int handle, struct stat *buf), (vfs_info (handle), buf))
  * You must g_strdup whatever this function returns, static buffers are in use
  */
 
-char *
+static char *
 mc_return_cwd (void)
 {
     char *p;
@@ -1166,7 +1166,7 @@ mc_ungetlocalcopy (const char *pathname, char *local, int has_changed)
 /*
  * Hmm, as timeout is minute or so, do we need to care about usecs?
  */
-inline int
+static inline int
 timeoutcmp (struct timeval *t1, struct timeval *t2)
 {
     return ((t1->tv_sec < t2->tv_sec)
diff --git a/vfs/vfs.h b/vfs/vfs.h
index b36de93dc..b887d2020 100644
--- a/vfs/vfs.h
+++ b/vfs/vfs.h
@@ -184,9 +184,9 @@ struct utimbuf {
     void vfs_add_noncurrent_stamps (vfs *, vfsid, struct vfs_stamping *);
     void vfs_add_current_stamps (void);
     void vfs_free_resources(char *path);
-    void vfs_timeout_handler ();
+    void vfs_timeout_handler (void);
     void vfs_expire (int);
-    int vfs_timeouts ();
+    int vfs_timeouts (void);
 
     void vfs_fill_names (void (*)(char *));
     char *vfs_translate_url (char *);