Revert "zip_util: temporary debugging on LFH header mismatches."

This reverts commit c68d76de51087f5cd2cd5553fd1d7d8e59502dd0.

bug: 30963384
test: treehugger only

Change-Id: Ie6d228f3dba7e47a0bf0d351dfa817790aeefde9
diff --git a/ojluni/src/main/native/zip_util.c b/ojluni/src/main/native/zip_util.c
index 36f2d26..5a2a0b8 100644
--- a/ojluni/src/main/native/zip_util.c
+++ b/ojluni/src/main/native/zip_util.c
@@ -47,8 +47,6 @@
 #include "zip_util.h"
 #include <zlib.h>
 
-#include "cutils/log.h"
-
 #ifdef _ALLBSD_SOURCE
 #define off64_t off_t
 #define mmap64 mmap
@@ -1278,40 +1276,6 @@
     MUNLOCK(zip->lock);
 }
 
-// Temporary debugging information for b/30529561. If we encounter
-// a zip file with a bad LOC header, we log :
-//
-// - the file data at the offset.
-// - the offset itself.
-// - the first PATH_MAX bytes of the path associated with the fd.
-//
-// TODO(narayan): Remove this once b/30529561 is resolved.
-void ZIP_PrintDebugInfo(jzfile *zip, jzentry *entry,
-                        const unsigned char *loc)
-{
-  ALOGE("b/30529561: Unexpected LOC header: %x", *((unsigned int*) loc));
-  ALOGE("b/30529561: Entry offset: %zd", (size_t) entry->pos);
-
-  char path[64];
-  snprintf(path, sizeof(path), "/proc/self/fd/%d", zip->zfd);
-
-  char buf[PATH_MAX];
-  ssize_t count = readlink(path, buf, PATH_MAX);
-
-  if (count == -1) {
-    ALOGE("b/30529561: readlink failed for %s (%s)", path, strerror(errno));
-    return;
-  } else if (count == PATH_MAX) {
-    // Truncate the name, we're just using this for debugging purposes
-    // anyway.
-    --count;
-  }
-
-  buf[count] = '\0';
-
-  ALOGE("b/30529561: Reading zip file %s", buf);
-}
-
 /*
  * Returns the offset of the entry data within the zip file.
  * Returns -1 if an error occurred, in which case zip->msg will
@@ -1336,10 +1300,6 @@
             return -1;
         }
         if (GETSIG(loc) != LOCSIG) {
-            // TODO(narayan): Remove this debug message once b/30529561 is
-            // sorted out satisfactorily.
-            ZIP_PrintDebugInfo(zip, entry, loc);
-
             zip->msg = "invalid LOC header (bad signature)";
             return -1;
         }