From 2dc6461bbac806484255c555c83693cca245a382 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 8 Mar 2001 01:04:58 +0000
Subject: [PATCH] * cpio.c (cpio_skip_padding): Warning fix. * fish.c
 (dir_load): Likewise. * mcfs.c: Likewise.

---
 vfs/ChangeLog | 4 ++++
 vfs/cpio.c    | 3 +++
 vfs/fish.c    | 2 +-
 vfs/mcfs.c    | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 713dde048..45cb49fea 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,5 +1,9 @@
 2001-03-07  Pavel Roskin  <proski@gnu.org>
 
+	* cpio.c (cpio_skip_padding): Warning fix.
+	* fish.c (dir_load): Likewise.
+	* mcfs.c: Likewise.
+
 	* extfs/uzip: New file from Oskar Liljeblad.
 	* extfs/README.uzip: Likewise.
 	* extfs/Makefile.am: Adjust for constant uzip.
diff --git a/vfs/cpio.c b/vfs/cpio.c
index fea2369ee..d8e2f6f80 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -119,6 +119,9 @@ static int cpio_skip_padding(vfs_s_super *super)
     case CPIO_NEWC:
     case CPIO_CRC:
 	return CPIO_SEEK_CUR(super, (4 - (CPIO_POS(super) % 4)) % 4);
+    default:
+	g_assert_not_reached();
+	return 42; /* & the compiler is happy :-) */
     }
 }
 
diff --git a/vfs/fish.c b/vfs/fish.c
index 935d24647..01ef41d2e 100644
--- a/vfs/fish.c
+++ b/vfs/fish.c
@@ -393,7 +393,7 @@ dir_load(vfs *me, vfs_s_inode *dir, char *remote_path)
 
 	switch(buffer[0]) {
 	case ':': {
-	              char *c;
+		      /* char *c; */
 		      if (!strcmp(buffer+1, ".") || !strcmp(buffer+1, ".."))
 			  break;  /* We'll do . and .. ourself */
 		      ent->name = g_strdup(buffer+1); 
diff --git a/vfs/mcfs.c b/vfs/mcfs.c
index 769d52986..a075ec62c 100644
--- a/vfs/mcfs.c
+++ b/vfs/mcfs.c
@@ -53,7 +53,6 @@
 #define MCFS_MAX_CONNECTIONS 32
 #define mcserver_port 9876
 
-static mcfs_open_connections = 0;
 static struct _mcfs_connection {
     char *host;
     char *user;
@@ -301,6 +300,7 @@ static mcfs_connection *mcfs_get_free_bucket ()
 /* Returns a connected socket to host */
 static mcfs_connection *mcfs_open_link (char *host, char *user, int *port, char *netrcpass)
 {
+    static int mcfs_open_connections = 0;
     int i, sock, version;
     mcfs_connection *bucket;