summaryrefslogtreecommitdiffstats
path: root/cmds/installd
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-20 11:56:00 +0100
committerSteve Block <steveblock@google.com>2011-10-26 09:57:54 +0100
commit71f2cf116aab893e224056c38ab146bd1538dd3e (patch)
tree75a9162a0ea00830184b12a9ca51d3a1a040a5bb /cmds/installd
parent1da79501066a74b630c8aa138db0f86ab6c690bb (diff)
downloadframeworks_base-71f2cf116aab893e224056c38ab146bd1538dd3e.zip
frameworks_base-71f2cf116aab893e224056c38ab146bd1538dd3e.tar.gz
frameworks_base-71f2cf116aab893e224056c38ab146bd1538dd3e.tar.bz2
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
Diffstat (limited to 'cmds/installd')
-rw-r--r--cmds/installd/commands.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 26b9113..34c0c2a 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -237,7 +237,7 @@ int move_dex(const char *src, const char *dst)
if (create_cache_path(src_dex, src)) return -1;
if (create_cache_path(dst_dex, dst)) return -1;
- LOGV("move %s -> %s\n", src_dex, dst_dex);
+ ALOGV("move %s -> %s\n", src_dex, dst_dex);
if (rename(src_dex, dst_dex) < 0) {
LOGE("Couldn't move %s: %s\n", src_dex, strerror(errno));
return -1;
@@ -253,7 +253,7 @@ int rm_dex(const char *path)
if (validate_apk_path(path)) return -1;
if (create_cache_path(dex_path, path)) return -1;
- LOGV("unlink %s\n", dex_path);
+ ALOGV("unlink %s\n", dex_path);
if (unlink(dex_path) < 0) {
LOGE("Couldn't unlink %s: %s\n", dex_path, strerror(errno));
return -1;
@@ -463,7 +463,7 @@ static int wait_dexopt(pid_t pid, const char* apk_path)
}
if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
- LOGV("DexInv: --- END '%s' (success) ---\n", apk_path);
+ ALOGV("DexInv: --- END '%s' (success) ---\n", apk_path);
return 0;
} else {
LOGW("DexInv: --- END '%s' --- status=0x%04x, process failed\n",
@@ -530,7 +530,7 @@ int dexopt(const char *apk_path, uid_t uid, int is_public)
goto fail;
}
- LOGV("DexInv: --- BEGIN '%s' ---\n", apk_path);
+ ALOGV("DexInv: --- BEGIN '%s' ---\n", apk_path);
pid_t pid;
pid = fork();
@@ -598,7 +598,7 @@ void mkinnerdirs(char* path, int basepos, mode_t mode, int uid, int gid,
if (path[basepos] == '/') {
path[basepos] = 0;
if (lstat(path, statbuf) < 0) {
- LOGV("Making directory: %s\n", path);
+ ALOGV("Making directory: %s\n", path);
if (mkdir(path, mode) == 0) {
chown(path, uid, gid);
} else {
@@ -630,7 +630,7 @@ int movefileordir(char* srcpath, char* dstpath, int dstbasepos,
if ((statbuf->st_mode&S_IFDIR) == 0) {
mkinnerdirs(dstpath, dstbasepos, S_IRWXU|S_IRWXG|S_IXOTH,
dstuid, dstgid, statbuf);
- LOGV("Renaming %s to %s (uid %d)\n", srcpath, dstpath, dstuid);
+ ALOGV("Renaming %s to %s (uid %d)\n", srcpath, dstpath, dstuid);
if (rename(srcpath, dstpath) >= 0) {
if (chown(dstpath, dstuid, dstgid) < 0) {
LOGE("cannot chown %s: %s\n", dstpath, strerror(errno));
@@ -739,7 +739,7 @@ int movefiles()
}
if (bufi < bufe) {
buf[bufi] = 0;
- LOGV("Processing line: %s\n", buf+bufp);
+ ALOGV("Processing line: %s\n", buf+bufp);
hasspace = 0;
while (bufp < bufi && isspace(buf[bufp])) {
hasspace = 1;
@@ -754,7 +754,7 @@ int movefiles()
} else if (srcpkg[0] == 0) {
// Skip -- source package no longer exists.
} else {
- LOGV("Move file: %s (from %s to %s)\n", buf+bufp, srcpkg, dstpkg);
+ ALOGV("Move file: %s (from %s to %s)\n", buf+bufp, srcpkg, dstpkg);
if (!create_move_path(srcpath, srcpkg, buf+bufp, 0) &&
!create_move_path(dstpath, dstpkg, buf+bufp, 0)) {
movefileordir(srcpath, dstpath,
@@ -813,7 +813,7 @@ int movefiles()
div, UPDATE_COMMANDS_DIR_PREFIX, name);
}
}
- LOGV("Transfering from %s to %s: uid=%d\n",
+ ALOGV("Transfering from %s to %s: uid=%d\n",
srcpkg, dstpkg, dstuid);
}
}
@@ -840,7 +840,7 @@ int movefiles()
}
bufe += readlen;
buf[bufe] = 0;
- LOGV("Read buf: %s\n", buf);
+ ALOGV("Read buf: %s\n", buf);
}
}
close(subfd);