# HG changeset patch
# User sdama
# Date 1528793201 -19800
# Node ID 2a524e603529d95736e6630c6d6eb2d9ba66932f
# Parent  7f166e010af44f790b56c7d75b44e72ee77d5216
8196993: Resolve disabled warnings for libunpack
Summary: captured return values and labelled as fall through to avoid unused-result and implicit-fallthrough gcc warnings
Reviewed-by: mchung

diff -r 7f166e010af4 -r 2a524e603529 make/launcher/Launcher-jdk.pack.gmk
--- a/make/launcher/Launcher-jdk.pack.gmk	Mon Jun 11 22:35:07 2018 -0400
+++ b/make/launcher/Launcher-jdk.pack.gmk	Tue Jun 12 14:16:41 2018 +0530
@@ -90,7 +90,6 @@
     CFLAGS_linux := -fPIC, \
     CFLAGS_solaris := -KPIC, \
     CFLAGS_macosx := -fPIC, \
-    DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \
     LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
         $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
diff -r 7f166e010af4 -r 2a524e603529 src/jdk.pack/share/native/common-unpack/unpack.cpp
--- a/src/jdk.pack/share/native/common-unpack/unpack.cpp	Mon Jun 11 22:35:07 2018 -0400
+++ b/src/jdk.pack/share/native/common-unpack/unpack.cpp	Tue Jun 12 14:16:41 2018 +0530
@@ -1799,6 +1799,7 @@
     case 'B': case 'H': case 'I': case 'V': // unsigned_int
     case 'S': // signed_int
       --lp; // reparse
+      /* fall through */
     case 'F':
       lp = parseIntLayout(lp, b, EK_INT);
       break;
diff -r 7f166e010af4 -r 2a524e603529 src/jdk.pack/share/native/common-unpack/zip.cpp
--- a/src/jdk.pack/share/native/common-unpack/zip.cpp	Mon Jun 11 22:35:07 2018 -0400
+++ b/src/jdk.pack/share/native/common-unpack/zip.cpp	Tue Jun 12 14:16:41 2018 +0530
@@ -533,6 +533,8 @@
   char* bufptr = (char*) buf;
   char* inbuf = u->gzin->inbuf;
   size_t inbuflen = sizeof(u->gzin->inbuf);
+  // capture return values from fread to avoid -Werror=unused-result issues
+  size_t ret = 0;
   unpacker::read_input_fn_t read_gzin_fn =
     (unpacker::read_input_fn_t) u->gzin->read_input_fn;
   z_stream& zs = *(z_stream*) u->gzin->zstream;
@@ -579,8 +581,8 @@
         fseek(u->infileptr, -TRAILER_LEN, SEEK_END);
         uint filecrc;
         uint filelen;
-        fread(&filecrc, sizeof(filecrc), 1, u->infileptr);
-        fread(&filelen, sizeof(filelen), 1, u->infileptr);
+        ret = fread(&filecrc, sizeof(filecrc), 1, u->infileptr);
+        ret = fread(&filelen, sizeof(filelen), 1, u->infileptr);
         filecrc = SWAP_INT(filecrc);
         filelen = SWAP_INT(filelen);
         if (u->gzin->gzcrc != filecrc ||