diff options
Diffstat (limited to 'libdex/DexFile.cpp')
| -rw-r--r-- | libdex/DexFile.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libdex/DexFile.cpp b/libdex/DexFile.cpp index da9affc29..b38bfca87 100644 --- a/libdex/DexFile.cpp +++ b/libdex/DexFile.cpp @@ -195,7 +195,7 @@ static void classLookupAdd(DexFile* pDexFile, DexClassLookup* pLookup, probes++; } //if (probes > 1) - // LOGW("classLookupAdd: probes=%d\n", probes); + // LOGW("classLookupAdd: probes=%d", probes); pLookup->table[idx].classDescriptorHash = hash; pLookup->table[idx].classDescriptorOffset = stringOff; @@ -294,7 +294,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags) int result = -1; if (length < sizeof(DexHeader)) { - LOGE("too short to be a valid .dex\n"); + LOGE("too short to be a valid .dex"); goto bail; /* bad file format */ } @@ -309,13 +309,13 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags) if (memcmp(data, DEX_OPT_MAGIC, 4) == 0) { magic = data; if (memcmp(magic+4, DEX_OPT_MAGIC_VERS, 4) != 0) { - LOGE("bad opt version (0x%02x %02x %02x %02x)\n", + LOGE("bad opt version (0x%02x %02x %02x %02x)", magic[4], magic[5], magic[6], magic[7]); goto bail; } pDexFile->pOptHeader = (const DexOptHeader*) data; - LOGV("Good opt header, DEX offset is %d, flags=0x%02x\n", + LOGV("Good opt header, DEX offset is %d, flags=0x%02x", pDexFile->pOptHeader->dexOffset, pDexFile->pOptHeader->flags); /* parse the optimized dex file tables */ @@ -326,7 +326,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags) data += pDexFile->pOptHeader->dexOffset; length -= pDexFile->pOptHeader->dexOffset; if (pDexFile->pOptHeader->dexLength > length) { - LOGE("File truncated? stored len=%d, rem len=%d\n", + LOGE("File truncated? stored len=%d, rem len=%d", pDexFile->pOptHeader->dexLength, (int) length); goto bail; } @@ -348,24 +348,24 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags) if (flags & kDexParseVerifyChecksum) { u4 adler = dexComputeChecksum(pHeader); if (adler != pHeader->checksum) { - LOGE("ERROR: bad checksum (%08x vs %08x)\n", + LOGE("ERROR: bad checksum (%08x vs %08x)", adler, pHeader->checksum); if (!(flags & kDexParseContinueOnError)) goto bail; } else { - LOGV("+++ adler32 checksum (%08x) verified\n", adler); + LOGV("+++ adler32 checksum (%08x) verified", adler); } const DexOptHeader* pOptHeader = pDexFile->pOptHeader; if (pOptHeader != NULL) { adler = dexComputeOptChecksum(pOptHeader); if (adler != pOptHeader->checksum) { - LOGE("ERROR: bad opt checksum (%08x vs %08x)\n", + LOGE("ERROR: bad opt checksum (%08x vs %08x)", adler, pOptHeader->checksum); if (!(flags & kDexParseContinueOnError)) goto bail; } else { - LOGV("+++ adler32 opt checksum (%08x) verified\n", adler); + LOGV("+++ adler32 opt checksum (%08x) verified", adler); } } } @@ -385,25 +385,25 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags) if (memcmp(sha1Digest, pHeader->signature, kSHA1DigestLen) != 0) { char tmpBuf1[kSHA1DigestOutputLen]; char tmpBuf2[kSHA1DigestOutputLen]; - LOGE("ERROR: bad SHA1 digest (%s vs %s)\n", + LOGE("ERROR: bad SHA1 digest (%s vs %s)", dexSHA1DigestToStr(sha1Digest, tmpBuf1), dexSHA1DigestToStr(pHeader->signature, tmpBuf2)); if (!(flags & kDexParseContinueOnError)) goto bail; } else { - LOGV("+++ sha1 digest verified\n"); + LOGV("+++ sha1 digest verified"); } } if (pHeader->fileSize != length) { - LOGE("ERROR: stored file size (%d) != expected (%d)\n", + LOGE("ERROR: stored file size (%d) != expected (%d)", (int) pHeader->fileSize, (int) length); if (!(flags & kDexParseContinueOnError)) goto bail; } if (pHeader->classDefsSize == 0) { - LOGE("ERROR: DEX file has no classes in it, failing\n"); + LOGE("ERROR: DEX file has no classes in it, failing"); goto bail; } @@ -516,7 +516,7 @@ size_t dexGetDexCodeSize(const DexCode* pCode) const u1* handlerData = dexGetCatchHandlerData(pCode); - //LOGD("+++ pCode=%p handlerData=%p last offset=%d\n", + //LOGD("+++ pCode=%p handlerData=%p last offset=%d", // pCode, handlerData, offset); /* return the size of the catch handler + everything before it */ |