Skip to content

Commit 9339a6a

Browse files
fandreuzjaikiran
authored andcommitted
8361593: Commented dead code in JDK-8342868 can be removed
Reviewed-by: jlu, naoto, jwaters, jpai
1 parent 12e6a0b commit 9339a6a

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -965,34 +965,28 @@ void getNumberPart(const jchar * langtag, const jint numberStyle, WCHAR * number
965965
void getFixPart(const jchar * langtag, const jint numberStyle, BOOL positive, BOOL prefix, WCHAR * ret) {
966966
DWORD pattern = 0;
967967
int style = numberStyle;
968-
// int got = 0;
969968

970969
if (positive) {
971970
if (style == sun_util_locale_provider_HostLocaleProviderAdapterImpl_NF_CURRENCY) {
972-
// got =
973-
getLocaleInfoWrapper(langtag,
971+
getLocaleInfoWrapper(langtag,
974972
LOCALE_ICURRENCY | LOCALE_RETURN_NUMBER,
975973
(LPWSTR)&pattern, sizeof(pattern));
976974
} else if (style == sun_util_locale_provider_HostLocaleProviderAdapterImpl_NF_PERCENT) {
977-
// got =
978-
getLocaleInfoWrapper(langtag,
975+
getLocaleInfoWrapper(langtag,
979976
LOCALE_IPOSITIVEPERCENT | LOCALE_RETURN_NUMBER,
980977
(LPWSTR)&pattern, sizeof(pattern));
981978
}
982979
} else {
983980
if (style == sun_util_locale_provider_HostLocaleProviderAdapterImpl_NF_CURRENCY) {
984-
// got =
985-
getLocaleInfoWrapper(langtag,
981+
getLocaleInfoWrapper(langtag,
986982
LOCALE_INEGCURR | LOCALE_RETURN_NUMBER,
987983
(LPWSTR)&pattern, sizeof(pattern));
988984
} else if (style == sun_util_locale_provider_HostLocaleProviderAdapterImpl_NF_PERCENT) {
989-
// got =
990-
getLocaleInfoWrapper(langtag,
985+
getLocaleInfoWrapper(langtag,
991986
LOCALE_INEGATIVEPERCENT | LOCALE_RETURN_NUMBER,
992987
(LPWSTR)&pattern, sizeof(pattern));
993988
} else {
994-
// got =
995-
getLocaleInfoWrapper(langtag,
989+
getLocaleInfoWrapper(langtag,
996990
LOCALE_INEGNUMBER | LOCALE_RETURN_NUMBER,
997991
(LPWSTR)&pattern, sizeof(pattern));
998992
}

src/java.base/windows/native/libjava/TimeZone_md.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ static int getWinTimeZone(char *winZoneName, size_t winZoneNameBufSize)
232232
WCHAR stdNameInReg[MAX_ZONE_CHAR];
233233
TziValue tempTzi;
234234
WCHAR *stdNamePtr = tzi.StandardName;
235-
// int onlyMapID;
236235

237236
timeType = GetTimeZoneInformation(&tzi);
238237
if (timeType == TIME_ZONE_ID_INVALID) {
@@ -304,7 +303,6 @@ static int getWinTimeZone(char *winZoneName, size_t winZoneNameBufSize)
304303
* Compare to the "Std" value of each subkey and find the entry that
305304
* matches the current control panel setting.
306305
*/
307-
// onlyMapID = 0;
308306
for (i = 0; i < nSubKeys; ++i) {
309307
DWORD size = sizeof(subKeyName);
310308
ret = RegEnumKeyEx(hKey, i, subKeyName, &size, NULL, NULL, NULL, NULL);
@@ -325,7 +323,6 @@ static int getWinTimeZone(char *winZoneName, size_t winZoneNameBufSize)
325323
* entry in the Time Zones registry.
326324
*/
327325
RegCloseKey(hSubKey);
328-
// onlyMapID = 1;
329326
ret = RegOpenKeyExW(hKey, stdNamePtr, 0, KEY_READ, (PHKEY)&hSubKey);
330327
if (ret != ERROR_SUCCESS) {
331328
goto err;

src/java.base/windows/native/libnet/NTLMAuthSequence.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ static jfieldID ntlm_ctxHandleID;
4747
static jfieldID ntlm_crdHandleID;
4848
static jfieldID status_seqCompleteID;
4949

50-
// static HINSTANCE lib = NULL;
51-
5250
JNIEXPORT void JNICALL Java_sun_net_www_protocol_http_ntlm_NTLMAuthSequence_initFirst
5351
(JNIEnv *env, jclass authseq_clazz, jclass status_clazz)
5452
{

0 commit comments

Comments
 (0)