diff options
author | Narayan Kamath <narayan@google.com> | 2014-03-27 14:22:47 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-03-27 14:22:47 +0000 |
commit | ecd072161ec57ba8dfb26659511c0f6605601560 (patch) | |
tree | 5ed526d3b7f3a1c6532c90fca9bb57c8364e589a | |
parent | afd8b17fa1fc15d06dc4ade7fc365e0a157c9b53 (diff) | |
parent | 22d074643ed0d010ebfdb0fca685d65eb2632e58 (diff) | |
download | frameworks_base-ecd072161ec57ba8dfb26659511c0f6605601560.zip frameworks_base-ecd072161ec57ba8dfb26659511c0f6605601560.tar.gz frameworks_base-ecd072161ec57ba8dfb26659511c0f6605601560.tar.bz2 |
resolved conflicts for merge of 22d07464 to master
Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d
-rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 10 | ||||
-rw-r--r-- | core/jni/android_net_LocalSocketImpl.cpp | 6 | ||||
-rw-r--r-- | core/jni/android_nio_utils.cpp | 2 | ||||
-rw-r--r-- | core/jni/android_os_Debug.cpp | 6 | ||||
-rw-r--r-- | core/jni/android_server_NetworkManagementSocketTagger.cpp | 4 | ||||
-rw-r--r-- | core/jni/android_text_AndroidBidi.cpp | 2 | ||||
-rw-r--r-- | core/jni/android_text_AndroidCharacter.cpp | 15 | ||||
-rw-r--r-- | core/jni/android_text_format_Time.cpp | 66 | ||||
-rw-r--r-- | core/jni/android_util_Log.cpp | 2 | ||||
-rw-r--r-- | libs/androidfw/BackupData.cpp | 8 | ||||
-rw-r--r-- | libs/androidfw/BackupHelpers.cpp | 21 | ||||
-rw-r--r-- | libs/androidfw/CursorWindow.cpp | 4 | ||||
-rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 6 | ||||
-rw-r--r-- | libs/common_time/common_time_server.cpp | 2 | ||||
-rw-r--r-- | libs/common_time/utils.cpp | 4 | ||||
-rw-r--r-- | libs/hwui/ResourceCache.cpp | 4 | ||||
-rw-r--r-- | libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c | 12 | ||||
-rw-r--r-- | services/core/jni/com_android_server_AlarmManagerService.cpp | 4 |
18 files changed, 94 insertions, 84 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index 144ac39..5db083a 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -70,7 +70,7 @@ void TextLayoutCache::operator()(TextLayoutCacheKey& text, sp<TextLayoutValue>& size_t totalSizeToDelete = text.getSize() + desc->getSize(); mSize -= totalSizeToDelete; if (mDebugEnabled) { - ALOGD("Cache value %p deleted, size = %d", desc.get(), totalSizeToDelete); + ALOGD("Cache value %p deleted, size = %zu", desc.get(), totalSizeToDelete); } } @@ -130,7 +130,7 @@ sp<TextLayoutValue> TextLayoutCache::getValue(const SkPaint* paint, bool removedOne = mCache.removeOldest(); LOG_ALWAYS_FATAL_IF(!removedOne, "The cache is non-empty but we " "failed to remove the oldest entry. " - "mSize = %u, size = %u, mMaxSize = %u, mCache.size() = %u", + "mSize = %u, size = %zu, mMaxSize = %u, mCache.size() = %zu", mSize, size, mMaxSize, mCache.size()); } } @@ -149,7 +149,7 @@ sp<TextLayoutValue> TextLayoutCache::getValue(const SkPaint* paint, nsecs_t totalTime = systemTime(SYSTEM_TIME_MONOTONIC) - startTime; ALOGD("CACHE MISS: Added entry %p " "with start = %d, count = %d, contextCount = %d, " - "entry size %d bytes, remaining space %d bytes" + "entry size %zu bytes, remaining space %d bytes" " - Compute time %0.6f ms - Put time %0.6f ms - Text = '%s'", value.get(), start, count, contextCount, size, mMaxSize - mSize, value->getElapsedTime() * 0.000001f, @@ -160,7 +160,7 @@ sp<TextLayoutValue> TextLayoutCache::getValue(const SkPaint* paint, if (mDebugEnabled) { ALOGD("CACHE MISS: Calculated but not storing entry because it is too big " "with start = %d, count = %d, contextCount = %d, " - "entry size %d bytes, remaining space %d bytes" + "entry size %zu bytes, remaining space %d bytes" " - Compute time %0.6f ms - Text = '%s'", start, count, contextCount, size, mMaxSize - mSize, value->getElapsedTime() * 0.000001f, @@ -205,7 +205,7 @@ void TextLayoutCache::dumpCacheStats() { ALOGD("------------------------------------------------"); ALOGD("pid : %d", getpid()); ALOGD("running : %.0f seconds", timeRunningInSec); - ALOGD("entries : %d", cacheSize); + ALOGD("entries : %zu", cacheSize); ALOGD("max size : %d bytes", mMaxSize); ALOGD("used : %d bytes according to mSize", mSize); ALOGD("remaining : %d bytes or %2.2f percent", mMaxSize - mSize, remainingPercent); diff --git a/core/jni/android_net_LocalSocketImpl.cpp b/core/jni/android_net_LocalSocketImpl.cpp index 9f79f74..98f4bed 100644 --- a/core/jni/android_net_LocalSocketImpl.cpp +++ b/core/jni/android_net_LocalSocketImpl.cpp @@ -111,7 +111,7 @@ socket_bind_local (JNIEnv *env, jobject object, jobject fileDescriptor, /* private native void listen_native(int fd, int backlog) throws IOException; */ static void -socket_listen (JNIEnv *env, jobject object, jobject fileDescriptor, int backlog) +socket_listen (JNIEnv *env, jobject object, jobject fileDescriptor, jint backlog) { int ret; int fd; @@ -231,7 +231,7 @@ java_opt_to_real(int optID, int* opt, int* level) } static jint -socket_getOption(JNIEnv *env, jobject object, jobject fileDescriptor, int optID) +socket_getOption(JNIEnv *env, jobject object, jobject fileDescriptor, jint optID) { int ret, value; int opt, level; @@ -279,7 +279,7 @@ socket_getOption(JNIEnv *env, jobject object, jobject fileDescriptor, int optID) } static void socket_setOption( - JNIEnv *env, jobject object, jobject fileDescriptor, int optID, + JNIEnv *env, jobject object, jobject fileDescriptor, jint optID, jint boolValue, jint intValue) { int ret; int optname; diff --git a/core/jni/android_nio_utils.cpp b/core/jni/android_nio_utils.cpp index 7cbbe12..59d6e41 100644 --- a/core/jni/android_nio_utils.cpp +++ b/core/jni/android_nio_utils.cpp @@ -37,7 +37,7 @@ void* android::nio_getPointer(JNIEnv *_env, jobject buffer, jarray *array) { gNioJNI.getBasePointerID, buffer); if (pointer != 0L) { *array = NULL; - return (void *) (jint) pointer; + return reinterpret_cast<void *>(pointer); } *array = (jarray) _env->CallStaticObjectMethod(gNioJNI.nioAccessClass, diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index a041693..d4873d6 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -800,7 +800,7 @@ static void dumpNativeHeap(FILE* fp) fprintf(fp, "Total memory: %zu\n", totalMemory); fprintf(fp, "Allocation records: %zd\n", recordCount); if (backtraceSize != BACKTRACE_SIZE) { - fprintf(fp, "WARNING: mismatched backtrace sizes (%d vs. %d)\n", + fprintf(fp, "WARNING: mismatched backtrace sizes (%zu vs. %d)\n", backtraceSize, BACKTRACE_SIZE); } fprintf(fp, "\n"); @@ -823,7 +823,11 @@ static void dumpNativeHeap(FILE* fp) if (backtrace[bt] == 0) { break; } else { +#ifdef __LP64__ + fprintf(fp, " %016x", backtrace[bt]); +#else fprintf(fp, " %08x", backtrace[bt]); +#endif } } fprintf(fp, "\n"); diff --git a/core/jni/android_server_NetworkManagementSocketTagger.cpp b/core/jni/android_server_NetworkManagementSocketTagger.cpp index 12beff7..7e12b1e 100644 --- a/core/jni/android_server_NetworkManagementSocketTagger.cpp +++ b/core/jni/android_server_NetworkManagementSocketTagger.cpp @@ -47,8 +47,8 @@ static jint QTagUid_tagSocketFd(JNIEnv* env, jclass, return (jint)res; } -static int QTagUid_untagSocketFd(JNIEnv* env, jclass, - jobject fileDescriptor) { +static jint QTagUid_untagSocketFd(JNIEnv* env, jclass, + jobject fileDescriptor) { int userFd = jniGetFDFromFileDescriptor(env, fileDescriptor); if (env->ExceptionOccurred() != NULL) { diff --git a/core/jni/android_text_AndroidBidi.cpp b/core/jni/android_text_AndroidBidi.cpp index d50a69f..6f7ee49 100644 --- a/core/jni/android_text_AndroidBidi.cpp +++ b/core/jni/android_text_AndroidBidi.cpp @@ -26,7 +26,7 @@ namespace android { static jint runBidi(JNIEnv* env, jobject obj, jint dir, jcharArray chsArray, - jbyteArray infoArray, int n, jboolean haveInfo) + jbyteArray infoArray, jint n, jboolean haveInfo) { // Parameters are checked on java side // Failures from GetXXXArrayElements indicate a serious out-of-memory condition diff --git a/core/jni/android_text_AndroidCharacter.cpp b/core/jni/android_text_AndroidCharacter.cpp index 8b85a7b7..94bd40f 100644 --- a/core/jni/android_text_AndroidCharacter.cpp +++ b/core/jni/android_text_AndroidCharacter.cpp @@ -51,7 +51,8 @@ static int directionality_map[U_CHAR_DIRECTION_COUNT] = { namespace android { -static void getDirectionalities(JNIEnv* env, jobject obj, jcharArray srcArray, jbyteArray destArray, int count) +static void getDirectionalities(JNIEnv* env, jobject obj, jcharArray srcArray, + jbyteArray destArray, jint count) { ScopedCharArrayRO src(env, srcArray); if (src.get() == NULL) { @@ -102,7 +103,7 @@ static jint getEastAsianWidth(JNIEnv* env, jobject obj, jchar input) } static void getEastAsianWidths(JNIEnv* env, jobject obj, jcharArray srcArray, - int start, int count, jbyteArray destArray) + jint start, jint count, jbyteArray destArray) { ScopedCharArrayRO src(env, srcArray); if (src.get() == NULL) { @@ -144,20 +145,20 @@ static void getEastAsianWidths(JNIEnv* env, jobject obj, jcharArray srcArray, } } -static jboolean mirror(JNIEnv* env, jobject obj, jcharArray charArray, int start, int count) +static jboolean mirror(JNIEnv* env, jobject obj, jcharArray charArray, jint start, jint count) { ScopedCharArrayRW data(env, charArray); if (data.get() == NULL) { - return false; + return JNI_FALSE; } if (start < 0 || start > start + count || env->GetArrayLength(charArray) < start + count) { jniThrowException(env, "java/lang/ArrayIndexOutOfBoundsException", NULL); - return false; + return JNI_FALSE; } - bool ret = false; + jboolean ret = JNI_FALSE; for (int i = start; i < start + count; i++) { // XXX this thinks it knows that surrogates are never mirrored @@ -166,7 +167,7 @@ static jboolean mirror(JNIEnv* env, jobject obj, jcharArray charArray, int start if (c1 != c2) { data[i] = c2; - ret = true; + ret = JNI_TRUE; } } return ret; diff --git a/core/jni/android_text_format_Time.cpp b/core/jni/android_text_format_Time.cpp index aa2c5f39..28a8a5d 100644 --- a/core/jni/android_text_format_Time.cpp +++ b/core/jni/android_text_format_Time.cpp @@ -117,7 +117,7 @@ static jlong android_text_format_Time_normalize(JNIEnv* env, jobject This, time2java(env, This, t); RELEASE_TIMEZONE(This, t) - return result; + return static_cast<jlong>(result); } static void android_text_format_Time_switchTimezone(JNIEnv* env, jobject This, @@ -155,7 +155,7 @@ static jint android_text_format_Time_compare(JNIEnv* env, jobject clazz, RELEASE_TIMEZONE(aObject, a) RELEASE_TIMEZONE(bObject, b) - return result; + return static_cast<jint>(result); } static jstring android_text_format_Time_format2445(JNIEnv* env, jobject This) @@ -346,7 +346,7 @@ static jlong android_text_format_Time_toMillis(JNIEnv* env, jobject This, RELEASE_TIMEZONE(This, t) - return result; + return static_cast<jlong>(result); } static void android_text_format_Time_set(JNIEnv* env, jobject This, jlong millis) @@ -400,10 +400,10 @@ static jboolean android_text_format_Time_parse(JNIEnv* env, jobject This, jstrin if (len < 8) { jniThrowException(env, "android/util/TimeFormatException", "String too short -- expected at least 8 characters."); - return false; + return JNI_FALSE; } - jboolean inUtc = false; + jboolean inUtc = JNI_FALSE; ScopedStringChars s(env, strObj); @@ -414,49 +414,49 @@ static jboolean android_text_format_Time_parse(JNIEnv* env, jobject This, jstrin n += get_char(env, s, 1, 100, &thrown); n += get_char(env, s, 2, 10, &thrown); n += get_char(env, s, 3, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_yearField, n); // month n = get_char(env, s, 4, 10, &thrown); n += get_char(env, s, 5, 1, &thrown); n--; - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_monField, n); // day of month n = get_char(env, s, 6, 10, &thrown); n += get_char(env, s, 7, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_mdayField, n); if (len > 8) { // T - if (!check_char(env, s, 8, 'T')) return false; + if (!check_char(env, s, 8, 'T')) return JNI_FALSE; env->SetBooleanField(This, g_allDayField, JNI_FALSE); // hour n = get_char(env, s, 9, 10, &thrown); n += get_char(env, s, 10, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_hourField, n); // min n = get_char(env, s, 11, 10, &thrown); n += get_char(env, s, 12, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_minField, n); // sec n = get_char(env, s, 13, 10, &thrown); n += get_char(env, s, 14, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_secField, n); if (len > 15) { // Z - if (!check_char(env, s, 15, 'Z')) return false; - inUtc = true; + if (!check_char(env, s, 15, 'Z')) return JNI_FALSE; + inUtc = JNI_TRUE; } } else { env->SetBooleanField(This, g_allDayField, JNI_TRUE); @@ -481,10 +481,10 @@ static jboolean android_text_format_Time_parse3339(JNIEnv* env, if (len < 10) { jniThrowException(env, "android/util/TimeFormatException", "String too short --- expected at least 10 characters."); - return false; + return JNI_FALSE; } - jboolean inUtc = false; + jboolean inUtc = JNI_FALSE; ScopedStringChars s(env, strObj); @@ -495,57 +495,57 @@ static jboolean android_text_format_Time_parse3339(JNIEnv* env, n += get_char(env, s, 1, 100, &thrown); n += get_char(env, s, 2, 10, &thrown); n += get_char(env, s, 3, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_yearField, n); // - - if (!check_char(env, s, 4, '-')) return false; + if (!check_char(env, s, 4, '-')) return JNI_FALSE; // month n = get_char(env, s, 5, 10, &thrown); n += get_char(env, s, 6, 1, &thrown); --n; - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_monField, n); // - - if (!check_char(env, s, 7, '-')) return false; + if (!check_char(env, s, 7, '-')) return JNI_FALSE; // day n = get_char(env, s, 8, 10, &thrown); n += get_char(env, s, 9, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_mdayField, n); if (len >= 19) { // T - if (!check_char(env, s, 10, 'T')) return false; + if (!check_char(env, s, 10, 'T')) return JNI_FALSE; env->SetBooleanField(This, g_allDayField, JNI_FALSE); // hour n = get_char(env, s, 11, 10, &thrown); n += get_char(env, s, 12, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; int hour = n; // env->SetIntField(This, g_hourField, n); // : - if (!check_char(env, s, 13, ':')) return false; + if (!check_char(env, s, 13, ':')) return JNI_FALSE; // minute n = get_char(env, s, 14, 10, &thrown); n += get_char(env, s, 15, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; int minute = n; // env->SetIntField(This, g_minField, n); // : - if (!check_char(env, s, 16, ':')) return false; + if (!check_char(env, s, 16, ':')) return JNI_FALSE; // second n = get_char(env, s, 17, 10, &thrown); n += get_char(env, s, 18, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; env->SetIntField(This, g_secField, n); // skip the '.XYZ' -- we don't care about subsecond precision. @@ -579,32 +579,32 @@ static jboolean android_text_format_Time_parse3339(JNIEnv* env, jniThrowExceptionFmt(env, "android/util/TimeFormatException", "Unexpected character 0x%02x at position %d. Expected + or -", c, tz_index); - return false; + return JNI_FALSE; } - inUtc = true; + inUtc = JNI_TRUE; if (offset != 0) { if (len < tz_index + 6) { jniThrowExceptionFmt(env, "android/util/TimeFormatException", "Unexpected length; should be %d characters", tz_index + 6); - return false; + return JNI_FALSE; } // hour n = get_char(env, s, tz_index + 1, 10, &thrown); n += get_char(env, s, tz_index + 2, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; n *= offset; hour += n; // : - if (!check_char(env, s, tz_index + 3, ':')) return false; + if (!check_char(env, s, tz_index + 3, ':')) return JNI_FALSE; // minute n = get_char(env, s, tz_index + 4, 10, &thrown); n += get_char(env, s, tz_index + 5, 1, &thrown); - if (thrown) return false; + if (thrown) return JNI_FALSE; n *= offset; minute += n; } diff --git a/core/jni/android_util_Log.cpp b/core/jni/android_util_Log.cpp index 536a582..93dcbef 100644 --- a/core/jni/android_util_Log.cpp +++ b/core/jni/android_util_Log.cpp @@ -85,7 +85,7 @@ static jboolean android_util_Log_isLoggable(JNIEnv* env, jobject clazz, jstring jboolean result = false; if ((strlen(chars)+sizeof(LOG_NAMESPACE)) > PROPERTY_KEY_MAX) { char buf2[200]; - snprintf(buf2, sizeof(buf2), "Log tag \"%s\" exceeds limit of %d characters\n", + snprintf(buf2, sizeof(buf2), "Log tag \"%s\" exceeds limit of %zu characters\n", chars, PROPERTY_KEY_MAX - sizeof(LOG_NAMESPACE)); jniThrowException(env, "java/lang/IllegalArgumentException", buf2); diff --git a/libs/androidfw/BackupData.cpp b/libs/androidfw/BackupData.cpp index a5b9416..d16d5498 100644 --- a/libs/androidfw/BackupData.cpp +++ b/libs/androidfw/BackupData.cpp @@ -79,7 +79,7 @@ BackupDataWriter::write_padding_for(int n) paddingSize = padding_extra(n); if (paddingSize > 0) { uint32_t padding = 0xbcbcbcbc; - if (DEBUG) ALOGI("writing %d padding bytes for %d", paddingSize, n); + if (DEBUG) ALOGI("writing %zd padding bytes for %d", paddingSize, n); amt = write(m_fd, &padding, paddingSize); if (amt != paddingSize) { m_status = errno; @@ -113,7 +113,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) k = key; } if (DEBUG) { - ALOGD("Writing header: prefix='%s' key='%s' dataSize=%d", m_keyPrefix.string(), + ALOGD("Writing header: prefix='%s' key='%s' dataSize=%zu", m_keyPrefix.string(), key.string(), dataSize); } @@ -126,7 +126,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) header.keyLen = tolel(keyLen); header.dataSize = tolel(dataSize); - if (DEBUG) ALOGI("writing entity header, %d bytes", sizeof(entity_header_v1)); + if (DEBUG) ALOGI("writing entity header, %zu bytes", sizeof(entity_header_v1)); amt = write(m_fd, &header, sizeof(entity_header_v1)); if (amt != sizeof(entity_header_v1)) { m_status = errno; @@ -134,7 +134,7 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) } m_pos += amt; - if (DEBUG) ALOGI("writing entity header key, %d bytes", keyLen+1); + if (DEBUG) ALOGI("writing entity header key, %zd bytes", keyLen+1); amt = write(m_fd, k.string(), keyLen+1); if (amt != keyLen+1) { m_status = errno; diff --git a/libs/androidfw/BackupHelpers.cpp b/libs/androidfw/BackupHelpers.cpp index ab837ad..52dce9f 100644 --- a/libs/androidfw/BackupHelpers.cpp +++ b/libs/androidfw/BackupHelpers.cpp @@ -639,7 +639,7 @@ int write_tarfile(const String8& packageName, const String8& domain, // size header -- calc len in digits by actually rendering the number // to a string - brute force but simple - snprintf(sizeStr, sizeof(sizeStr), "%lld", s.st_size); + snprintf(sizeStr, sizeof(sizeStr), "%lld", (long long)s.st_size); p += write_pax_header_entry(p, "size", sizeStr); // fullname was generated above with the ustar paths @@ -661,7 +661,7 @@ int write_tarfile(const String8& packageName, const String8& domain, // [ 124 : 12 ] size of pax extended header data memset(paxHeader + 124, 0, 12); - snprintf(paxHeader + 124, 12, "%011o", p - paxData); + snprintf(paxHeader + 124, 12, "%011o", (unsigned int)(p - paxData)); // Checksum and write the pax block header calc_tar_checksum(paxHeader); @@ -681,7 +681,10 @@ int write_tarfile(const String8& packageName, const String8& domain, if (!isdir) { off64_t toWrite = s.st_size; while (toWrite > 0) { - size_t toRead = (toWrite < BUFSIZE) ? toWrite : BUFSIZE; + size_t toRead = toWrite; + if (toRead > BUFSIZE) { + toRead = BUFSIZE; + } ssize_t nRead = read(fd, buf, toRead); if (nRead < 0) { err = errno; @@ -1095,8 +1098,8 @@ backup_helper_test_four() if (name != filenames[i] || states[i].modTime_sec != state.modTime_sec || states[i].modTime_nsec != state.modTime_nsec || states[i].mode != state.mode || states[i].size != state.size || states[i].crc32 != states[i].crc32) { - fprintf(stderr, "state %zu expected={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n" - " actual={%d/%d, 0x%08x, %04o, 0x%08x, %3zu} '%s'\n", i, + fprintf(stderr, "state %zu expected={%d/%d, %04o, 0x%08x, 0x%08x, %3zu} '%s'\n" + " actual={%d/%d, %04o, 0x%08x, 0x%08x, %3d} '%s'\n", i, states[i].modTime_sec, states[i].modTime_nsec, states[i].mode, states[i].size, states[i].crc32, name.length(), filenames[i].string(), state.modTime_sec, state.modTime_nsec, state.mode, state.size, state.crc32, @@ -1194,7 +1197,7 @@ int test_read_header_and_entity(BackupDataReader& reader, const char* str) { int err; - int bufSize = strlen(str)+1; + size_t bufSize = strlen(str)+1; char* buf = (char*)malloc(bufSize); String8 string; int cookie = 0x11111111; @@ -1229,9 +1232,9 @@ test_read_header_and_entity(BackupDataReader& reader, const char* str) err = EINVAL; goto finished; } - if ((int)actualSize != bufSize) { - fprintf(stderr, "ReadEntityHeader expected dataSize 0x%08x got 0x%08zx\n", bufSize, - actualSize); + if (actualSize != bufSize) { + fprintf(stderr, "ReadEntityHeader expected dataSize %zu got %zu\n", + bufSize, actualSize); err = EINVAL; goto finished; } diff --git a/libs/androidfw/CursorWindow.cpp b/libs/androidfw/CursorWindow.cpp index 2b74a33..166863c 100644 --- a/libs/androidfw/CursorWindow.cpp +++ b/libs/androidfw/CursorWindow.cpp @@ -210,8 +210,8 @@ uint32_t CursorWindow::alloc(size_t size, bool aligned) { uint32_t offset = mHeader->freeOffset + padding; uint32_t nextFreeOffset = offset + size; if (nextFreeOffset > mSize) { - ALOGW("Window is full: requested allocation %d bytes, " - "free space %d bytes, window size %d bytes", + ALOGW("Window is full: requested allocation %zu bytes, " + "free space %zu bytes, window size %zu bytes", size, freeSpace(), mSize); return 0; } diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 04ca81e..7616ab0 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -6251,12 +6251,12 @@ void ResTable::print(bool inclValues) const uintptr_t esize = dtohs(ent->size); if ((esize&0x3) != 0) { - printf("NON-INTEGER ResTable_entry SIZE: 0x%x\n", esize); + printf("NON-INTEGER ResTable_entry SIZE: %p\n", (void *)esize); continue; } if ((thisOffset+esize) > typeSize) { - printf("ResTable_entry OUT OF BOUNDS: 0x%x+0x%x+0x%x (size is 0x%x)\n", - entriesStart, thisOffset, esize, typeSize); + printf("ResTable_entry OUT OF BOUNDS: 0x%x+0x%x+%p (size is 0x%x)\n", + entriesStart, thisOffset, (void *)esize, typeSize); continue; } diff --git a/libs/common_time/common_time_server.cpp b/libs/common_time/common_time_server.cpp index 21e706f..3e11987 100644 --- a/libs/common_time/common_time_server.cpp +++ b/libs/common_time/common_time_server.cpp @@ -590,7 +590,7 @@ static void hexDumpToString(const uint8_t* src, size_t src_len, for (i = 0; (i < src_len) && (offset < dst_len); ++i) { int res; if (0 == (i % 16)) { - res = snprintf(dst + offset, dst_len - offset, "\n%04x :", i); + res = snprintf(dst + offset, dst_len - offset, "\n%04zx :", i); if (res < 0) break; offset += res; diff --git a/libs/common_time/utils.cpp b/libs/common_time/utils.cpp index ed2c77d..ddcdfe7 100644 --- a/libs/common_time/utils.cpp +++ b/libs/common_time/utils.cpp @@ -56,7 +56,7 @@ LogRing::LogRing(const char* header, size_t entries) , mHeader(header) { mRingBuffer = new Entry[mSize]; if (NULL == mRingBuffer) - ALOGE("Failed to allocate log ring with %u entries.", mSize); + ALOGE("Failed to allocate log ring with %zu entries.", mSize); } LogRing::~LogRing() { @@ -150,7 +150,7 @@ void LogRing::dumpLog(int fd) { localtime_r(&mRingBuffer[ndx].first_ts.tv_sec, &t); strftime(timebuf, sizeof(timebuf), kTimeFmt, &t); - res = snprintf(buf, sizeof(buf), "[%2d] %s.%03ld :: %s%s\n", + res = snprintf(buf, sizeof(buf), "[%2zu] %s.%03ld :: %s%s\n", i, timebuf, mRingBuffer[ndx].first_ts.tv_usec / 1000, mRingBuffer[ndx].s.string(), diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp index 5562f34..13a3e8e 100644 --- a/libs/hwui/ResourceCache.cpp +++ b/libs/hwui/ResourceCache.cpp @@ -31,9 +31,9 @@ void ResourceCache::logCache() { ALOGD("ResourceCache: cacheReport:"); for (size_t i = 0; i < mCache->size(); ++i) { ResourceReference* ref = mCache->valueAt(i); - ALOGD(" ResourceCache: mCache(%d): resource, ref = 0x%p, 0x%p", + ALOGD(" ResourceCache: mCache(%zu): resource, ref = 0x%p, 0x%p", i, mCache->keyAt(i), mCache->valueAt(i)); - ALOGD(" ResourceCache: mCache(%d): refCount, recycled, destroyed, type = %d, %d, %d, %d", + ALOGD(" ResourceCache: mCache(%zu): refCount, recycled, destroyed, type = %d, %d, %d, %d", i, ref->refCount, ref->recycled, ref->destroyed, ref->resourceType); } } diff --git a/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c b/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c index 06b477f..57c0320 100644 --- a/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c +++ b/libs/usb/tests/AccessoryChat/accessorychat/accessorychat.c @@ -32,7 +32,7 @@ struct usb_device *sDevice = NULL; static void* read_thread(void* arg) { - int endpoint = (int)arg; + int endpoint = (int)(uintptr_t)arg; int ret = 0; while (sDevice && ret >= 0) { @@ -52,7 +52,7 @@ static void* read_thread(void* arg) { } static void* write_thread(void* arg) { - int endpoint = (int)arg; + int endpoint = (int)(uintptr_t)arg; int ret = 0; while (ret >= 0) { @@ -136,11 +136,11 @@ static int usb_device_added(const char *devname, void* client_data) { } if ((ep1->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) { - pthread_create(&th, NULL, read_thread, (void *)ep1->bEndpointAddress); - pthread_create(&th, NULL, write_thread, (void *)ep2->bEndpointAddress); + pthread_create(&th, NULL, read_thread, (void *)(uintptr_t)ep1->bEndpointAddress); + pthread_create(&th, NULL, write_thread, (void *)(uintptr_t)ep2->bEndpointAddress); } else { - pthread_create(&th, NULL, read_thread, (void *)ep2->bEndpointAddress); - pthread_create(&th, NULL, write_thread, (void *)ep1->bEndpointAddress); + pthread_create(&th, NULL, read_thread, (void *)(uintptr_t)ep2->bEndpointAddress); + pthread_create(&th, NULL, write_thread, (void *)(uintptr_t)ep1->bEndpointAddress); } } else { printf("Found possible android device - attempting to switch to accessory mode\n"); diff --git a/services/core/jni/com_android_server_AlarmManagerService.cpp b/services/core/jni/com_android_server_AlarmManagerService.cpp index c26a516..a58b00bce 100644 --- a/services/core/jni/com_android_server_AlarmManagerService.cpp +++ b/services/core/jni/com_android_server_AlarmManagerService.cpp @@ -365,7 +365,9 @@ static void android_server_AlarmManagerService_set(JNIEnv*, jobject, jlong nativ int result = impl->set(type, &ts); if (result < 0) { - ALOGE("Unable to set alarm to %lld.%09lld: %s\n", seconds, nanoseconds, strerror(errno)); + ALOGE("Unable to set alarm to %lld.%09lld: %s\n", + static_cast<long long>(seconds), + static_cast<long long>(nanoseconds), strerror(errno)); } } |