Changeset 185807 in webkit


Ignore:
Timestamp:
Jun 21, 2015, 6:15:57 AM (10 years ago)
Author:
Michael Catanzaro
Message:

Fix format strings in NetworkCache.cpp and NetworkCacheStatistics.cpp and WebIDBServerConnection.cpp
​https://bugs.webkit.org/show_bug.cgi?id=146172

Reviewed by Darin Adler.

Use the correct %"PRIu64" and %"PRIi64" for uint64_t and int64_t, instead of %llu and %lli.

  • NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::retrieve):

  • NetworkProcess/cache/NetworkCacheStatistics.cpp:

(WebKit::NetworkCache::Statistics::initialize):
(WebKit::NetworkCache::Statistics::recordNotUsingCacheForRequest):
(WebKit::NetworkCache::Statistics::recordRetrievalFailure):
(WebKit::NetworkCache::Statistics::recordRetrievedCachedEntry):
(WebKit::NetworkCache::Statistics::recordRevalidationSuccess):

  • WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:

(WebKit::WebIDBServerConnection::deleteDatabase):
(WebKit::WebIDBServerConnection::didDeleteDatabase):
(WebKit::WebIDBServerConnection::getOrEstablishIDBDatabaseMetadata):
(WebKit::WebIDBServerConnection::didGetOrEstablishIDBDatabaseMetadata):
(WebKit::WebIDBServerConnection::openTransaction):
(WebKit::WebIDBServerConnection::didOpenTransaction):
(WebKit::WebIDBServerConnection::beginTransaction):
(WebKit::WebIDBServerConnection::didBeginTransaction):
(WebKit::WebIDBServerConnection::commitTransaction):
(WebKit::WebIDBServerConnection::didCommitTransaction):
(WebKit::WebIDBServerConnection::resetTransaction):
(WebKit::WebIDBServerConnection::didResetTransaction):
(WebKit::WebIDBServerConnection::rollbackTransaction):
(WebKit::WebIDBServerConnection::didRollbackTransaction):
(WebKit::WebIDBServerConnection::createObjectStore):
(WebKit::WebIDBServerConnection::didCreateObjectStore):
(WebKit::WebIDBServerConnection::createIndex):
(WebKit::WebIDBServerConnection::didCreateIndex):
(WebKit::WebIDBServerConnection::deleteIndex):
(WebKit::WebIDBServerConnection::didDeleteIndex):
(WebKit::WebIDBServerConnection::get):
(WebKit::WebIDBServerConnection::put):
(WebKit::WebIDBServerConnection::didPutRecord):
(WebKit::WebIDBServerConnection::didGetRecord):
(WebKit::WebIDBServerConnection::didOpenCursor):
(WebKit::WebIDBServerConnection::didAdvanceCursor):
(WebKit::WebIDBServerConnection::didIterateCursor):
(WebKit::WebIDBServerConnection::count):
(WebKit::WebIDBServerConnection::didCount):
(WebKit::WebIDBServerConnection::deleteRange):
(WebKit::WebIDBServerConnection::didDeleteRange):
(WebKit::WebIDBServerConnection::clearObjectStore):
(WebKit::WebIDBServerConnection::didClearObjectStore):
(WebKit::WebIDBServerConnection::deleteObjectStore):
(WebKit::WebIDBServerConnection::didDeleteObjectStore):
(WebKit::WebIDBServerConnection::changeDatabaseVersion):
(WebKit::WebIDBServerConnection::didChangeDatabaseVersion):
(WebKit::WebIDBServerConnection::openCursor):
(WebKit::WebIDBServerConnection::cursorAdvance):
(WebKit::WebIDBServerConnection::cursorIterate):

Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r185804 r185807  
     12015-06-21  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        Fix format strings in NetworkCache.cpp and NetworkCacheStatistics.cpp and WebIDBServerConnection.cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=146172
     5
     6        Reviewed by Darin Adler.
     7
     8        Use the correct %"PRIu64" and %"PRIi64" for uint64_t and int64_t, instead of %llu and %lli.
     9
     10        * NetworkProcess/cache/NetworkCache.cpp:
     11        (WebKit::NetworkCache::Cache::retrieve):
     12        * NetworkProcess/cache/NetworkCacheStatistics.cpp:
     13        (WebKit::NetworkCache::Statistics::initialize):
     14        (WebKit::NetworkCache::Statistics::recordNotUsingCacheForRequest):
     15        (WebKit::NetworkCache::Statistics::recordRetrievalFailure):
     16        (WebKit::NetworkCache::Statistics::recordRetrievedCachedEntry):
     17        (WebKit::NetworkCache::Statistics::recordRevalidationSuccess):
     18        * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
     19        (WebKit::WebIDBServerConnection::deleteDatabase):
     20        (WebKit::WebIDBServerConnection::didDeleteDatabase):
     21        (WebKit::WebIDBServerConnection::getOrEstablishIDBDatabaseMetadata):
     22        (WebKit::WebIDBServerConnection::didGetOrEstablishIDBDatabaseMetadata):
     23        (WebKit::WebIDBServerConnection::openTransaction):
     24        (WebKit::WebIDBServerConnection::didOpenTransaction):
     25        (WebKit::WebIDBServerConnection::beginTransaction):
     26        (WebKit::WebIDBServerConnection::didBeginTransaction):
     27        (WebKit::WebIDBServerConnection::commitTransaction):
     28        (WebKit::WebIDBServerConnection::didCommitTransaction):
     29        (WebKit::WebIDBServerConnection::resetTransaction):
     30        (WebKit::WebIDBServerConnection::didResetTransaction):
     31        (WebKit::WebIDBServerConnection::rollbackTransaction):
     32        (WebKit::WebIDBServerConnection::didRollbackTransaction):
     33        (WebKit::WebIDBServerConnection::createObjectStore):
     34        (WebKit::WebIDBServerConnection::didCreateObjectStore):
     35        (WebKit::WebIDBServerConnection::createIndex):
     36        (WebKit::WebIDBServerConnection::didCreateIndex):
     37        (WebKit::WebIDBServerConnection::deleteIndex):
     38        (WebKit::WebIDBServerConnection::didDeleteIndex):
     39        (WebKit::WebIDBServerConnection::get):
     40        (WebKit::WebIDBServerConnection::put):
     41        (WebKit::WebIDBServerConnection::didPutRecord):
     42        (WebKit::WebIDBServerConnection::didGetRecord):
     43        (WebKit::WebIDBServerConnection::didOpenCursor):
     44        (WebKit::WebIDBServerConnection::didAdvanceCursor):
     45        (WebKit::WebIDBServerConnection::didIterateCursor):
     46        (WebKit::WebIDBServerConnection::count):
     47        (WebKit::WebIDBServerConnection::didCount):
     48        (WebKit::WebIDBServerConnection::deleteRange):
     49        (WebKit::WebIDBServerConnection::didDeleteRange):
     50        (WebKit::WebIDBServerConnection::clearObjectStore):
     51        (WebKit::WebIDBServerConnection::didClearObjectStore):
     52        (WebKit::WebIDBServerConnection::deleteObjectStore):
     53        (WebKit::WebIDBServerConnection::didDeleteObjectStore):
     54        (WebKit::WebIDBServerConnection::changeDatabaseVersion):
     55        (WebKit::WebIDBServerConnection::didChangeDatabaseVersion):
     56        (WebKit::WebIDBServerConnection::openCursor):
     57        (WebKit::WebIDBServerConnection::cursorAdvance):
     58        (WebKit::WebIDBServerConnection::cursorIterate):
     59
    1602015-06-20  Tim Horton  <timothy_horton@apple.com>
    261

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp

    r185704 r185807  
    378378
    379379#if !LOG_DISABLED
    380         auto elapsedMS = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count();
    381         LOG(NetworkCache, "(NetworkProcess) retrieve complete useDecision=%d priority=%u time=%lldms", useDecision, originalRequest.priority(), elapsedMS);
     380        auto elapsedMS = static_cast<int64_t>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count());
     381        LOG(NetworkCache, "(NetworkProcess) retrieve complete useDecision=%d priority=%u time=%" PRIi64 "ms", useDecision, originalRequest.priority(), elapsedMS);
    382382#endif
    383383        completionHandler(WTF::move(entry));

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp

    r185412 r185807  
    124124
    125125#if !LOG_DISABLED
    126         auto elapsedMS = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count();
     126        auto elapsedMS = static_cast<int64_t>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count());
    127127#endif
    128         LOG(NetworkCache, "(NetworkProcess) Network cache statistics database load complete, entries=%lu time=%lldms", static_cast<size_t>(m_approximateEntryCount), elapsedMS);
     128        LOG(NetworkCache, "(NetworkProcess) Network cache statistics database load complete, entries=%lu time=%" PRIi64 "ms", static_cast<size_t>(m_approximateEntryCount), elapsedMS);
    129129
    130130        if (!m_approximateEntryCount) {
    131131            bootstrapFromNetworkCache(networkCachePathCapture.string());
    132132#if !LOG_DISABLED
    133             elapsedMS = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count();
     133            elapsedMS = static_cast<int64_t>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count());
    134134#endif
    135             LOG(NetworkCache, "(NetworkProcess) Network cache statistics database bootstrapping complete, entries=%lu time=%lldms", static_cast<size_t>(m_approximateEntryCount), elapsedMS);
     135            LOG(NetworkCache, "(NetworkProcess) Network cache statistics database bootstrapping complete, entries=%lu time=%" PRIi64 "ms", static_cast<size_t>(m_approximateEntryCount), elapsedMS);
    136136        }
    137137    });
    … …  
    220220        if (wasEverRequested) {
    221221            String diagnosticKey = retrieveDecisionToDiagnosticKey(retrieveDecision);
    222             LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s was previously requested but we are not using the cache, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
     222            LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s was previously requested but we are not using the cache, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
    223223            NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::unusedKey(), diagnosticKey, WebCore::ShouldSample::Yes);
    224224        } else {
    … …  
    261261        if (wasPreviouslyRequested) {
    262262            String diagnosticKey = storeDecisionToDiagnosticKey(storeDecision.value());
    263             LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s was previously request but is not in the cache, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
     263            LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s was previously request but is not in the cache, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
    264264            NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::notInCacheKey(), diagnosticKey, WebCore::ShouldSample::Yes);
    265265        } else {
    … …  
    291291    WebCore::URL requestURL = request.url();
    292292    if (decision == UseDecision::Use) {
    293         LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s is in the cache and is used", webPageID, requestURL.string().ascii().data());
     293        LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s is in the cache and is used", webPageID, requestURL.string().ascii().data());
    294294        NetworkProcess::singleton().logDiagnosticMessageWithResult(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::retrievalKey(), WebCore::DiagnosticLoggingResultPass, WebCore::ShouldSample::Yes);
    295295        return;
    … …  
    297297
    298298    if (decision == UseDecision::Validate) {
    299         LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s is in the cache but needs revalidation", webPageID, requestURL.string().ascii().data());
     299        LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s is in the cache but needs revalidation", webPageID, requestURL.string().ascii().data());
    300300        NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::retrievalKey(), WebCore::DiagnosticLoggingKeys::needsRevalidationKey(), WebCore::ShouldSample::Yes);
    301301        return;
    … …  
    303303
    304304    String diagnosticKey = cachedEntryReuseFailureToDiagnosticKey(decision);
    305     LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s is in the cache but wasn't used, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
     305    LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s is in the cache but wasn't used, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
    306306    NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::unusableCachedEntryKey(), diagnosticKey, WebCore::ShouldSample::Yes);
    307307}
    … …  
    310310{
    311311    WebCore::URL requestURL = request.url();
    312     LOG(NetworkCache, "(NetworkProcess) webPageID %llu: %s was successfully revalidated", webPageID, requestURL.string().ascii().data());
     312    LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s was successfully revalidated", webPageID, requestURL.string().ascii().data());
    313313
    314314    NetworkProcess::singleton().logDiagnosticMessageWithResult(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::revalidatingKey(), WebCore::DiagnosticLoggingResultPass, WebCore::ShouldSample::Yes);

  • trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp

    r185631 r185807  
    9797    m_serverRequests.add(requestID, serverRequest.release());
    9898
    99     LOG(IDB, "WebProcess deleteDatabase request ID %llu", requestID);
     99    LOG(IDB, "WebProcess deleteDatabase request ID %" PRIu64, requestID);
    100100
    101101    send(Messages::DatabaseProcessIDBConnection::DeleteDatabase(requestID, name));
    … …  
    104104void WebIDBServerConnection::didDeleteDatabase(uint64_t requestID, bool success)
    105105{
    106     LOG(IDB, "WebProcess didDeleteDatabase request ID %llu", requestID);
     106    LOG(IDB, "WebProcess didDeleteDatabase request ID %" PRIu64, requestID);
    107107
    108108    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    127127    m_serverRequests.add(requestID, serverRequest.release());
    128128
    129     LOG(IDB, "WebProcess getOrEstablishIDBDatabaseMetadata request ID %llu", requestID);
     129    LOG(IDB, "WebProcess getOrEstablishIDBDatabaseMetadata request ID %" PRIu64, requestID);
    130130
    131131    send(Messages::DatabaseProcessIDBConnection::GetOrEstablishIDBDatabaseMetadata(requestID));
    … …  
    134134void WebIDBServerConnection::didGetOrEstablishIDBDatabaseMetadata(uint64_t requestID, bool success, const IDBDatabaseMetadata& metadata)
    135135{
    136     LOG(IDB, "WebProcess didGetOrEstablishIDBDatabaseMetadata request ID %llu", requestID);
     136    LOG(IDB, "WebProcess didGetOrEstablishIDBDatabaseMetadata request ID %" PRIu64, requestID);
    137137
    138138    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    170170    m_serverRequests.add(requestID, serverRequest.release());
    171171
    172     LOG(IDB, "WebProcess openTransaction ID %lli (request ID %llu)", transactionID, requestID);
     172    LOG(IDB, "WebProcess openTransaction ID %" PRIi64 " (request ID %" PRIu64 ")", transactionID, requestID);
    173173
    174174    Vector<int64_t> objectStoreIDVector;
    … …  
    179179void WebIDBServerConnection::didOpenTransaction(uint64_t requestID, bool success)
    180180{
    181     LOG(IDB, "WebProcess didOpenTransaction request ID %llu", requestID);
     181    LOG(IDB, "WebProcess didOpenTransaction request ID %" PRIu64, requestID);
    182182
    183183    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    197197    m_serverRequests.add(requestID, serverRequest.release());
    198198
    199     LOG(IDB, "WebProcess beginTransaction ID %lli (request ID %llu)", transactionID, requestID);
     199    LOG(IDB, "WebProcess beginTransaction ID %" PRIi64 " (request ID %" PRIu64 ")", transactionID, requestID);
    200200
    201201    send(Messages::DatabaseProcessIDBConnection::BeginTransaction(requestID, transactionID));
    … …  
    204204void WebIDBServerConnection::didBeginTransaction(uint64_t requestID, bool)
    205205{
    206     LOG(IDB, "WebProcess didBeginTransaction request ID %llu", requestID);
     206    LOG(IDB, "WebProcess didBeginTransaction request ID %" PRIu64, requestID);
    207207
    208208    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    226226    m_serverRequests.add(requestID, serverRequest.release());
    227227
    228     LOG(IDB, "WebProcess commitTransaction ID %lli (request ID %llu)", transactionID, requestID);
     228    LOG(IDB, "WebProcess commitTransaction ID %" PRIi64 " (request ID %" PRIu64 ")", transactionID, requestID);
    229229
    230230    send(Messages::DatabaseProcessIDBConnection::CommitTransaction(requestID, transactionID));
    … …  
    233233void WebIDBServerConnection::didCommitTransaction(uint64_t requestID, bool success)
    234234{
    235     LOG(IDB, "WebProcess didCommitTransaction request ID %llu", requestID);
     235    LOG(IDB, "WebProcess didCommitTransaction request ID %" PRIu64, requestID);
    236236
    237237    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    251251    m_serverRequests.add(requestID, serverRequest.release());
    252252
    253     LOG(IDB, "WebProcess resetTransaction ID %lli (request ID %llu)", transactionID, requestID);
     253    LOG(IDB, "WebProcess resetTransaction ID %" PRIi64 " (request ID %" PRIu64 ")", transactionID, requestID);
    254254
    255255    send(Messages::DatabaseProcessIDBConnection::ResetTransaction(requestID, transactionID));
    … …  
    258258void WebIDBServerConnection::didResetTransaction(uint64_t requestID, bool)
    259259{
    260     LOG(IDB, "WebProcess didResetTransaction request ID %llu", requestID);
     260    LOG(IDB, "WebProcess didResetTransaction request ID %" PRIu64, requestID);
    261261
    262262    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    283283    m_serverRequests.add(requestID, serverRequest.release());
    284284
    285     LOG(IDB, "WebProcess rollbackTransaction ID %lli (request ID %llu)", transactionID, requestID);
     285    LOG(IDB, "WebProcess rollbackTransaction ID %" PRIi64 " (request ID %" PRIu64 ")", transactionID, requestID);
    286286
    287287    send(Messages::DatabaseProcessIDBConnection::RollbackTransaction(requestID, transactionID));
    … …  
    290290void WebIDBServerConnection::didRollbackTransaction(uint64_t requestID, bool)
    291291{
    292     LOG(IDB, "WebProcess didRollbackTransaction request ID %llu", requestID);
     292    LOG(IDB, "WebProcess didRollbackTransaction request ID %" PRIu64, requestID);
    293293
    294294    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    324324    m_serverRequests.add(requestID, serverRequest.release());
    325325
    326     LOG(IDB, "WebProcess createObjectStore '%s' in transaction ID %llu (request ID %llu)", operation.objectStoreMetadata().name.utf8().data(), transaction.id(), requestID);
     326    LOG(IDB, "WebProcess createObjectStore '%s' in transaction ID %" PRIi64 " (request ID %" PRIu64 ")", operation.objectStoreMetadata().name.utf8().data(), transaction.id(), requestID);
    327327
    328328    send(Messages::DatabaseProcessIDBConnection::CreateObjectStore(requestID, transaction.id(), operation.objectStoreMetadata()));
    … …  
    331331void WebIDBServerConnection::didCreateObjectStore(uint64_t requestID, bool success)
    332332{
    333     LOG(IDB, "WebProcess didCreateObjectStore request ID %llu", requestID);
     333    LOG(IDB, "WebProcess didCreateObjectStore request ID %" PRIu64, requestID);
    334334
    335335    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    353353    m_serverRequests.add(requestID, serverRequest.release());
    354354
    355     LOG(IDB, "WebProcess create index request ID %llu", requestID);
     355    LOG(IDB, "WebProcess create index request ID %" PRIu64, requestID);
    356356
    357357    send(Messages::DatabaseProcessIDBConnection::CreateIndex(requestID, transaction.id(), operation.objectStoreID(), operation.idbIndexMetadata()));
    … …  
    360360void WebIDBServerConnection::didCreateIndex(uint64_t requestID, bool success)
    361361{
    362     LOG(IDB, "WebProcess didCreateIndex request ID %llu", requestID);
     362    LOG(IDB, "WebProcess didCreateIndex request ID %" PRIu64, requestID);
    363363
    364364    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    382382    m_serverRequests.add(requestID, serverRequest.release());
    383383
    384     LOG(IDB, "WebProcess delete index request ID %llu", requestID);
     384    LOG(IDB, "WebProcess delete index request ID %" PRIu64, requestID);
    385385
    386386    send(Messages::DatabaseProcessIDBConnection::DeleteIndex(requestID, transaction.id(), operation.objectStoreID(), operation.idbIndexMetadata().id));
    … …  
    389389void WebIDBServerConnection::didDeleteIndex(uint64_t requestID, bool success)
    390390{
    391     LOG(IDB, "WebProcess didDeleteIndex request ID %llu", requestID);
     391    LOG(IDB, "WebProcess didDeleteIndex request ID %" PRIu64, requestID);
    392392
    393393    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    411411    m_serverRequests.add(requestID, serverRequest.release());
    412412
    413     LOG(IDB, "WebProcess get request ID %llu", requestID);
     413    LOG(IDB, "WebProcess get request ID %" PRIu64, requestID);
    414414
    415415    ASSERT(operation.keyRange());
    … …  
    430430    m_serverRequests.add(requestID, serverRequest.release());
    431431
    432     LOG(IDB, "WebProcess put request ID %llu", requestID);
     432    LOG(IDB, "WebProcess put request ID %" PRIu64, requestID);
    433433
    434434    ASSERT(operation.value());
    … …  
    448448void WebIDBServerConnection::didPutRecord(uint64_t requestID, const WebCore::IDBKeyData& resultKey, uint32_t errorCode, const String& errorMessage)
    449449{
    450     LOG(IDB, "WebProcess didPutRecord request ID %llu (error - %s)", requestID, errorMessage.utf8().data());
     450    LOG(IDB, "WebProcess didPutRecord request ID %" PRIu64 " (error - %s)", requestID, errorMessage.utf8().data());
    451451
    452452    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    460460void WebIDBServerConnection::didGetRecord(uint64_t requestID, const WebCore::IDBGetResult& getResult, uint32_t errorCode, const String& errorMessage)
    461461{
    462     LOG(IDB, "WebProcess didGetRecord request ID %llu (error - %s)", requestID, errorMessage.utf8().data());
     462    LOG(IDB, "WebProcess didGetRecord request ID %" PRIu64 " (error - %s)", requestID, errorMessage.utf8().data());
    463463
    464464    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    472472void WebIDBServerConnection::didOpenCursor(uint64_t requestID, int64_t cursorID, const IDBKeyData& key, const IDBKeyData& primaryKey, const IPC::DataReference& valueData, uint32_t errorCode, const String& errorMessage)
    473473{
    474     LOG(IDB, "WebProcess didOpenCursor request ID %llu (error - %s)", requestID, errorMessage.utf8().data());
     474    LOG(IDB, "WebProcess didOpenCursor request ID %" PRIu64 " (error - %s)", requestID, errorMessage.utf8().data());
    475475
    476476    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    485485void WebIDBServerConnection::didAdvanceCursor(uint64_t requestID, const IDBKeyData& key, const IDBKeyData& primaryKey, const IPC::DataReference& valueData, uint32_t errorCode, const String& errorMessage)
    486486{
    487     LOG(IDB, "WebProcess didAdvanceCursor request ID %llu (error - %s)", requestID, errorMessage.utf8().data());
     487    LOG(IDB, "WebProcess didAdvanceCursor request ID %" PRIu64 " (error - %s)", requestID, errorMessage.utf8().data());
    488488
    489489    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    498498void WebIDBServerConnection::didIterateCursor(uint64_t requestID, const IDBKeyData& key, const IDBKeyData& primaryKey, const IPC::DataReference& valueData, uint32_t errorCode, const String& errorMessage)
    499499{
    500     LOG(IDB, "WebProcess didIterateCursor request ID %llu (error - %s)", requestID, errorMessage.utf8().data());
     500    LOG(IDB, "WebProcess didIterateCursor request ID %" PRIu64 " (error - %s)", requestID, errorMessage.utf8().data());
    501501
    502502    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    521521    m_serverRequests.add(requestID, serverRequest.release());
    522522
    523     LOG(IDB, "WebProcess count request ID %llu", requestID);
     523    LOG(IDB, "WebProcess count request ID %" PRIu64, requestID);
    524524
    525525    send(Messages::DatabaseProcessIDBConnection::Count(requestID, transaction.id(), operation.objectStoreID(), operation.indexID(), IDBKeyRangeData(operation.keyRange())));
    … …  
    528528void WebIDBServerConnection::didCount(uint64_t requestID, int64_t count, uint32_t errorCode, const String& errorMessage)
    529529{
    530     LOG(IDB, "WebProcess didCount %lli request ID %llu (error - %s)", count, requestID, errorMessage.utf8().data());
     530    LOG(IDB, "WebProcess didCount %" PRIi64 " request ID %" PRIu64 " (error - %s)", count, requestID, errorMessage.utf8().data());
    531531
    532532    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    550550    m_serverRequests.add(requestID, serverRequest.release());
    551551
    552     LOG(IDB, "WebProcess deleteRange request ID %llu", requestID);
     552    LOG(IDB, "WebProcess deleteRange request ID %" PRIu64, requestID);
    553553
    554554    send(Messages::DatabaseProcessIDBConnection::DeleteRange(requestID, transaction.id(), operation.objectStoreID(), IDBKeyRangeData(operation.keyRange())));
    … …  
    557557void WebIDBServerConnection::didDeleteRange(uint64_t requestID, uint32_t errorCode, const String& errorMessage)
    558558{
    559     LOG(IDB, "WebProcess didDeleteRange request ID %llu", requestID);
     559    LOG(IDB, "WebProcess didDeleteRange request ID %" PRIu64, requestID);
    560560
    561561    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    579579    m_serverRequests.add(requestID, serverRequest.release());
    580580
    581     LOG(IDB, "WebProcess clearObjectStore request ID %llu", requestID);
     581    LOG(IDB, "WebProcess clearObjectStore request ID %" PRIu64, requestID);
    582582
    583583    send(Messages::DatabaseProcessIDBConnection::ClearObjectStore(requestID, operation.transaction()->id(), operation.objectStoreID()));
    … …  
    586586void WebIDBServerConnection::didClearObjectStore(uint64_t requestID, bool success)
    587587{
    588     LOG(IDB, "WebProcess didClearObjectStore request ID %llu", requestID);
     588    LOG(IDB, "WebProcess didClearObjectStore request ID %" PRIu64, requestID);
    589589
    590590    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    608608    m_serverRequests.add(requestID, serverRequest.release());
    609609
    610     LOG(IDB, "WebProcess deleteObjectStore request ID %llu", requestID);
     610    LOG(IDB, "WebProcess deleteObjectStore request ID %" PRIu64, requestID);
    611611
    612612    send(Messages::DatabaseProcessIDBConnection::DeleteObjectStore(requestID, operation.transaction()->id(), operation.objectStoreMetadata().id));
    … …  
    615615void WebIDBServerConnection::didDeleteObjectStore(uint64_t requestID, bool success)
    616616{
    617     LOG(IDB, "WebProcess didDeleteObjectStore request ID %llu", requestID);
     617    LOG(IDB, "WebProcess didDeleteObjectStore request ID %" PRIu64, requestID);
    618618
    619619    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    637637    m_serverRequests.add(requestID, serverRequest.release());
    638638
    639     LOG(IDB, "WebProcess changeDatabaseVersion request ID %llu", requestID);
     639    LOG(IDB, "WebProcess changeDatabaseVersion request ID %" PRIu64, requestID);
    640640
    641641    send(Messages::DatabaseProcessIDBConnection::ChangeDatabaseVersion(requestID, operation.transaction()->id(), static_cast<uint64_t>(operation.version())));
    … …  
    644644void WebIDBServerConnection::didChangeDatabaseVersion(uint64_t requestID, bool success)
    645645{
    646     LOG(IDB, "WebProcess didChangeDatabaseVersion request ID %llu", requestID);
     646    LOG(IDB, "WebProcess didChangeDatabaseVersion request ID %" PRIu64, requestID);
    647647
    648648    RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
    … …  
    666666    m_serverRequests.add(requestID, serverRequest.release());
    667667
    668     LOG(IDB, "WebProcess openCursor request ID %llu", requestID);
     668    LOG(IDB, "WebProcess openCursor request ID %" PRIu64, requestID);
    669669
    670670    send(Messages::DatabaseProcessIDBConnection::OpenCursor(requestID, operation.transactionID(), operation.objectStoreID(), operation.indexID(), static_cast<int64_t>(operation.direction()), static_cast<int64_t>(operation.cursorType()), static_cast<int64_t>(operation.taskType()), operation.keyRange()));
    … …  
    683683    m_serverRequests.add(requestID, serverRequest.release());
    684684
    685     LOG(IDB, "WebProcess cursorAdvance request ID %llu", requestID);
     685    LOG(IDB, "WebProcess cursorAdvance request ID %" PRIu64, requestID);
    686686
    687687    send(Messages::DatabaseProcessIDBConnection::CursorAdvance(requestID, operation.cursorID(), operation.count()));
    … …  
    700700    m_serverRequests.add(requestID, serverRequest.release());
    701701
    702     LOG(IDB, "WebProcess cursorIterate request ID %llu", requestID);
     702    LOG(IDB, "WebProcess cursorIterate request ID %" PRIu64, requestID);
    703703
    704704    send(Messages::DatabaseProcessIDBConnection::CursorIterate(requestID, operation.cursorID(), operation.key()));
Note: See TracChangeset for help on using the changeset viewer.