Skip to content

Commit 1266d67

Browse files
committed
patch 8.0.0281: some files are still using ARGSUSED instead of UNUSED
Problem: MS-Windows files are still using ARGSUSED while most other files have UNUSED. Solution: Change ARGSUSED to UNUSED or delete it.
1 parent 7c23d1d commit 1266d67

File tree

6 files changed

+89
-132
lines changed

6 files changed

+89
-132
lines changed

src/gui_w32.c

Lines changed: 47 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -558,13 +558,12 @@ gui_mch_set_blinking(long wait, long on, long off)
558558
blink_offtime = off;
559559
}
560560

561-
/* ARGSUSED */
562561
static VOID CALLBACK
563562
_OnBlinkTimer(
564563
HWND hwnd,
565-
UINT uMsg,
564+
UINT uMsg UNUSED,
566565
UINT idEvent,
567-
DWORD dwTime)
566+
DWORD dwTime UNUSED)
568567
{
569568
MSG msg;
570569

@@ -590,7 +589,7 @@ _OnBlinkTimer(
590589
gui_update_cursor(TRUE, FALSE);
591590
blink_state = BLINK_ON;
592591
blink_timer = (UINT) SetTimer(NULL, 0, (UINT)blink_ontime,
593-
(TIMERPROC)_OnBlinkTimer);
592+
(TIMERPROC)_OnBlinkTimer);
594593
}
595594
}
596595

@@ -644,13 +643,12 @@ gui_mch_start_blink(void)
644643
* Call-back routines.
645644
*/
646645

647-
/*ARGSUSED*/
648646
static VOID CALLBACK
649647
_OnTimer(
650648
HWND hwnd,
651-
UINT uMsg,
649+
UINT uMsg UNUSED,
652650
UINT idEvent,
653-
DWORD dwTime)
651+
DWORD dwTime UNUSED)
654652
{
655653
MSG msg;
656654

@@ -667,12 +665,11 @@ _OnTimer(
667665
s_wait_timer = 0;
668666
}
669667

670-
/*ARGSUSED*/
671668
static void
672669
_OnDeadChar(
673-
HWND hwnd,
674-
UINT ch,
675-
int cRepeat)
670+
HWND hwnd UNUSED,
671+
UINT ch UNUSED,
672+
int cRepeat UNUSED)
676673
{
677674
dead_key = 1;
678675
}
@@ -752,12 +749,11 @@ char_to_string(int ch, char_u *string, int slen, int had_alt)
752749
/*
753750
* Key hit, add it to the input buffer.
754751
*/
755-
/*ARGSUSED*/
756752
static void
757753
_OnChar(
758-
HWND hwnd,
754+
HWND hwnd UNUSED,
759755
UINT ch,
760-
int cRepeat)
756+
int cRepeat UNUSED)
761757
{
762758
char_u string[40];
763759
int len = 0;
@@ -777,12 +773,11 @@ _OnChar(
777773
/*
778774
* Alt-Key hit, add it to the input buffer.
779775
*/
780-
/*ARGSUSED*/
781776
static void
782777
_OnSysChar(
783-
HWND hwnd,
778+
HWND hwnd UNUSED,
784779
UINT cch,
785-
int cRepeat)
780+
int cRepeat UNUSED)
786781
{
787782
char_u string[40]; /* Enough for multibyte character */
788783
int len;
@@ -861,11 +856,10 @@ _OnMouseEvent(
861856
gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers);
862857
}
863858

864-
/*ARGSUSED*/
865859
static void
866860
_OnMouseButtonDown(
867-
HWND hwnd,
868-
BOOL fDoubleClick,
861+
HWND hwnd UNUSED,
862+
BOOL fDoubleClick UNUSED,
869863
int x,
870864
int y,
871865
UINT keyFlags)
@@ -960,10 +954,9 @@ _OnMouseButtonDown(
960954
}
961955
}
962956

963-
/*ARGSUSED*/
964957
static void
965958
_OnMouseMoveOrRelease(
966-
HWND hwnd,
959+
HWND hwnd UNUSED,
967960
int x,
968961
int y,
969962
UINT keyFlags)
@@ -1038,13 +1031,12 @@ gui_mswin_find_menu(
10381031
return pMenu;
10391032
}
10401033

