Author: rjung
Date: Sat May 23 08:49:51 2015
New Revision: 1681293
URL: http://svn.apache.org/r1681293
Log:
Sync trunk with 1.1 branch: Forward port
r1293184 | mturk | 2012-02-24 12:26:45 +0100 (Fri, 24 Feb 2012) | 1 line
Fix compile warnings on win64
Modified:
tomcat/native/trunk/native/os/win32/ntpipe.c
tomcat/native/trunk/native/os/win32/registry.c
tomcat/native/trunk/native/os/win32/system.c
Modified: tomcat/native/trunk/native/os/win32/ntpipe.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/ntpipe.c?rev=1681293&r1=1681292&r2=1681293&view=diff
==============================================================================
--- tomcat/native/trunk/native/os/win32/ntpipe.c (original)
+++ tomcat/native/trunk/native/os/win32/ntpipe.c Sat May 23 08:49:51 2015
@@ -197,7 +197,7 @@ ntp_socket_recv(apr_socket_t *sock, char
tcn_ntp_conn_t *con = (tcn_ntp_conn_t *)sock;
DWORD readed;
- if (!ReadFile(con->h_pipe, buf, *len, &readed, &con->rd_o)) {
+ if (!ReadFile(con->h_pipe, buf, (DWORD)*len, &readed, &con->rd_o)) {
DWORD err = GetLastError();
if (err == ERROR_IO_PENDING) {
DWORD r = WaitForSingleObject(con->rd_event, con->timeout);
@@ -223,7 +223,7 @@ ntp_socket_send(apr_socket_t *sock, cons
tcn_ntp_conn_t *con = (tcn_ntp_conn_t *)sock;
DWORD written;
- if (!WriteFile(con->h_pipe, buf, *len, &written, &con->wr_o)) {
+ if (!WriteFile(con->h_pipe, buf, (DWORD)*len, &written, &con->wr_o)) {
DWORD err = GetLastError();
if (err == ERROR_IO_PENDING) {
DWORD r = WaitForSingleObject(con->wr_event, con->timeout);
Modified: tomcat/native/trunk/native/os/win32/registry.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/registry.c?rev=1681293&r1=1681292&r2=1681293&view=diff
==============================================================================
--- tomcat/native/trunk/native/os/win32/registry.c (original)
+++ tomcat/native/trunk/native/os/win32/registry.c Sat May 23 08:49:51 2015
@@ -400,7 +400,7 @@ TCN_IMPLEMENT_CALL(jstring, Registry, ge
free(vw);
goto cleanup;
}
- v = (*e)->NewString((e), vw, wcslen(vw));
+ v = (*e)->NewString((e), vw, lstrlenW(vw));
free(vw);
}
cleanup:
@@ -545,7 +545,7 @@ TCN_IMPLEMENT_CALL(jint, Registry, setVa
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
TCN_INIT_WSTRING(val);
- len = wcslen(J2W(val));
+ len = lstrlenW(J2W(val));
rc = RegSetValueExW(k->key, J2W(name), 0, REG_SZ,
(CONST BYTE *)J2W(val), (len + 1) * 2);
TCN_FREE_WSTRING(name);
@@ -566,7 +566,7 @@ TCN_IMPLEMENT_CALL(jint, Registry, setVa
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
TCN_INIT_WSTRING(val);
- len = wcslen(J2W(val));
+ len = lstrlenW(J2W(val));
rc = RegSetValueExW(k->key, J2W(name), 0, REG_EXPAND_SZ,
(CONST BYTE *)J2W(val), (len + 1) * 2);
TCN_FREE_WSTRING(name);
@@ -682,7 +682,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, Registr
NULL,
&ftLastWriteTime);
if (rc == (DWORD)ERROR_SUCCESS) {
- s = (*e)->NewString((e), achKey, wcslen(achKey));
+ s = (*e)->NewString((e), achKey, lstrlenW(achKey));
(*e)->SetObjectArrayElement((e), v, idx, s);
}
}
@@ -747,7 +747,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, Registr
NULL, // &bData,
NULL); // &bcData
if (rc == (DWORD)ERROR_SUCCESS) {
- s = (*e)->NewString((e), achValue, wcslen(achValue));
+ s = (*e)->NewString((e), achValue, lstrlenW(achValue));
(*e)->SetObjectArrayElement((e), v, idx, s);
}
}
Modified: tomcat/native/trunk/native/os/win32/system.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/system.c?rev=1681293&r1=1681292&r2=1681293&view=diff
==============================================================================
--- tomcat/native/trunk/native/os/win32/system.c (original)
+++ tomcat/native/trunk/native/os/win32/system.c Sat May 23 08:49:51 2015
@@ -167,11 +167,11 @@ TCN_IMPLEMENT_CALL(jstring, OS, expand)(
if (len > (TCN_BUFFER_SZ - 1)) {
jchar *dbuf = malloc((len + 1) * 2);
ExpandEnvironmentStringsW(J2W(val), dbuf, len);
- str = (*e)->NewString(e, dbuf, wcslen(dbuf));
+ str = (*e)->NewString(e, dbuf, lstrlenW(dbuf));
free(dbuf);
}
else
- str = (*e)->NewString(e, buf, wcslen(buf));
+ str = (*e)->NewString(e, buf, lstrlenW(buf));
TCN_FREE_WSTRING(val);
return str;
@@ -197,7 +197,7 @@ static void init_log_source(const char *
strcat(event_key, domain);
if (!RegCreateKey(HKEY_LOCAL_MACHINE, event_key, &key)) {
RegSetValueEx(key, "EventMessageFile", 0, REG_SZ,
(LPBYTE)&dll_file_name[0],
- strlen(dll_file_name) + 1);
+ lstrlenA(dll_file_name) + 1);
ts = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE |
EVENTLOG_INFORMATION_TYPE;
RegSetValueEx(key, "TypesSupported", 0, REG_DWORD, (LPBYTE) &ts,
sizeof(DWORD));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
