ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd: Reorder global vars declarations/definitions to improve readability.

This commit is contained in:
Frédéric Delanoy 2011-11-29 23:30:52 +01:00 committed by Alexandre Julliard
parent 44a1e7d199
commit a5becedd0e
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
programs/cmd/builtins.c
View File

@ -37,12 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd);
extern int defaultColor; extern int defaultColor;
extern BOOL echo_mode; extern BOOL echo_mode;
static HINSTANCE hinst;
static struct env_stack *saved_environment;
struct env_stack *pushd_directories; struct env_stack *pushd_directories;
const WCHAR dotW[] = {'.','\0'};
static BOOL verify_mode = FALSE; const WCHAR dotdotW[] = {'.','.','\0'};
const WCHAR nullW[] = {'\0'};
const WCHAR starW[] = {'*','\0'};
const WCHAR slashW[] = {'\\','\0'};
const WCHAR equalW[] = {'=','\0'};
const WCHAR inbuilt[][10] = { const WCHAR inbuilt[][10] = {
{'C','A','L','L','\0'}, {'C','A','L','L','\0'},
{'C','D','\0'}, {'C','D','\0'},
@ -90,24 +91,20 @@ const WCHAR inbuilt[][10] = {
{'C','H','O','I','C','E','\0'}, {'C','H','O','I','C','E','\0'},
{'E','X','I','T','\0'} {'E','X','I','T','\0'}
}; };
static const WCHAR externals[][10] = { static const WCHAR externals[][10] = {
{'A','T','T','R','I','B','\0'}, {'A','T','T','R','I','B','\0'},
{'X','C','O','P','Y','\0'} {'X','C','O','P','Y','\0'}
}; };
const WCHAR dotW[] = {'.','\0'};
const WCHAR dotdotW[] = {'.','.','\0'};
const WCHAR nullW[] = {'\0'};
const WCHAR starW[] = {'*','\0'};
const WCHAR slashW[] = {'\\','\0'};
const WCHAR equalW[] = {'=','\0'};
static const WCHAR fslashW[] = {'/','\0'}; static const WCHAR fslashW[] = {'/','\0'};
static const WCHAR onW[] = {'O','N','\0'}; static const WCHAR onW[] = {'O','N','\0'};
static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR offW[] = {'O','F','F','\0'};
static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmY[] = {'/','Y','\0'};
static const WCHAR parmNoY[] = {'/','-','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'};
static HINSTANCE hinst;
static struct env_stack *saved_environment;
static BOOL verify_mode = FALSE;
/************************************************************************** /**************************************************************************
* WCMD_ask_confirm * WCMD_ask_confirm
* *

29
programs/cmd/wcmdmain.c
View File

@ -32,19 +32,28 @@
WINE_DEFAULT_DEBUG_CHANNEL(cmd); WINE_DEFAULT_DEBUG_CHANNEL(cmd);
extern const WCHAR inbuilt[][10]; extern const WCHAR inbuilt[][10];
extern struct env_stack *pushd_directories;
BATCH_CONTEXT *context = NULL;
DWORD errorlevel; DWORD errorlevel;
WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING];
int defaultColor = 7; int defaultColor = 7;
BOOL echo_mode = TRUE; BOOL echo_mode = TRUE;
static BOOL opt_c, opt_k, opt_s;
WCHAR anykey[100], version_string[100];
const WCHAR newline[] = {'\r','\n','\0'}; const WCHAR newline[] = {'\r','\n','\0'};
const WCHAR space[] = {' ','\0'}; const WCHAR space[] = {' ','\0'};
WCHAR anykey[100];
WCHAR version_string[100]; static BOOL opt_c, opt_k, opt_s, unicodeOutput = FALSE;
WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING];
BATCH_CONTEXT *context = NULL; /* Variables pertaining to paging */
extern struct env_stack *pushd_directories; static BOOL paged_mode;
static const WCHAR *pagedMessage = NULL; static const WCHAR *pagedMessage = NULL;
static BOOL unicodeOutput = FALSE; static int line_count;
static int max_height;
static int max_width;
static int numChars;
#define MAX_WRITECONSOLE_SIZE 65535 #define MAX_WRITECONSOLE_SIZE 65535
@ -151,12 +160,6 @@ void WCMD_output_stderr (const WCHAR *format, ...) {
WCMD_output_asis_len(string, ret, GetStdHandle(STD_ERROR_HANDLE)); WCMD_output_asis_len(string, ret, GetStdHandle(STD_ERROR_HANDLE));
} }
static int line_count;
static int max_height;
static int max_width;
static BOOL paged_mode;
static int numChars;
void WCMD_enter_paged_mode(const WCHAR *msg) void WCMD_enter_paged_mode(const WCHAR *msg)
{ {
CONSOLE_SCREEN_BUFFER_INFO consoleInfo; CONSOLE_SCREEN_BUFFER_INFO consoleInfo;