patch 8.1.2064: MS-Windows: compiler warnings for unused arguments

Problem:    MS-Windows: compiler warnings for unused arguments.
Solution:   Add UNUSED. (Yegappan Lakshmanan, closes #4963)
This commit is contained in:
Bram Moolenaar
2019-09-21 23:09:04 +02:00
parent 1e82a784ac
commit bd67aac279
13 changed files with 24 additions and 22 deletions

View File

@ -577,7 +577,7 @@ messageFromServerGtk2(gpointer clientData,
# endif # endif
static void static void
channel_gui_register_one(channel_T *channel, ch_part_T part) channel_gui_register_one(channel_T *channel, ch_part_T part UNUSED)
{ {
if (!CH_HAS_GUI) if (!CH_HAS_GUI)
return; return;
@ -661,7 +661,7 @@ channel_gui_register_all(void)
} }
static void static void
channel_gui_unregister_one(channel_T *channel, ch_part_T part) channel_gui_unregister_one(channel_T *channel UNUSED, ch_part_T part UNUSED)
{ {
# ifdef FEAT_GUI_X11 # ifdef FEAT_GUI_X11
if (channel->ch_part[part].ch_inputHandler != (XtInputId)NULL) if (channel->ch_part[part].ch_inputHandler != (XtInputId)NULL)
@ -5800,7 +5800,7 @@ job_check_ended(void)
job_T * job_T *
job_start( job_start(
typval_T *argvars, typval_T *argvars,
char **argv_arg, char **argv_arg UNUSED,
jobopt_T *opt_arg, jobopt_T *opt_arg,
int is_terminal UNUSED) int is_terminal UNUSED)
{ {

View File

@ -7335,7 +7335,7 @@ close_redir(void)
#if (defined(FEAT_SESSION) || defined(FEAT_EVAL)) || defined(PROTO) #if (defined(FEAT_SESSION) || defined(FEAT_EVAL)) || defined(PROTO)
int int
vim_mkdir_emsg(char_u *name, int prot) vim_mkdir_emsg(char_u *name, int prot UNUSED)
{ {
if (vim_mkdir(name, prot) != 0) if (vim_mkdir(name, prot) != 0)
{ {

View File

@ -3754,7 +3754,7 @@ ccheck_abbr(int c)
* Returns the result in allocated memory. * Returns the result in allocated memory.
*/ */
char_u * char_u *
vim_strsave_fnameescape(char_u *fname, int shell) vim_strsave_fnameescape(char_u *fname, int shell UNUSED)
{ {
char_u *p; char_u *p;
#ifdef BACKSLASH_IN_FILENAME #ifdef BACKSLASH_IN_FILENAME

View File

@ -2981,7 +2981,7 @@ set_file_time(
int int
check_file_readonly( check_file_readonly(
char_u *fname, /* full path to file */ char_u *fname, /* full path to file */
int perm) /* known permissions on file */ int perm UNUSED) /* known permissions on file */
{ {
#ifndef USE_MCH_ACCESS #ifndef USE_MCH_ACCESS
int fd = 0; int fd = 0;

View File

@ -6720,7 +6720,7 @@ gui_mch_dialog(
char_u *buttons, char_u *buttons,
int dfltbutton, int dfltbutton,
char_u *textfield, char_u *textfield,
int ex_cmd) int ex_cmd UNUSED)
{ {
WORD *p, *pdlgtemplate, *pnumitems; WORD *p, *pdlgtemplate, *pnumitems;
DWORD *dwp; DWORD *dwp;
@ -8517,7 +8517,7 @@ gui_mch_post_balloon(BalloonEval *beval, char_u *mesg)
BalloonEval * BalloonEval *
gui_mch_create_beval_area( gui_mch_create_beval_area(
void *target, /* ignored, always use s_textArea */ void *target UNUSED, /* ignored, always use s_textArea */
char_u *mesg, char_u *mesg,
void (*mesgCB)(BalloonEval *, int), void (*mesgCB)(BalloonEval *, int),
void *clientData) void *clientData)

View File

@ -3658,7 +3658,7 @@ static struct timeval prev_timeval;
* Windows doesn't have gettimeofday(), although it does have struct timeval. * Windows doesn't have gettimeofday(), although it does have struct timeval.
*/ */
static int static int
gettimeofday(struct timeval *tv, char *dummy) gettimeofday(struct timeval *tv, char *dummy UNUSED)
{ {
long t = clock(); long t = clock();
tv->tv_sec = t / CLOCKS_PER_SEC; tv->tv_sec = t / CLOCKS_PER_SEC;

View File

@ -2101,7 +2101,7 @@ static char tz_cache[64];
struct tm * struct tm *
vim_localtime( vim_localtime(
const time_t *timep, // timestamp for local representation const time_t *timep, // timestamp for local representation
struct tm *result) // pointer to caller return buffer struct tm *result UNUSED) // pointer to caller return buffer
{ {
#ifdef HAVE_LOCALTIME_R #ifdef HAVE_LOCALTIME_R
# ifdef HAVE_TZSET # ifdef HAVE_TZSET

View File

@ -272,7 +272,7 @@ mch_input_isatty(void)
void void
mch_settitle( mch_settitle(
char_u *title, char_u *title,
char_u *icon) char_u *icon UNUSED)
{ {
# ifdef FEAT_GUI_MSWIN # ifdef FEAT_GUI_MSWIN
# ifdef VIMDLL # ifdef VIMDLL
@ -1164,7 +1164,7 @@ AbortProc(HDC hdcPrn UNUSED, int iCode UNUSED)
PrintHookProc( PrintHookProc(
HWND hDlg, // handle to dialog box HWND hDlg, // handle to dialog box
UINT uiMsg, // message identifier UINT uiMsg, // message identifier
WPARAM wParam, // message parameter WPARAM wParam UNUSED, // message parameter
LPARAM lParam // message parameter LPARAM lParam // message parameter
) )
{ {

View File

@ -365,7 +365,7 @@ read_console_input(
peek_console_input( peek_console_input(
HANDLE hInput, HANDLE hInput,
INPUT_RECORD *lpBuffer, INPUT_RECORD *lpBuffer,
DWORD nLength, DWORD nLength UNUSED,
LPDWORD lpEvents) LPDWORD lpEvents)
{ {
return read_console_input(hInput, lpBuffer, -1, lpEvents); return read_console_input(hInput, lpBuffer, -1, lpEvents);
@ -1006,7 +1006,7 @@ decode_key_event(
WCHAR *pch, WCHAR *pch,
WCHAR *pch2, WCHAR *pch2,
int *pmodifiers, int *pmodifiers,
BOOL fDoPost) BOOL fDoPost UNUSED)
{ {
int i; int i;
const int nModifs = pker->dwControlKeyState & (SHIFT | ALT | CTRL); const int nModifs = pker->dwControlKeyState & (SHIFT | ALT | CTRL);
@ -4486,7 +4486,7 @@ mch_system_g(char *cmd, int options)
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
static int static int
mch_system_c(char *cmd, int options) mch_system_c(char *cmd, int options UNUSED)
{ {
int ret; int ret;
WCHAR *wcmd; WCHAR *wcmd;
@ -6456,7 +6456,7 @@ mch_remove(char_u *name)
* Check for an "interrupt signal": CTRL-break or CTRL-C. * Check for an "interrupt signal": CTRL-break or CTRL-C.
*/ */
void void
mch_breakcheck(int force) mch_breakcheck(int force UNUSED)
{ {
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
# ifdef VIMDLL # ifdef VIMDLL
@ -7218,7 +7218,7 @@ fix_arg_enc(void)
} }
int int
mch_setenv(char *var, char *value, int x) mch_setenv(char *var, char *value, int x UNUSED)
{ {
char_u *envbuf; char_u *envbuf;
WCHAR *p; WCHAR *p;

View File

@ -957,7 +957,7 @@ free_unused_terminals()
* possible to do "1,5term vim -". * possible to do "1,5term vim -".
*/ */
static ch_part_T static ch_part_T
get_tty_part(term_T *term) get_tty_part(term_T *term UNUSED)
{ {
#ifdef UNIX #ifdef UNIX
ch_part_T parts[3] = {PART_IN, PART_OUT, PART_ERR}; ch_part_T parts[3] = {PART_IN, PART_OUT, PART_ERR};
@ -5787,7 +5787,7 @@ dyn_conpty_init(int verbose)
conpty_term_and_job_init( conpty_term_and_job_init(
term_T *term, term_T *term,
typval_T *argvar, typval_T *argvar,
char **argv, char **argv UNUSED,
jobopt_T *opt, jobopt_T *opt,
jobopt_T *orig_opt) jobopt_T *orig_opt)
{ {
@ -6139,7 +6139,7 @@ dyn_winpty_init(int verbose)
winpty_term_and_job_init( winpty_term_and_job_init(
term_T *term, term_T *term,
typval_T *argvar, typval_T *argvar,
char **argv, char **argv UNUSED,
jobopt_T *opt, jobopt_T *opt,
jobopt_T *orig_opt) jobopt_T *orig_opt)
{ {

View File

@ -649,7 +649,7 @@ ui_new_shellsize(void)
* Return FAIL when not possible. * Return FAIL when not possible.
*/ */
int int
ui_get_winpos(int *x, int *y, varnumber_T timeout) ui_get_winpos(int *x, int *y, varnumber_T timeout UNUSED)
{ {
# ifdef FEAT_GUI # ifdef FEAT_GUI
if (gui.in_use) if (gui.in_use)

View File

@ -1784,7 +1784,7 @@ theend:
* "hash[UNDO_HASH_SIZE]" must be the hash value of the buffer text. * "hash[UNDO_HASH_SIZE]" must be the hash value of the buffer text.
*/ */
void void
u_read_undo(char_u *name, char_u *hash, char_u *orig_name) u_read_undo(char_u *name, char_u *hash, char_u *orig_name UNUSED)
{ {
char_u *file_name; char_u *file_name;
FILE *fp; FILE *fp;

View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2064,
/**/ /**/
2063, 2063,
/**/ /**/