Ticket #2083: 2083-removing-unused-parm-struct-vfs_class.patch

lib/vfs/mc-vfs/extfs.c

@@ -1516 +1516 @@
 
 
 static int
-extfs_init (struct vfs_class *me)
+extfs_init (void)
 {
     gboolean d1, d2;
     char *dirname;
 
-    (void) me;
-
     /* 1st: scan user directory */
     dirname = g_build_path (PATH_SEP_STR, home_dir, MC_USERCONF_DIR, (char *) NULL);
     d1 = extfs_get_plugins (dirname, TRUE);     /* silent about user dir */
@@ -1534 +1532 @@
 }
 
 static void
-extfs_done (struct vfs_class *me)
+extfs_done (void)
 {
     size_t i;
     struct archive *ar;
 
-    (void) me;
-
     for (ar = first_archive; ar != NULL;)
     {
         extfs_free ((vfsid) ar);

lib/vfs/mc-vfs/ftpfs.c

@@ -1835 +1835 @@
 }
 
 static void
-ftpfs_done (struct vfs_class *me)
+ftpfs_done (void)
 {
     struct no_proxy_entry *np;
 
-    (void) me;
-
     while (no_proxy) {
         np = no_proxy->next;
         g_free (no_proxy->domain);

lib/vfs/mc-vfs/sfs.c

@@ -336 +336 @@
     return 0;
 }
 
-static int sfs_init (struct vfs_class *me)
+static int sfs_init (void)
 {
     char *mc_sfsini;
     FILE *cfg;
     char key[256];
 
-    (void) me;
-
     mc_sfsini = g_build_filename (mc_home, "sfs.ini", (char *) NULL);
     cfg = fopen (mc_sfsini, "r");
 
@@ -407 +405 @@
 }
 
 static void
-sfs_done (struct vfs_class *me)
+sfs_done (void)
 {
     int i;
 
-    (void) me;
-
     for (i = 0; i < sfs_no; i++){
         g_free (sfs_prefix [i]);
         g_free (sfs_command [i]);

lib/vfs/mc-vfs/vfs-impl.h

@@ -35 +35 @@
     void *data;                 /* this is for filesystem's own use */
     int verrno;                 /* can't use errno because glibc2 might define errno as function */
 
-    int (*init) (struct vfs_class *me);
-    void (*done) (struct vfs_class *me);
+    int (*init) (void);
+    void (*done) (void);
     
     /**
      * The fill_names method shall call the callback function for every

lib/vfs/mc-vfs/vfs.c

@@ -193 +193 @@
 vfs_register_class (struct vfs_class *vfs)
 {
     if (vfs->init)              /* vfs has own initialization function */
-        if (!(*vfs->init)(vfs)) /* but it failed */
+        if (!(*vfs->init)())    /* but it failed */
             return 0;
 
     vfs->next = vfs_list;
@@ -1313 +1313 @@
 
     for (vfs = vfs_list; vfs; vfs = vfs->next)
         if (vfs->done)
-            (*vfs->done) (vfs);
+            (*vfs->done) ();
 
     g_ptr_array_free (vfs_openfiles, TRUE);
     g_string_free (vfs_str_buffer, TRUE);