diff options
| author | Steve Block <steveblock@google.com> | 2012-01-06 14:13:42 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-08 11:03:26 +0000 |
| commit | 01dda204cd28fe181691b4a44a51be7e5666d0c8 (patch) | |
| tree | 99ef6d14b55ebf4e2752cd182052caad6eddc20a /libcutils | |
| parent | 36afde3387fff9eac0e6d54854b8d43fe1ebb0cc (diff) | |
| download | system_core-01dda204cd28fe181691b4a44a51be7e5666d0c8.tar.gz system_core-01dda204cd28fe181691b4a44a51be7e5666d0c8.tar.bz2 system_core-01dda204cd28fe181691b4a44a51be7e5666d0c8.zip | |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: Ibcffdcf620ebae1c389446ce8e9d908f11ac039c
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/loghack.h | 4 | ||||
| -rw-r--r-- | libcutils/properties.c | 2 | ||||
| -rw-r--r-- | libcutils/record_stream.c | 2 | ||||
| -rw-r--r-- | libcutils/sockets.c | 4 | ||||
| -rw-r--r-- | libcutils/zygote.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libcutils/loghack.h b/libcutils/loghack.h index 330e1eea..750cab09 100644 --- a/libcutils/loghack.h +++ b/libcutils/loghack.h @@ -31,8 +31,8 @@ #define ALOGD(...) ALOG("D", __VA_ARGS__) #define ALOGI(...) ALOG("I", __VA_ARGS__) #define ALOGW(...) ALOG("W", __VA_ARGS__) -#define LOGE(...) ALOG("E", __VA_ARGS__) -#define LOG_ALWAYS_FATAL(...) do { LOGE(__VA_ARGS__); exit(1); } while (0) +#define ALOGE(...) ALOG("E", __VA_ARGS__) +#define LOG_ALWAYS_FATAL(...) do { ALOGE(__VA_ARGS__); exit(1); } while (0) #endif #endif // _CUTILS_LOGHACK_H diff --git a/libcutils/properties.c b/libcutils/properties.c index e29d2616..f732ec06 100644 --- a/libcutils/properties.c +++ b/libcutils/properties.c @@ -189,7 +189,7 @@ int property_get(const char *key, char *value, const char *default_value) strcpy(value, recvBuf+1); len = strlen(value); } else { - LOGE("Got strange response to property_get request (%d)\n", + ALOGE("Got strange response to property_get request (%d)\n", recvBuf[0]); assert(0); return -1; diff --git a/libcutils/record_stream.c b/libcutils/record_stream.c index 274423b7..69949047 100644 --- a/libcutils/record_stream.c +++ b/libcutils/record_stream.c @@ -144,7 +144,7 @@ int record_stream_get_next (RecordStream *p_rs, void ** p_outRecord, && p_rs->read_end == p_rs->buffer_end ) { // this should never happen - //LOGE("max record length exceeded\n"); + //ALOGE("max record length exceeded\n"); assert (0); errno = EFBIG; return -1; diff --git a/libcutils/sockets.c b/libcutils/sockets.c index 101a382f..b5a1b3d4 100644 --- a/libcutils/sockets.c +++ b/libcutils/sockets.c @@ -30,12 +30,12 @@ bool socket_peer_is_trusted(int fd) int n = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cr, &len); if (n != 0) { - LOGE("could not get socket credentials: %s\n", strerror(errno)); + ALOGE("could not get socket credentials: %s\n", strerror(errno)); return false; } if ((cr.uid != AID_ROOT) && (cr.uid != AID_SHELL)) { - LOGE("untrusted userid on other end of socket: userid %d\n", cr.uid); + ALOGE("untrusted userid on other end of socket: userid %d\n", cr.uid); return false; } #endif diff --git a/libcutils/zygote.c b/libcutils/zygote.c index aa060c05..75ce3ba9 100644 --- a/libcutils/zygote.c +++ b/libcutils/zygote.c @@ -46,7 +46,7 @@ static int send_request(int fd, int sendStdio, int argc, const char **argv) { #ifndef HAVE_ANDROID_OS // not supported on simulator targets - //LOGE("zygote_* not supported on simulator targets"); + //ALOGE("zygote_* not supported on simulator targets"); return -1; #else /* HAVE_ANDROID_OS */ uint32_t pid; |