You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2019/09/30 11:45:04 UTC
[commons-daemon] branch master updated (0367753 -> ee33e80)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git.
from 0367753 Fix remaining unreferenced formal parameter warnings
new 1fe0be8 Remove unused assignments
new 0fd0f04 Fix warning
new aace688 Fix warnings when -W4 rather than -W3 is used
new ee33e80 Enable building for x64 on command line with VS 2017
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/native/windows/apps/prunmgr/prunmgr.c | 17 ++++++++---------
src/native/windows/include/Makefile.inc | 2 +-
src/native/windows/src/console.c | 3 ---
src/native/windows/src/log.c | 2 +-
4 files changed, 10 insertions(+), 14 deletions(-)
[commons-daemon] 02/04: Fix warning
Posted by ma...@apache.org.
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 0fd0f04696156bad1ec69c046eeb1765307d4108
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 30 11:40:40 2019 +0100
Fix warning
---
src/native/windows/src/log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/native/windows/src/log.c b/src/native/windows/src/log.c
index 2d697a2..ea4240c 100644
--- a/src/native/windows/src/log.c
+++ b/src/native/windows/src/log.c
@@ -360,7 +360,7 @@ apxLogWrite(
if (!IS_INVALID_HANDLE(lf->hFile)) {
SYSTEMTIME t;
/* Append operation */
- SetFilePointer(lf->hFile, 0, &wr, FILE_END);
+ SetFilePointer(lf->hFile, 0, NULL, FILE_END);
GetLocalTime(&t);
if (dolock) {
APX_LOGLOCK(lf->hFile);
[commons-daemon] 04/04: Enable building for x64 on command line
with VS 2017
Posted by ma...@apache.org.
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 ee33e801b4e63059110eb019d468ef6f1da5c70c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 30 12:43:11 2019 +0100
Enable building for x64 on command line with VS 2017
---
src/native/windows/include/Makefile.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/native/windows/include/Makefile.inc b/src/native/windows/include/Makefile.inc
index 4b6b7dc..4ed852c 100644
--- a/src/native/windows/include/Makefile.inc
+++ b/src/native/windows/include/Makefile.inc
@@ -108,7 +108,7 @@ BUILD_CPU=$(PROCESSOR_ARCHITECTURE)
!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" == "x86" || "$(BUILD_CPU)" == "i686"
CPU=X86
!ENDIF
-!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)" == "x64"
+!IF "$(BUILD_CPU)" == "AMD64" || "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)" == "x64"
CPU=X64
!ENDIF
# did we manage to set CPU?
[commons-daemon] 01/04: Remove unused assignments
Posted by ma...@apache.org.
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 1fe0be80c202b2f83aab1ef7ca23e7340f41c7c0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 30 11:28:10 2019 +0100
Remove unused assignments
---
src/native/windows/src/console.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/native/windows/src/console.c b/src/native/windows/src/console.c
index 6fcc5af..6aeaf2b 100644
--- a/src/native/windows/src/console.c
+++ b/src/native/windows/src/console.c
@@ -84,8 +84,6 @@ APXHANDLE __st_sys_console = NULL;
static BOOL __apxConsoleCallback(APXHANDLE hObject, UINT uMsg,
WPARAM wParam, LPARAM lParam)
{
- APXCONSOLE lpConsole = APXHANDLE_DATA(hObject);
-
if (hObject->dwType != APXHANDLE_TYPE_CONSOLE)
return FALSE;
switch (uMsg) {
@@ -116,7 +114,6 @@ apxAllocConsoleHandle(APXHANDLE hPool)
BOOL
apxFreeConsoleHandle(APXHANDLE hConsole)
{
- APXCONSOLE lpConsole = APXHANDLE_DATA(hConsole);
if (hConsole->dwType != APXHANDLE_TYPE_CONSOLE)
return FALSE;
[commons-daemon] 03/04: Fix warnings when -W4 rather than -W3 is
used
Posted by ma...@apache.org.
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 aace68856fc371456629998f6188016c59d06980
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 30 12:29:45 2019 +0100
Fix warnings when -W4 rather than -W3 is used
---
src/native/windows/apps/prunmgr/prunmgr.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/native/windows/apps/prunmgr/prunmgr.c b/src/native/windows/apps/prunmgr/prunmgr.c
index a1e594f..14d6e99 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.c
+++ b/src/native/windows/apps/prunmgr/prunmgr.c
@@ -132,12 +132,12 @@ static void createRbuttonTryMenu(HWND hWnd)
canStart = TRUE;
}
}
- apxAppendMenuItem(hMnu, IDM_TM_CONFIG, TMNU_CONF, TRUE, TRUE);
+ apxAppendMenuItem(hMnu, IDM_TM_CONFIG, TMNU_CONF, TRUE, TRUE);
apxAppendMenuItem(hMnu, IDM_TM_START, TMNU_START, FALSE, canStart);
apxAppendMenuItem(hMnu, IDM_TM_STOP, TMNU_STOP, FALSE, canStop);
apxAppendMenuItem(hMnu, IDM_TM_DUMP, TMNU_DUMP, FALSE, canStop);
apxAppendMenuItem(hMnu, IDM_TM_EXIT, TMNU_EXIT, FALSE, TRUE);
- apxAppendMenuItem(hMnu, -1, NULL, FALSE, FALSE);
+ apxAppendMenuItem(hMnu, 0, NULL, FALSE, FALSE);
apxAppendMenuItem(hMnu, IDM_TM_ABOUT, TMNU_ABOUT, FALSE, TRUE);
/* Ensure we have a focus */
@@ -337,7 +337,6 @@ BOOL __generalLogonSave(HWND hDlg)
WCHAR szU[SIZ_RESLEN];
WCHAR szP[SIZ_RESLEN];
WCHAR szC[SIZ_RESLEN];
- DWORD dwStartType = SERVICE_NO_CHANGE;
if (!(TST_BIT_FLAG(_propertyChanged, 2)))
return TRUE;
@@ -592,7 +591,7 @@ void __generalPropertyRefresh(HWND hDlg)
static BOOL bpropCentered = FALSE;
static HWND _generalPropertyHwnd = NULL;
-LRESULT CALLBACK __generalProperty(HWND hDlg,
+INT_PTR CALLBACK __generalProperty(HWND hDlg,
UINT uMessage,
WPARAM wParam,
LPARAM lParam)
@@ -725,7 +724,7 @@ LRESULT CALLBACK __generalProperty(HWND hDlg,
return FALSE;
}
-LRESULT CALLBACK __logonProperty(HWND hDlg,
+INT_PTR CALLBACK __logonProperty(HWND hDlg,
UINT uMessage,
WPARAM wParam,
LPARAM lParam)
@@ -927,7 +926,7 @@ LRESULT CALLBACK __logonProperty(HWND hDlg,
return FALSE;
}
-LRESULT CALLBACK __loggingProperty(HWND hDlg,
+INT_PTR CALLBACK __loggingProperty(HWND hDlg,
UINT uMessage,
WPARAM wParam,
LPARAM lParam)
@@ -1084,7 +1083,7 @@ LRESULT CALLBACK __loggingProperty(HWND hDlg,
return FALSE;
}
-LRESULT CALLBACK __jvmProperty(HWND hDlg,
+INT_PTR CALLBACK __jvmProperty(HWND hDlg,
UINT uMessage,
WPARAM wParam,
LPARAM lParam)
@@ -1225,7 +1224,7 @@ LRESULT CALLBACK __jvmProperty(HWND hDlg,
return FALSE;
}
-LRESULT CALLBACK __startProperty(HWND hDlg,
+INT_PTR CALLBACK __startProperty(HWND hDlg,
UINT uMessage,
WPARAM wParam,
LPARAM lParam)
@@ -1375,7 +1374,7 @@ LRESULT CALLBACK __startProperty(HWND hDlg,
return FALSE;
}
-LRESULT CALLBACK __stopProperty(HWND hDlg,
+INT_PTR CALLBACK __stopProperty(HWND hDlg,
UINT uMessage,
WPARAM wParam,
LPARAM lParam)