Changeset 65219 in webkit


Ignore:
Timestamp:
Aug 11, 2010 11:31:30 PM (14 years ago)
Author:
ukai@chromium.org
Message:

2010-08-11 Fumitoshi Ukai <ukai@chromium.org>

Reviewed by Alexey Proskuryakov.

REGRESSION(65135): format specifier warnings
https://bugs.webkit.org/show_bug.cgi?id=43876

  • websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::appendToBuffer): cast size_t to unsigned long for %lu. (WebCore::WebSocketChannel::processBuffer): cast size_t to unsigned long for %lu.
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r65218 r65219  
     12010-08-11  Fumitoshi Ukai  <ukai@chromium.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        REGRESSION(65135): format specifier warnings
     6        https://bugs.webkit.org/show_bug.cgi?id=43876
     7
     8        * websockets/WebSocketChannel.cpp:
     9        (WebCore::WebSocketChannel::appendToBuffer): cast size_t to unsigned long for %lu.
     10        (WebCore::WebSocketChannel::processBuffer): cast size_t to unsigned long for %lu.
     11
    1122010-08-11  Kevin Ollivier  <kevino@theolliviers.com>
    213
  • trunk/WebCore/websockets/WebSocketChannel.cpp

    r65140 r65219  
    203203    size_t newBufferSize = m_bufferSize + len;
    204204    if (newBufferSize < m_bufferSize) {
    205         LOG(Network, "WebSocket buffer overflow (%lu+%lu)", m_bufferSize, len);
     205        LOG(Network, "WebSocket buffer overflow (%lu+%lu)", static_cast<unsigned long>(m_bufferSize), static_cast<unsigned long>(len));
    206206        return false;
    207207    }
     
    216216        return true;
    217217    }
    218     m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, String::format("WebSocket frame (at %lu bytes) is too long.", newBufferSize), 0, m_handshake.clientOrigin());
     218    m_context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, String::format("WebSocket frame (at %lu bytes) is too long.", static_cast<unsigned long>(newBufferSize)), 0, m_handshake.clientOrigin());
    219219    return false;
    220220}
     
    256256            skipBuffer(headerLength);
    257257            m_client->didConnect();
    258             LOG(Network, "remaining in read buf %lu", m_bufferSize);
     258            LOG(Network, "remaining in read buf %lu", static_cast<unsigned long>(m_bufferSize));
    259259            return m_buffer;
    260260        }
     
    278278        while (p < end) {
    279279            if (length > std::numeric_limits<size_t>::max() / 128) {
    280                 LOG(Network, "frame length overflow %lu", length);
     280                LOG(Network, "frame length overflow %lu", static_cast<unsigned long>(length));
    281281                errorFrame = true;
    282282                break;
     
    286286            unsigned int lengthMsgByte = msgByte & 0x7f;
    287287            if (newLength > std::numeric_limits<size_t>::max() - lengthMsgByte) {
    288                 LOG(Network, "frame length overflow %lu+%u", newLength, lengthMsgByte);
     288                LOG(Network, "frame length overflow %lu+%u", static_cast<unsigned long>(newLength), lengthMsgByte);
    289289                errorFrame = true;
    290290                break;
     
    292292            newLength += lengthMsgByte;
    293293            if (newLength < length) { // sanity check
    294                 LOG(Network, "frame length integer wrap %lu->%lu", length, newLength);
     294                LOG(Network, "frame length integer wrap %lu->%lu", static_cast<unsigned long>(length), static_cast<unsigned long>(newLength));
    295295                errorFrame = true;
    296296                break;
     
    302302        }
    303303        if (p + length < p) {
    304             LOG(Network, "frame buffer pointer wrap %p+%lu->%p", p, length, p + length);
     304            LOG(Network, "frame buffer pointer wrap %p+%lu->%p", p, static_cast<unsigned long>(length), p + length);
    305305            errorFrame = true;
    306306        }
Note: See TracChangeset for help on using the changeset viewer.