From 67627091db8ce048db5ebb929487555f06e6e4f6 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sun, 8 May 2005 20:15:54 +0000 Subject: [PATCH] Reomve string STRING_CMD_INVALIDDRIVE in En.rc it was doublcate of STRING_FREE_ERROR1 thanks Usurp for finding it svn path=/trunk/; revision=15150 --- reactos/subsys/system/cmd/En.rc | 2 -- reactos/subsys/system/cmd/cmd.c | 2 +- reactos/subsys/system/cmd/resource.h | 2 +- reactos/subsys/system/cmd/start.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/reactos/subsys/system/cmd/En.rc b/reactos/subsys/system/cmd/En.rc index a27c511373b..b3bb603505e 100644 --- a/reactos/subsys/system/cmd/En.rc +++ b/reactos/subsys/system/cmd/En.rc @@ -561,8 +561,6 @@ STRING_ERROR_DRIVER_NOT_READY, "Drive not ready" STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" - -STRING_CMD_INVALIDDRIVE, "ERROR: invalid drive" STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d file(s) copied\n" diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c index 1da37bd9b0e..27f3dcca85f 100644 --- a/reactos/subsys/system/cmd/cmd.c +++ b/reactos/subsys/system/cmd/cmd.c @@ -333,7 +333,7 @@ Execute (LPTSTR full, LPTSTR first, LPTSTR rest) working = SetCurrentDirectory(str); } - if (!working) ConErrResPuts (STRING_CMD_INVALIDDRIVE); + if (!working) ConErrResPuts (STRING_FREE_ERROR1); return; } diff --git a/reactos/subsys/system/cmd/resource.h b/reactos/subsys/system/cmd/resource.h index f86dac49d37..2f9d328339e 100644 --- a/reactos/subsys/system/cmd/resource.h +++ b/reactos/subsys/system/cmd/resource.h @@ -84,7 +84,7 @@ #define STRING_CMD_HELP6 613 #define STRING_CMD_HELP7 614 #define STRING_CMD_HELP8 615 -#define STRING_CMD_INVALIDDRIVE 617 + #define STRING_CMD_SHELLINFO 624 #define STRING_COLOR_HELP1 625 diff --git a/reactos/subsys/system/cmd/start.c b/reactos/subsys/system/cmd/start.c index 49653fd243e..d81e924b279 100644 --- a/reactos/subsys/system/cmd/start.c +++ b/reactos/subsys/system/cmd/start.c @@ -39,7 +39,7 @@ INT cmd_start (LPTSTR first, LPTSTR rest) SetCurrentDirectory (szPath); GetCurrentDirectory (MAX_PATH, szPath); if (szPath[0] != (TCHAR)_totupper (*first)) - ConErrResPuts (STRING_CMD_INVALIDDRIVE); + ConErrResPuts (STRING_FREE_ERROR1); return 0; }