diff options
| -rw-r--r-- | core/jni/android_database_CursorWindow.cpp | 4 | ||||
| -rw-r--r-- | core/jni/android_database_SQLiteConnection.cpp | 14 | ||||
| -rw-r--r-- | libs/androidfw/CursorWindow.cpp | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp index 5e4d6e38569b..be68c4aee278 100644 --- a/core/jni/android_database_CursorWindow.cpp +++ b/core/jni/android_database_CursorWindow.cpp @@ -466,7 +466,7 @@ static jboolean nativePutString(JNIEnv* env, jclass clazz, jlong windowPtr, return false; } - LOG_WINDOW("%d,%d is TEXT with %u bytes", row, column, sizeIncludingNull); + LOG_WINDOW("%d,%d is TEXT with %zu bytes", row, column, sizeIncludingNull); return true; } @@ -480,7 +480,7 @@ static jboolean nativePutLong(JNIEnv* env, jclass clazz, jlong windowPtr, return false; } - LOG_WINDOW("%d,%d is INTEGER 0x%016llx", row, column, value); + LOG_WINDOW("%d,%d is INTEGER %" PRId64, row, column, value); return true; } diff --git a/core/jni/android_database_SQLiteConnection.cpp b/core/jni/android_database_SQLiteConnection.cpp index 1efff7f8b0fb..d9ed07ebcfbb 100644 --- a/core/jni/android_database_SQLiteConnection.cpp +++ b/core/jni/android_database_SQLiteConnection.cpp @@ -604,12 +604,12 @@ static CopyRowResult copyRow(JNIEnv* env, CursorWindow* window, size_t sizeIncludingNull = sqlite3_column_bytes(statement, i) + 1; status = window->putString(addedRows, i, text, sizeIncludingNull); if (status) { - LOG_WINDOW("Failed allocating %u bytes for text at %d,%d, error=%d", + LOG_WINDOW("Failed allocating %zu bytes for text at %d,%d, error=%d", sizeIncludingNull, startPos + addedRows, i, status); result = CPR_FULL; break; } - LOG_WINDOW("%d,%d is TEXT with %u bytes", + LOG_WINDOW("%d,%d is TEXT with %zu bytes", startPos + addedRows, i, sizeIncludingNull); } else if (type == SQLITE_INTEGER) { // INTEGER data @@ -621,7 +621,7 @@ static CopyRowResult copyRow(JNIEnv* env, CursorWindow* window, result = CPR_FULL; break; } - LOG_WINDOW("%d,%d is INTEGER 0x%016llx", startPos + addedRows, i, value); + LOG_WINDOW("%d,%d is INTEGER %" PRId64, startPos + addedRows, i, value); } else if (type == SQLITE_FLOAT) { // FLOAT data double value = sqlite3_column_double(statement, i); @@ -639,12 +639,12 @@ static CopyRowResult copyRow(JNIEnv* env, CursorWindow* window, size_t size = sqlite3_column_bytes(statement, i); status = window->putBlob(addedRows, i, blob, size); if (status) { - LOG_WINDOW("Failed allocating %u bytes for blob at %d,%d, error=%d", + LOG_WINDOW("Failed allocating %zu bytes for blob at %d,%d, error=%d", size, startPos + addedRows, i, status); result = CPR_FULL; break; } - LOG_WINDOW("%d,%d is Blob with %u bytes", + LOG_WINDOW("%d,%d is Blob with %zu bytes", startPos + addedRows, i, size); } else if (type == SQLITE_NULL) { // NULL field @@ -756,8 +756,8 @@ static jlong nativeExecuteForCursorWindow(JNIEnv* env, jclass clazz, } } - LOG_WINDOW("Resetting statement %p after fetching %d rows and adding %d rows" - "to the window in %d bytes", + LOG_WINDOW("Resetting statement %p after fetching %d rows and adding %d rows " + "to the window in %zu bytes", statement, totalRows, addedRows, window->size() - window->freeSpace()); sqlite3_reset(statement); diff --git a/libs/androidfw/CursorWindow.cpp b/libs/androidfw/CursorWindow.cpp index e1067fcd4d3d..6f05cbd0ebb3 100644 --- a/libs/androidfw/CursorWindow.cpp +++ b/libs/androidfw/CursorWindow.cpp @@ -69,7 +69,7 @@ status_t CursorWindow::create(const String8& name, size_t size, CursorWindow** o result = window->clear(); if (!result) { LOG_WINDOW("Created new CursorWindow: freeOffset=%d, " - "numRows=%d, numColumns=%d, mSize=%d, mData=%p", + "numRows=%d, numColumns=%d, mSize=%zu, mData=%p", window->mHeader->freeOffset, window->mHeader->numRows, window->mHeader->numColumns, @@ -124,7 +124,7 @@ status_t CursorWindow::createFromParcel(Parcel* parcel, CursorWindow** outCursor CursorWindow* window = new CursorWindow(name, dupAshmemFd, data, size, true /*readOnly*/); LOG_WINDOW("Created CursorWindow from parcel: freeOffset=%d, " - "numRows=%d, numColumns=%d, mSize=%d, mData=%p", + "numRows=%d, numColumns=%d, mSize=%zu, mData=%p", window->mHeader->freeOffset, window->mHeader->numRows, window->mHeader->numColumns, @@ -200,7 +200,7 @@ status_t CursorWindow::allocRow() { FieldSlot* fieldDir = static_cast<FieldSlot*>(offsetToPtr(fieldDirOffset)); memset(fieldDir, 0, fieldDirSize); - LOG_WINDOW("Allocated row %u, rowSlot is at offset %u, fieldDir is %d bytes at offset %u\n", + LOG_WINDOW("Allocated row %u, rowSlot is at offset %u, fieldDir is %zu bytes at offset %u\n", mHeader->numRows - 1, offsetFromPtr(rowSlot), fieldDirSize, fieldDirOffset); rowSlot->offset = fieldDirOffset; return OK; |