1041-
/*ARGSUSED*/
10421034
static void
10431035
_OnMenu(
1044-
HWND hwnd,
1036+
HWND hwnd UNUSED,
10451037
int id,
1046-
HWND hwndCtl,
1047-
UINT codeNotify)
1038+
HWND hwndCtl UNUSED,
1039+
UINT codeNotify UNUSED)
10481040
{
10491041
vimmenu_T *pMenu;
10501042

@@ -1527,9 +1519,8 @@ gui_mch_get_font(
15271519
* Return the name of font "font" in allocated memory.
15281520
* Don't know how to get the actual name, thus use the provided name.
15291521
*/
1530-
/*ARGSUSED*/
15311522
char_u *
1532-
gui_mch_get_fontname(GuiFont font, char_u *name)
1523+
gui_mch_get_fontname(GuiFont font UNUSED, char_u *name)
15331524
{
15341525
if (name == NULL)
15351526
return NULL;
@@ -2175,13 +2166,12 @@ gui_mch_enable_menu(int flag)
21752166
#endif
21762167
}
21772168

2178-
/*ARGSUSED*/
21792169
void
21802170
gui_mch_set_menu_pos(
2181-
int x,
2182-
int y,
2183-
int w,
2184-
int h)
2171+
int x UNUSED,
2172+
int y UNUSED,
2173+
int w UNUSED,
2174+
int h UNUSED)
21852175
{
21862176
/* It will be in the right place anyway */
21872177
}
@@ -2817,10 +2807,8 @@ _OnEndSession(void)
28172807
* Get this message when the user clicks on the cross in the top right corner
28182808
* of a Windows95 window.
28192809
*/
2820-
/*ARGSUSED*/
28212810
static void
2822-
_OnClose(
2823-
HWND hwnd)
2811+
_OnClose(HWND hwnd UNUSED)
28242812
{
28252813
gui_shell_closed();
28262814
}
@@ -2829,8 +2817,7 @@ _OnClose(
28292817
* Get a message when the window is being destroyed.
28302818
*/
28312819
static void
2832-
_OnDestroy(
2833-
HWND hwnd)
2820+
_OnDestroy(HWND hwnd)
28342821
{
28352822
if (!destroying)
28362823
_OnClose(hwnd);
@@ -2883,11 +2870,10 @@ _OnPaint(
28832870
}
28842871
}
28852872

2886-
/*ARGSUSED*/
28872873
static void
28882874
_OnSize(
28892875
HWND hwnd,
2890-
UINT state,
2876+
UINT state UNUSED,
28912877
int cx,
28922878
int cy)
28932879
{
@@ -3124,9 +3110,8 @@ gui_mch_insert_lines(
31243110
}
31253111

31263112

3127-
/*ARGSUSED*/
31283113
void
3129-
gui_mch_exit(int rc)
3114+
gui_mch_exit(int rc UNUSED)
31303115
{
31313116
#if defined(FEAT_DIRECTX)
31323117
DWriteContext_Close(s_dwc);
@@ -3285,9 +3270,8 @@ gui_mch_wide_font_changed(void)
32853270
* Initialise vim to use the font with the given name.
32863271
* Return FAIL if the font could not be loaded, OK otherwise.
32873272
*/
3288-
/*ARGSUSED*/
32893273
int
3290-
gui_mch_init_font(char_u *font_name, int fontset)
3274+
gui_mch_init_font(char_u *font_name, int fontset UNUSED)
32913275
{
32923276
LOGFONT lf;
32933277
GuiFont font = NOFONT;
@@ -3416,11 +3400,10 @@ gui_mch_newfont(void)
34163400
/*
34173401
* Set the window title
34183402
*/
3419-
/*ARGSUSED*/
34203403
void
34213404
gui_mch_settitle(
34223405
char_u *title,
3423-
char_u *icon)
3406+
char_u *icon UNUSED)
34243407
{
34253408
set_window_title(s_hwnd, (title == NULL ? "VIM" : (char *)title));
34263409
}
@@ -3772,10 +3755,9 @@ gui_mch_browse(
37723755
}
37733756
#endif /* FEAT_BROWSE */
37743757

3775-
/*ARGSUSED*/
37763758
static void
37773759
_OnDropFiles(
3778-
HWND hwnd,
3760+
HWND hwnd UNUSED,
37793761
HDROP hDrop)
37803762
{
37813763
#ifdef FEAT_WINDOWS
@@ -3833,10 +3815,9 @@ _OnDropFiles(
38333815
#endif
38343816
}
38353817

3836-
/*ARGSUSED*/
38373818
static int
38383819
_OnScroll(
3839-
HWND hwnd,
3820+
HWND hwnd UNUSED,
38403821
HWND hwndCtl,
38413822
UINT code,
38423823
int pos)
@@ -3954,7 +3935,6 @@ _OnScroll(
39543935
* Return pointer to buffer in "tofree".
39553936
* Returns zero when out of memory.
39563937
*/
3957-
/*ARGSUSED*/
39583938
int
39593939
get_cmd_args(char *prog, char *cmdline, char ***argvp, char **tofree)
39603940
{
@@ -5588,10 +5568,14 @@ get_work_area(RECT *spi_rect)
55885568
/*
55895569
* Set the size of the window to the given width and height in pixels.
55905570
*/
5591-
/*ARGSUSED*/
55925571
void
5593-
gui_mch_set_shellsize(int width, int height,
5594-
int min_width, int min_height, int base_width, int base_height,
5572+
gui_mch_set_shellsize(
5573+
int width,
5574+
int height,
5575+
int min_width UNUSED,
5576+
int min_height UNUSED,
5577+
int base_width UNUSED,
5578+
int base_height UNUSED,
55955579
int direction)
55965580
{
55975581
RECT workarea_rect;
@@ -5752,9 +5736,8 @@ gui_mch_set_sp_color(guicolor_T color)
57525736
/*
57535737
* handle WM_IME_NOTIFY message
57545738
*/
5755-
/*ARGSUSED*/
57565739
static LRESULT
5757-
_OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData)
5740+
_OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData UNUSED)
57585741
{
57595742
LRESULT lResult = 0;
57605743
HIMC hImc;
@@ -5802,9 +5785,8 @@ _OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData)
58025785
return lResult;
58035786
}
58045787

5805-
/*ARGSUSED*/
58065788
static LRESULT
5807-
_OnImeComposition(HWND hwnd, WPARAM dbcs, LPARAM param)
5789+
_OnImeComposition(HWND hwnd, WPARAM dbcs UNUSED, LPARAM param)
58085790
{
58095791
char_u *ret;
58105792
int len;
@@ -6844,13 +6826,12 @@ gui_mch_menu_grey(
68446826
* pressed, return that button's ID - IDCANCEL (2), which is the button's
68456827
* number.
68466828
*/
6847-
/*ARGSUSED*/
68486829
static LRESULT CALLBACK
68496830
dialog_callback(
68506831
HWND hwnd,
68516832
UINT message,
68526833
WPARAM wParam,
6853-
LPARAM lParam)
6834+
LPARAM lParam UNUSED)
68546835
{
68556836
if (message == WM_INITDIALOG)
68566837
{
@@ -8536,13 +8517,12 @@ delete_tooltip(BalloonEval *beval)
85368517
PostMessage(beval->balloon, WM_CLOSE, 0, 0);
85378518
}
85388519

8539-
/*ARGSUSED*/
85408520
static VOID CALLBACK
85418521
BevalTimerProc(
8542-
HWND hwnd,
8543-
UINT uMsg,
8544-
UINT_PTR idEvent,
8545-
DWORD dwTime)
8522+
HWND hwnd UNUSED,
8523+
UINT uMsg UNUSED,
8524+
UINT_PTR idEvent UNUSED,
8525+
DWORD dwTime)
85468526
{
85478527
POINT pt;
85488528
RECT rect;
@@ -8578,16 +8558,14 @@ BevalTimerProc(
85788558
}
85798559
}
85808560

8581-
/*ARGSUSED*/
85828561
void
8583-
gui_mch_disable_beval_area(BalloonEval *beval)
8562+
gui_mch_disable_beval_area(BalloonEval *beval UNUSED)
85848563
{
85858564
// TRACE0("gui_mch_disable_beval_area {{{");
85868565
KillTimer(s_textArea, BevalTimerId);
85878566
// TRACE0("gui_mch_disable_beval_area }}}");
85888567
}
85898568

8590-
/*ARGSUSED*/
85918569
void
85928570
gui_mch_enable_beval_area(BalloonEval *beval)
85938571
{
@@ -8619,7 +8597,6 @@ gui_mch_post_balloon(BalloonEval *beval, char_u *mesg)
86198597
// TRACE0("gui_mch_post_balloon }}}");
86208598
}
86218599

8622-
/*ARGSUSED*/
86238600
BalloonEval *
86248601
gui_mch_create_beval_area(
86258602
void *target, /* ignored, always use s_textArea */
@@ -8659,9 +8636,8 @@ gui_mch_create_beval_area(
86598636
return beval;
86608637
}
86618638

8662-
/*ARGSUSED*/
86638639
static void
8664-
Handle_WM_Notify(HWND hwnd, LPNMHDR pnmh)
8640+
Handle_WM_Notify(HWND hwnd UNUSED, LPNMHDR pnmh)
86658641
{
86668642
if (pnmh->idFrom != ID_BEVAL_TOOLTIP) /* it is not our tooltip */
86678643
return;

0 commit comments

Comments
 (0)