diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-19 12:54:24 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-19 12:54:24 +0000 |
| commit | 5827cc4bd7b381f2734d0b958f96f4cf81090f42 (patch) | |
| tree | f7676a915b0286b24182622ca26c642e45f48c91 /logcat | |
| parent | 39d33d8d54ba55e49f9b430f842647a84751cb85 (diff) | |
| download | system_core-5827cc4bd7b381f2734d0b958f96f4cf81090f42.tar.gz system_core-5827cc4bd7b381f2734d0b958f96f4cf81090f42.tar.bz2 system_core-5827cc4bd7b381f2734d0b958f96f4cf81090f42.zip | |
Revert "libcutils: Fix aliasing violations"
This reverts commit 826d75fb6dcefe8a6c6d4d54a7d215553945812a.
Breaking build with 4.2
bionic/libc/include/string.h:105:33: error: call to '__memcpy_dest_size_error' declared with attribute error: memcpy called with size bigger than destination
bionic/libc/include/string.h:109:32: error: call to '__memcpy_src_size_error' declared with attribute error: memcpy called with size bigger than source
Change-Id: I777e5f5cd87fb972c833ef6bd81b23cd29878e9b
Diffstat (limited to 'logcat')
| -rw-r--r-- | logcat/logcat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp index 8938e3a0..f9c77eaf 100644 --- a/logcat/logcat.cpp +++ b/logcat/logcat.cpp @@ -669,14 +669,14 @@ int main(int argc, char **argv) } if (!devices) { - devices = new log_device_t(strdup("/dev/" LOGGER_LOG_MAIN), false, 'm'); + devices = new log_device_t(strdup("/dev/"LOGGER_LOG_MAIN), false, 'm'); android::g_devCount = 1; int accessmode = (mode & O_RDONLY) ? R_OK : 0 | (mode & O_WRONLY) ? W_OK : 0; // only add this if it's available - if (0 == access("/dev/" LOGGER_LOG_SYSTEM, accessmode)) { - devices->next = new log_device_t(strdup("/dev/" LOGGER_LOG_SYSTEM), false, 's'); + if (0 == access("/dev/"LOGGER_LOG_SYSTEM, accessmode)) { + devices->next = new log_device_t(strdup("/dev/"LOGGER_LOG_SYSTEM), false, 's'); android::g_devCount++; } } |