diff options
author | Dan Bornstein <danfuzz@android.com> | 2011-05-26 10:11:58 -0700 |
---|---|---|
committer | Dan Bornstein <danfuzz@android.com> | 2011-05-26 10:11:58 -0700 |
commit | 60fc806b679a3655c228b4093058c59941a49cfe (patch) | |
tree | 06b08460aa3a4c5a56b553b6cb90a0f607beef18 /vm/JarFile.cpp | |
parent | d9d1a8685a394c7fd67d87aa52e826b88c981994 (diff) | |
download | android_dalvik-60fc806b679a3655c228b4093058c59941a49cfe.tar.gz android_dalvik-60fc806b679a3655c228b4093058c59941a49cfe.tar.bz2 android_dalvik-60fc806b679a3655c228b4093058c59941a49cfe.zip |
Further conservation of newlines.
Friends don't let friends end LOG() strings with newlines.
Change-Id: I5a18c766c90c4ab5f03caa6acd601d34d91beb00
Diffstat (limited to 'vm/JarFile.cpp')
-rw-r--r-- | vm/JarFile.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/vm/JarFile.cpp b/vm/JarFile.cpp index 0288fef6a..05042771f 100644 --- a/vm/JarFile.cpp +++ b/vm/JarFile.cpp @@ -73,7 +73,7 @@ static int openAlternateSuffix(const char *fileName, const char *suffix, *pCachedName = buf; return fd; } - LOGV("Couldn't open %s: %s\n", buf, strerror(errno)); + LOGV("Couldn't open %s: %s", buf, strerror(errno)); bail: free(buf); return -1; @@ -116,7 +116,7 @@ DexCacheStatus dvmDexCacheStatus(const char *fileName) * See if there's an up-to-date copy of the optimized dex * in the cache, but don't create one if there isn't. */ - LOGV("dvmDexCacheStatus: Checking cache for %s\n", fileName); + LOGV("dvmDexCacheStatus: Checking cache for %s", fileName); cachedName = dexOptGenerateCacheFileName(fileName, kDexInJarName); if (cachedName == NULL) return DEX_CACHE_BAD_ARCHIVE; @@ -125,7 +125,7 @@ DexCacheStatus dvmDexCacheStatus(const char *fileName) dexGetZipEntryModTime(&archive, entry), dexGetZipEntryCrc32(&archive, entry), /*isBootstrap=*/false, &newFile, /*createIfMissing=*/false); - LOGV("dvmOpenCachedDexFile returned fd %d\n", fd); + LOGV("dvmOpenCachedDexFile returned fd %d", fd); if (fd < 0) { result = DEX_CACHE_STALE; goto bail; @@ -136,7 +136,7 @@ DexCacheStatus dvmDexCacheStatus(const char *fileName) */ if (!dvmUnlockCachedDexFile(fd)) { /* uh oh -- this process needs to exit or we'll wedge the system */ - LOGE("Unable to unlock DEX file\n"); + LOGE("Unable to unlock DEX file"); goto bail; } @@ -156,14 +156,14 @@ DexCacheStatus dvmDexCacheStatus(const char *fileName) goto bail; } - LOGV("Using alternate file (odex) for %s ...\n", fileName); + LOGV("Using alternate file (odex) for %s ...", fileName); if (!dvmCheckOptHeaderAndDependencies(fd, false, 0, 0, true, true)) { - LOGE("%s odex has stale dependencies\n", fileName); - LOGE("odex source not available -- failing\n"); + LOGE("%s odex has stale dependencies", fileName); + LOGE("odex source not available -- failing"); result = DEX_CACHE_STALE_ODEX; goto bail; } else { - LOGV("%s odex has good dependencies\n", fileName); + LOGV("%s odex has good dependencies", fileName); } } result = DEX_CACHE_OK; @@ -217,16 +217,16 @@ int dvmJarFileOpen(const char* fileName, const char* odexOutputName, */ fd = openAlternateSuffix(fileName, "odex", O_RDONLY, &cachedName); if (fd >= 0) { - LOGV("Using alternate file (odex) for %s ...\n", fileName); + LOGV("Using alternate file (odex) for %s ...", fileName); if (!dvmCheckOptHeaderAndDependencies(fd, false, 0, 0, true, true)) { - LOGE("%s odex has stale dependencies\n", fileName); + LOGE("%s odex has stale dependencies", fileName); free(cachedName); cachedName = NULL; close(fd); fd = -1; goto tryArchive; } else { - LOGV("%s odex has good dependencies\n", fileName); + LOGV("%s odex has good dependencies", fileName); //TODO: make sure that the .odex actually corresponds // to the classes.dex inside the archive (if present). // For typical use there will be no classes.dex. @@ -262,14 +262,14 @@ tryArchive: } else { cachedName = strdup(odexOutputName); } - LOGV("dvmJarFileOpen: Checking cache for %s (%s)\n", + LOGV("dvmJarFileOpen: Checking cache for %s (%s)", fileName, cachedName); fd = dvmOpenCachedDexFile(fileName, cachedName, dexGetZipEntryModTime(&archive, entry), dexGetZipEntryCrc32(&archive, entry), isBootstrap, &newFile, /*createIfMissing=*/true); if (fd < 0) { - LOGI("Unable to open or create cache for %s (%s)\n", + LOGI("Unable to open or create cache for %s (%s)", fileName, cachedName); goto bail; } @@ -304,13 +304,13 @@ tryArchive: } if (!result) { - LOGE("Unable to extract+optimize DEX from '%s'\n", + LOGE("Unable to extract+optimize DEX from '%s'", fileName); goto bail; } endWhen = dvmGetRelativeTimeUsec(); - LOGD("DEX prep '%s': unzip in %dms, rewrite %dms\n", + LOGD("DEX prep '%s': unzip in %dms, rewrite %dms", fileName, (int) (extractWhen - startWhen) / 1000, (int) (endWhen - extractWhen) / 1000); @@ -327,7 +327,7 @@ tryArchive: * doesn't have to be seeked anywhere in particular. */ if (dvmDexFileOpenFromFd(fd, &pDvmDex) != 0) { - LOGI("Unable to map %s in %s\n", kDexInJarName, fileName); + LOGI("Unable to map %s in %s", kDexInJarName, fileName); goto bail; } @@ -335,13 +335,13 @@ tryArchive: /* unlock the fd */ if (!dvmUnlockCachedDexFile(fd)) { /* uh oh -- this process needs to exit or we'll wedge the system */ - LOGE("Unable to unlock DEX file\n"); + LOGE("Unable to unlock DEX file"); goto bail; } locked = false; } - LOGV("Successfully opened '%s' in '%s'\n", kDexInJarName, fileName); + LOGV("Successfully opened '%s' in '%s'", kDexInJarName, fileName); *ppJarFile = (JarFile*) calloc(1, sizeof(JarFile)); (*ppJarFile)->archive = archive; |