This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit f80531404b10bbea78ed61b65222107a5a56eb83 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Sep 30 10:34:16 2019 +0100 Remove unused parameter from method. Fixes some -W4 compiler warnings. --- src/native/windows/apps/prunmgr/prunmgr.c | 9 +++------ src/native/windows/include/gui.h | 10 +++++----- src/native/windows/src/gui.c | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/native/windows/apps/prunmgr/prunmgr.c b/src/native/windows/apps/prunmgr/prunmgr.c index fd95466..0a1e405 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.c +++ b/src/native/windows/apps/prunmgr/prunmgr.c @@ -1028,8 +1028,7 @@ LRESULT CALLBACK __loggingProperty(HWND hDlg, } break; case IDC_PPLGBPATH: - lpBuf = apxBrowseForFolderW(hDlg, apxLoadResourceW(IDS_LGPATHTITLE, 0), - NULL); + lpBuf = apxBrowseForFolderW(hDlg, apxLoadResourceW(IDS_LGPATHTITLE, 0)); if (lpBuf) { SetDlgItemTextW(hDlg, IDC_PPLGPATH, lpBuf); apxFree(lpBuf); @@ -1295,8 +1294,7 @@ LRESULT CALLBACK __startProperty(HWND hDlg, case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_PPRBWPATH: - lpBuf = apxBrowseForFolderW(hDlg, apxLoadResourceW(IDS_PPWPATH, 0), - NULL); + lpBuf = apxBrowseForFolderW(hDlg, apxLoadResourceW(IDS_PPWPATH, 0)); if (lpBuf) { SetDlgItemTextW(hDlg, IDC_PPRWPATH, lpBuf); apxFree(lpBuf); @@ -1455,8 +1453,7 @@ LRESULT CALLBACK __stopProperty(HWND hDlg, case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_PPSBWPATH: - lpBuf = apxBrowseForFolderW(hDlg, apxLoadResourceW(IDS_PPWPATH, 0), - NULL); + lpBuf = apxBrowseForFolderW(hDlg, apxLoadResourceW(IDS_PPWPATH, 0)); if (lpBuf) { SetDlgItemTextW(hDlg, IDC_PPSWPATH, lpBuf); apxFree(lpBuf); diff --git a/src/native/windows/include/gui.h b/src/native/windows/include/gui.h index c81b851..e2ab5a3 100644 --- a/src/native/windows/include/gui.h +++ b/src/native/windows/include/gui.h @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + #ifndef _GUI_H_INCLUDED_ #define _GUI_H_INCLUDED_ @@ -50,7 +50,7 @@ __APXBEGIN_DECLS #define IDSU_COMBO 274 -#define WM_TRAYMESSAGE (WM_APP+1) +#define WM_TRAYMESSAGE (WM_APP+1) #define SNDMSGW SendMessageW #define SNDMSGA SendMessageA @@ -89,7 +89,7 @@ typedef struct APXLVITEM { INT iDefault; INT iFmt; LPTSTR szLabel; -} APXLVITEM, *LPAPXLVITEM; +} APXLVITEM, *LPAPXLVITEM; typedef struct APXGUISTATE { DWORD dwShow; @@ -140,10 +140,10 @@ int apxProgressBox(HWND hWnd, LPCTSTR szHeader, LPVOID cbData); BOOL apxYesNoMessage(LPCTSTR szTitle, LPCTSTR szMessage, BOOL bStop); -BOOL apxCalcStringEllipsis(HDC hDC, LPTSTR szString, +BOOL apxCalcStringEllipsis(HDC hDC, LPTSTR szString, int cchMax, UINT uColWidth); -LPWSTR apxBrowseForFolderW(HWND hWnd, LPCWSTR szTitle, LPCWSTR szName); +LPWSTR apxBrowseForFolderW(HWND hWnd, LPCWSTR szTitle); LPWSTR apxGetFileNameW(HWND hWnd, LPCWSTR szTitle, LPCWSTR szFilter, LPCWSTR szDefExt, LPCWSTR szDefPath, BOOL bOpenOrSave, diff --git a/src/native/windows/src/gui.c b/src/native/windows/src/gui.c index dafdb2d..1d3da65 100644 --- a/src/native/windows/src/gui.c +++ b/src/native/windows/src/gui.c @@ -484,7 +484,7 @@ BOOL apxYesNoMessage(LPCTSTR szTitle, LPCTSTR szMessage, BOOL bStop) /* Browse for folder dialog. */ -LPWSTR apxBrowseForFolderW(HWND hWnd, LPCWSTR szTitle, LPCWSTR szName) +LPWSTR apxBrowseForFolderW(HWND hWnd, LPCWSTR szTitle) { BROWSEINFOW bi; LPITEMIDLIST il, ir;