From 05b89b3bab6f26ae2e694a426edc6eb9ff4bd39d Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 4 Aug 2009 21:49:02 +0400 Subject: [PATCH] VFS: removed unnedeed includes of tty/tty.h header. Signed-off-by: Andrew Borodin --- vfs/cpio.c | 2 -- vfs/extfs.c | 2 -- vfs/gc.c | 2 -- vfs/local.c | 2 -- vfs/mcfs.c | 1 - vfs/mcfsutil.c | 1 - vfs/mcserv.c | 1 - vfs/sfs.c | 2 -- vfs/smbfs.c | 2 -- vfs/tar.c | 2 -- vfs/undelfs.c | 7 +++---- vfs/utilvfs.c | 2 -- vfs/vfs.c | 2 -- 13 files changed, 3 insertions(+), 25 deletions(-) diff --git a/vfs/cpio.c b/vfs/cpio.c index 4b4d0017a..983197605 100644 --- a/vfs/cpio.c +++ b/vfs/cpio.c @@ -31,8 +31,6 @@ #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ - #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "../src/unixcompat.h" diff --git a/vfs/extfs.c b/vfs/extfs.c index da9e55741..9cd00a146 100644 --- a/vfs/extfs.c +++ b/vfs/extfs.c @@ -47,8 +47,6 @@ #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ - #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "../src/execute.h" /* For shell_execute */ diff --git a/vfs/gc.c b/vfs/gc.c index ad7f7c2ad..0d6346b55 100644 --- a/vfs/gc.c +++ b/vfs/gc.c @@ -44,8 +44,6 @@ #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ - #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "../src/panel.h" /* get_current_panel() */ diff --git a/vfs/local.c b/vfs/local.c index 50407e810..e136c073a 100644 --- a/vfs/local.c +++ b/vfs/local.c @@ -14,8 +14,6 @@ #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ - #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ diff --git a/vfs/mcfs.c b/vfs/mcfs.c index 78f393e57..654ddf90b 100644 --- a/vfs/mcfs.c +++ b/vfs/mcfs.c @@ -58,7 +58,6 @@ #endif #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "utilvfs.h" diff --git a/vfs/mcfsutil.c b/vfs/mcfsutil.c index 60e62a346..f390e4345 100644 --- a/vfs/mcfsutil.c +++ b/vfs/mcfsutil.c @@ -51,7 +51,6 @@ #include #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "utilvfs.h" diff --git a/vfs/mcserv.c b/vfs/mcserv.c index 624e6663d..4c4986adb 100644 --- a/vfs/mcserv.c +++ b/vfs/mcserv.c @@ -111,7 +111,6 @@ #undef ENABLE_NLS #include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "utilvfs.h" diff --git a/vfs/sfs.c b/vfs/sfs.c index 0d6e43af9..1e5ed1973 100644 --- a/vfs/sfs.c +++ b/vfs/sfs.c @@ -43,8 +43,6 @@ #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ - #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "../src/execute.h" /* EXECUTE_AS_SHELL */ diff --git a/vfs/smbfs.c b/vfs/smbfs.c index 1c04bbc3d..214daa0d3 100644 --- a/vfs/smbfs.c +++ b/vfs/smbfs.c @@ -40,8 +40,6 @@ #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ - #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ diff --git a/vfs/tar.c b/vfs/tar.c index 01a66e8c3..f33bb33b6 100644 --- a/vfs/tar.c +++ b/vfs/tar.c @@ -42,8 +42,6 @@ #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ - #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ diff --git a/vfs/undelfs.c b/vfs/undelfs.c index 6aab134bd..c2c5313f5 100644 --- a/vfs/undelfs.c +++ b/vfs/undelfs.c @@ -57,7 +57,6 @@ #include #include "../src/global.h" -#include "../src/tty.h" /* enable/disable interrupt key */ #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "utilvfs.h" @@ -122,11 +121,11 @@ undelfs_get_path (const char *dirname, char **fsname, char **file) -- pavel@ucw.cz */ *fsname = NULL; - + if (strncmp (dirname, "/#undel:", 8)) return; - else - dirname += 8; + + dirname += 8; /* Since we don't allow subdirectories, it's easy to get a filename, * just scan backwards for a slash */ diff --git a/vfs/utilvfs.c b/vfs/utilvfs.c index ee594520f..17337b508 100644 --- a/vfs/utilvfs.c +++ b/vfs/utilvfs.c @@ -35,8 +35,6 @@ #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ - #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "../src/unixcompat.h" diff --git a/vfs/vfs.c b/vfs/vfs.c index ed67ffa8d..cbe24afa1 100644 --- a/vfs/vfs.c +++ b/vfs/vfs.c @@ -52,8 +52,6 @@ #include "../src/global.h" -#include "../src/tty/tty.h" /* enable/disable interrupt key */ - #include "../src/wtools.h" /* message() */ #include "../src/main.h" /* print_vfs_message */ #include "../src/strutil.h"