8342868: Errors related to unused code on Windows after 8339120 in core libs

Reviewed-by: naoto, jlu

Author: TheShermanTanker

src/java.base/share/native/libzip/zip_util.c

@@ -579,7 +579,9 @@ readCEN(jzfile *zip, jint knownTotal)
     jlong offset;
 #endif
     unsigned char endbuf[ENDHDR];
+#ifdef USE_MMAP
     jint endhdrlen = ENDHDR;
+#endif
     jzcell *entries;
     jint *table;
 
@@ -604,7 +606,9 @@ readCEN(jzfile *zip, jint knownTotal)
             cenoff = ZIP64_ENDOFF(end64buf);
             total = (jint)ZIP64_ENDTOT(end64buf);
             endpos = end64pos;
+#ifdef USE_MMAP
             endhdrlen = ZIP64_ENDHDR;
+#endif
         }
     }
 

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

@@ -965,29 +965,34 @@ void getNumberPart(const jchar * langtag, const jint numberStyle, WCHAR * number
 void getFixPart(const jchar * langtag, const jint numberStyle, BOOL positive, BOOL prefix, WCHAR * ret) {
     DWORD pattern = 0;
     int style = numberStyle;
-    int got = 0;
+ // int got = 0;
 
     if (positive) {
         if (style == sun_util_locale_provider_HostLocaleProviderAdapterImpl_NF_CURRENCY) {
-            got = getLocaleInfoWrapper(langtag,
+         // got =
+                  getLocaleInfoWrapper(langtag,
                 LOCALE_ICURRENCY | LOCALE_RETURN_NUMBER,
                 (LPWSTR)&pattern, sizeof(pattern));
         } else if (style == sun_util_locale_provider_HostLocaleProviderAdapterImpl_NF_PERCENT) {
-            got = getLocaleInfoWrapper(langtag,
+         // got =
+                  getLocaleInfoWrapper(langtag,
                 LOCALE_IPOSITIVEPERCENT | LOCALE_RETURN_NUMBER,
                 (LPWSTR)&pattern, sizeof(pattern));
         }
     } else {
         if (style == sun_util_locale_provider_HostLocaleProviderAdapterImpl_NF_CURRENCY) {
-            got = getLocaleInfoWrapper(langtag,
+         // got =
+                  getLocaleInfoWrapper(langtag,
                 LOCALE_INEGCURR | LOCALE_RETURN_NUMBER,
                 (LPWSTR)&pattern, sizeof(pattern));
         } else if (style == sun_util_locale_provider_HostLocaleProviderAdapterImpl_NF_PERCENT) {
-            got = getLocaleInfoWrapper(langtag,
+         // got =
+                  getLocaleInfoWrapper(langtag,
                 LOCALE_INEGATIVEPERCENT | LOCALE_RETURN_NUMBER,
                 (LPWSTR)&pattern, sizeof(pattern));
         } else {
-            got = getLocaleInfoWrapper(langtag,
+         // got =
+                  getLocaleInfoWrapper(langtag,
                 LOCALE_INEGNUMBER | LOCALE_RETURN_NUMBER,
                 (LPWSTR)&pattern, sizeof(pattern));
         }

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

@@ -232,7 +232,7 @@ static int getWinTimeZone(char *winZoneName, size_t winZoneNameBufSize)
         WCHAR stdNameInReg[MAX_ZONE_CHAR];
         TziValue tempTzi;
         WCHAR *stdNamePtr = tzi.StandardName;
-        int onlyMapID;
+     // int onlyMapID;
 
         timeType = GetTimeZoneInformation(&tzi);
         if (timeType == TIME_ZONE_ID_INVALID) {
@@ -304,7 +304,7 @@ static int getWinTimeZone(char *winZoneName, size_t winZoneNameBufSize)
          * Compare to the "Std" value of each subkey and find the entry that
          * matches the current control panel setting.
          */
-        onlyMapID = 0;
+     // onlyMapID = 0;
         for (i = 0; i < nSubKeys; ++i) {
             DWORD size = sizeof(subKeyName);
             ret = RegEnumKeyEx(hKey, i, subKeyName, &size, NULL, NULL, NULL, NULL);
@@ -325,7 +325,7 @@ static int getWinTimeZone(char *winZoneName, size_t winZoneNameBufSize)
                  * entry in the Time Zones registry.
                  */
                 RegCloseKey(hSubKey);
-                onlyMapID = 1;
+             // onlyMapID = 1;
                 ret = RegOpenKeyExW(hKey, stdNamePtr, 0, KEY_READ, (PHKEY)&hSubKey);
                 if (ret != ERROR_SUCCESS) {
                     goto err;

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

@@ -47,7 +47,7 @@ static jfieldID ntlm_ctxHandleID;
 static jfieldID ntlm_crdHandleID;
 static jfieldID status_seqCompleteID;
 
-static HINSTANCE lib = NULL;
+// static HINSTANCE lib = NULL;
 
 JNIEXPORT void JNICALL Java_sun_net_www_protocol_http_ntlm_NTLMAuthSequence_initFirst
 (JNIEnv *env, jclass authseq_clazz, jclass status_clazz)