diff options
author | Steve Block <steveblock@google.com> | 2012-01-04 19:19:03 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-04 19:23:34 +0000 |
commit | fe71a61e5b0cb666675900d206251a7c18ed944b (patch) | |
tree | e76dbede05c1e6b92ea4e05878745c6d21ed9d4b /libcutils | |
parent | 8d66c49258ac4f59bd67c23c9c914cca81f85b01 (diff) | |
download | system_core-fe71a61e5b0cb666675900d206251a7c18ed944b.zip system_core-fe71a61e5b0cb666675900d206251a7c18ed944b.tar.gz system_core-fe71a61e5b0cb666675900d206251a7c18ed944b.tar.bz2 |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: I4951baa981f09a84ce483e3d1bd0f9ebe009035f
Diffstat (limited to 'libcutils')
-rw-r--r-- | libcutils/loghack.h | 2 | ||||
-rw-r--r-- | libcutils/mq.c | 10 | ||||
-rw-r--r-- | libcutils/qtaguid.c | 8 | ||||
-rw-r--r-- | libcutils/selector.c | 6 | ||||
-rw-r--r-- | libcutils/str_parms.c | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/libcutils/loghack.h b/libcutils/loghack.h index e35f887..8b357ca 100644 --- a/libcutils/loghack.h +++ b/libcutils/loghack.h @@ -29,7 +29,7 @@ ((void)printf("cutils:" level "/" LOG_TAG ": " __VA_ARGS__)) #define ALOGV(...) ALOG("V", __VA_ARGS__) #define ALOGD(...) ALOG("D", __VA_ARGS__) -#define LOGI(...) ALOG("I", __VA_ARGS__) +#define ALOGI(...) ALOG("I", __VA_ARGS__) #define LOGW(...) ALOG("W", __VA_ARGS__) #define LOGE(...) ALOG("E", __VA_ARGS__) #define LOG_ALWAYS_FATAL(...) do { LOGE(__VA_ARGS__); exit(1); } while (0) diff --git a/libcutils/mq.c b/libcutils/mq.c index 65af198..132debd 100644 --- a/libcutils/mq.c +++ b/libcutils/mq.c @@ -374,10 +374,10 @@ static bool peerProxyRemoveConnection(void* key, void* value, void* context) { */ static void peerProxyKill(PeerProxy* peerProxy, bool errnoIsSet) { if (errnoIsSet) { - LOGI("Peer %d died. errno: %s", peerProxy->credentials.pid, + ALOGI("Peer %d died. errno: %s", peerProxy->credentials.pid, strerror(errno)); } else { - LOGI("Peer %d died.", peerProxy->credentials.pid); + ALOGI("Peer %d died.", peerProxy->credentials.pid); } // If we lost the master, we're up a creek. We can't let this happen. @@ -902,7 +902,7 @@ static void masterProxyHandleConnectionError(PeerProxy* masterProxy, peerUnlock(peer); if (peerProxy != NULL) { - LOGI("Couldn't connect to %d.", pid); + ALOGI("Couldn't connect to %d.", pid); peerProxyKill(peerProxy, false); } else { LOGW("Peer proxy for %d not found. This shouldn't happen.", pid); @@ -947,7 +947,7 @@ static bool peerProxyBufferInput(PeerProxy* peerProxy) { return false; } else if (size == 0) { // EOF. - LOGI("EOF"); + ALOGI("EOF"); peerProxyKill(peerProxy, false); return false; } else if (bufferReadComplete(in)) { @@ -1050,7 +1050,7 @@ static void masterAcceptConnection(SelectableFd* listenerFd) { credentials.uid = ucredentials.uid; credentials.gid = ucredentials.gid; - LOGI("Accepted connection from process %d.", credentials.pid); + ALOGI("Accepted connection from process %d.", credentials.pid); Peer* masterPeer = (Peer*) listenerFd->data; diff --git a/libcutils/qtaguid.c b/libcutils/qtaguid.c index fee67fd..1c57774 100644 --- a/libcutils/qtaguid.c +++ b/libcutils/qtaguid.c @@ -74,7 +74,7 @@ static int write_ctrl(const char *cmd) { savedErrno = 0; } if (res < 0) { - LOGI("Failed write_ctrl(%s) res=%d errno=%d", cmd, res, savedErrno); + ALOGI("Failed write_ctrl(%s) res=%d errno=%d", cmd, res, savedErrno); } close(fd); return -savedErrno; @@ -111,7 +111,7 @@ int qtaguid_tagSocket(int sockfd, int tag, uid_t uid) { res = write_ctrl(lineBuf); if (res < 0) { - LOGI("Tagging socket %d with tag %llx(%d) for uid %d failed errno=%d", + ALOGI("Tagging socket %d with tag %llx(%d) for uid %d failed errno=%d", sockfd, kTag, tag, uid, res); } @@ -127,7 +127,7 @@ int qtaguid_untagSocket(int sockfd) { snprintf(lineBuf, sizeof(lineBuf), "u %d", sockfd); res = write_ctrl(lineBuf); if (res < 0) { - LOGI("Untagging socket %d failed errno=%d", sockfd, res); + ALOGI("Untagging socket %d failed errno=%d", sockfd, res); } return res; @@ -156,7 +156,7 @@ int qtaguid_deleteTagData(int tag, uid_t uid) { snprintf(lineBuf, sizeof(lineBuf), "d %llu %d", kTag, uid); res = write_ctrl(lineBuf); if (res < 0) { - LOGI("Deleteing tag data with tag %llx/%d for uid %d failed with cnt=%d errno=%d", + ALOGI("Deleteing tag data with tag %llx/%d for uid %d failed with cnt=%d errno=%d", kTag, tag, uid, cnt, errno); } diff --git a/libcutils/selector.c b/libcutils/selector.c index 9aef5fa..3776bbb 100644 --- a/libcutils/selector.c +++ b/libcutils/selector.c @@ -48,7 +48,7 @@ static void eatWakeupData(SelectableFd* wakeupFd) { static char garbage[64]; if (read(wakeupFd->fd, garbage, sizeof(garbage)) < 0) { if (errno == EINTR) { - LOGI("read() interrupted."); + ALOGI("read() interrupted."); } else { LOG_ALWAYS_FATAL("This should never happen: %s", strerror(errno)); } @@ -77,7 +77,7 @@ void selectorWakeUp(Selector* selector) { static char garbage[1]; if (write(selector->wakeupPipe[1], garbage, sizeof(garbage)) < 0) { if (errno == EINTR) { - LOGI("read() interrupted."); + ALOGI("read() interrupted."); } else { LOG_ALWAYS_FATAL("This should never happen: %s", strerror(errno)); } @@ -251,7 +251,7 @@ void selectorLoop(Selector* selector) { if (result == -1) { // Abort on everything except EINTR. if (errno == EINTR) { - LOGI("select() interrupted."); + ALOGI("select() interrupted."); } else { LOG_ALWAYS_FATAL("select() error: %s", strerror(errno)); diff --git a/libcutils/str_parms.c b/libcutils/str_parms.c index 7ea65ce..14fecec 100644 --- a/libcutils/str_parms.c +++ b/libcutils/str_parms.c @@ -281,7 +281,7 @@ char *str_parms_to_str(struct str_parms *str_parms) static bool dump_entry(void *key, void *value, void *context) { - LOGI("key: '%s' value: '%s'\n", (char *)key, (char *)value); + ALOGI("key: '%s' value: '%s'\n", (char *)key, (char *)value); return true; } @@ -301,7 +301,7 @@ static void test_str_parms_str(const char *str) str_parms_dump(str_parms); out_str = str_parms_to_str(str_parms); str_parms_destroy(str_parms); - LOGI("%s: '%s' stringified is '%s'", __func__, str, out_str); + ALOGI("%s: '%s' stringified is '%s'", __func__, str, out_str); free(out_str); } |