[2/3] cmd: Move commonly used global vars declarations to header file
Frédéric Delanoy
frederic.delanoy at gmail.com
Tue Nov 29 16:30:51 CST 2011
---
programs/cmd/batch.c | 4 ----
programs/cmd/builtins.c | 10 ----------
programs/cmd/directory.c | 10 ----------
programs/cmd/wcmd.h | 15 ++++++++++++---
4 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c
index 10af36b..bf8f1b7 100644
--- a/programs/cmd/batch.c
+++ b/programs/cmd/batch.c
@@ -24,10 +24,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(cmd);
-extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
-extern BATCH_CONTEXT *context;
-extern DWORD errorlevel;
-
/****************************************************************************
* WCMD_batch
*
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index a418d92..7a8f897 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -20,13 +20,6 @@
*/
/*
- * NOTES:
- * On entry to each function, global variables quals, param1, param2 contain
- * the qualifiers (uppercased and concatenated) and parameters entered, with
- * environment-variable and batch parameter substitution already done.
- */
-
-/*
* FIXME:
* - No support for pipes, shell parameters
* - Lots of functionality missing from builtins
@@ -43,9 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd);
extern int defaultColor;
extern BOOL echo_mode;
-extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
-extern BATCH_CONTEXT *context;
-extern DWORD errorlevel;
static HINSTANCE hinst;
static struct env_stack *saved_environment;
diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c
index a5447f5..7fc60a7 100644
--- a/programs/cmd/directory.c
+++ b/programs/cmd/directory.c
@@ -19,13 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/*
- * NOTES:
- * On entry, global variables quals, param1, param2 contain
- * the qualifiers (uppercased and concatenated) and parameters entered, with
- * environment-variable and batch parameter substitution already done.
- */
-
#define WIN32_LEAN_AND_MEAN
#include "wcmd.h"
@@ -33,9 +26,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(cmd);
-extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
-extern DWORD errorlevel;
-
typedef enum _DISPLAYTIME
{
Creation = 0,
diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h
index c45bc88..fe16805 100644
--- a/programs/cmd/wcmd.h
+++ b/programs/cmd/wcmd.h
@@ -30,6 +30,9 @@
#include <ctype.h>
#include <wine/unicode.h>
+/* msdn specified max for Win XP */
+#define MAXSTRING 8192
+
/* Data structure to hold commands delimitors/separators */
typedef enum _CMDdelimiters {
@@ -155,6 +158,15 @@ typedef struct _DIRECTORY_STACK
WCHAR *fileName;
} DIRECTORY_STACK;
+/*
+ * Global variables quals, param1, param2 contain the current qualifiers
+ * (uppercased and concatenated) and parameters entered, with environment
+ * variables and batch parameters substitution already done.
+ */
+extern WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING];
+extern DWORD errorlevel;
+extern BATCH_CONTEXT *context;
+
#endif /* !RC_INVOKED */
/*
@@ -264,6 +276,3 @@ extern WCHAR version_string[];
#define WCMD_VERSION 1033
#define WCMD_MOREPROMPT 1034
#define WCMD_LINETOOLONG 1035
-
-/* msdn specified max for Win XP */
-#define MAXSTRING 8192
--
1.7.7.2
More information about the wine-patches
mailing list