Commit 8e8be7c2 by Nicolas Capens

Fix string format specifiers.

Bug 15387371 Change-Id: I0f86d5ddcef0c2b6fc45164c730eb55f44c5c490 Reviewed-on: https://swiftshader-review.googlesource.com/4492Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent c4748c50
...@@ -42,7 +42,7 @@ bool ValidateSerialNumber( const char* inSerialNumber, const char* checksum_key, ...@@ -42,7 +42,7 @@ bool ValidateSerialNumber( const char* inSerialNumber, const char* checksum_key,
long long serial_number; long long serial_number;
sscanf( decrypted_serial, "%2s%10llx%4x", dummy_prefix, &serial_number, &actual_checksum); sscanf( decrypted_serial, "%2s%10llx%4lx", dummy_prefix, &serial_number, &actual_checksum);
strcpy(working_buffer, checksum_key); strcpy(working_buffer, checksum_key);
strcat(working_buffer, decrypted_serial); strcat(working_buffer, decrypted_serial);
working_buffer[strlen(checksum_key) + PREFIX_LENGTH + ROOT_LENGTH] = '\0'; working_buffer[strlen(checksum_key) + PREFIX_LENGTH + ROOT_LENGTH] = '\0';
......
...@@ -174,7 +174,7 @@ StreamingIndexBuffer::StreamingIndexBuffer(unsigned int initialSize) : mBufferSi ...@@ -174,7 +174,7 @@ StreamingIndexBuffer::StreamingIndexBuffer(unsigned int initialSize) : mBufferSi
if(!mIndexBuffer) if(!mIndexBuffer)
{ {
ERR("Out of memory allocating an index buffer of size %lu.", initialSize); ERR("Out of memory allocating an index buffer of size %u.", initialSize);
} }
} }
...@@ -234,7 +234,7 @@ void StreamingIndexBuffer::reserveSpace(unsigned int requiredSpace, GLenum type) ...@@ -234,7 +234,7 @@ void StreamingIndexBuffer::reserveSpace(unsigned int requiredSpace, GLenum type)
if(!mIndexBuffer) if(!mIndexBuffer)
{ {
ERR("Out of memory allocating an index buffer of size %lu.", mBufferSize); ERR("Out of memory allocating an index buffer of size %u.", mBufferSize);
} }
mWritePosition = 0; mWritePosition = 0;
......
...@@ -217,7 +217,7 @@ VertexBuffer::VertexBuffer(unsigned int size) : mVertexBuffer(NULL) ...@@ -217,7 +217,7 @@ VertexBuffer::VertexBuffer(unsigned int size) : mVertexBuffer(NULL)
if(!mVertexBuffer) if(!mVertexBuffer)
{ {
ERR("Out of memory allocating a vertex buffer of size %lu.", size); ERR("Out of memory allocating a vertex buffer of size %u.", size);
} }
} }
} }
...@@ -310,7 +310,7 @@ void StreamingVertexBuffer::reserveRequiredSpace() ...@@ -310,7 +310,7 @@ void StreamingVertexBuffer::reserveRequiredSpace()
if(!mVertexBuffer) if(!mVertexBuffer)
{ {
ERR("Out of memory allocating a vertex buffer of size %lu.", mBufferSize); ERR("Out of memory allocating a vertex buffer of size %u.", mBufferSize);
} }
mWritePosition = 0; mWritePosition = 0;
......
...@@ -156,7 +156,7 @@ StreamingIndexBuffer::StreamingIndexBuffer(unsigned int initialSize) : mBufferSi ...@@ -156,7 +156,7 @@ StreamingIndexBuffer::StreamingIndexBuffer(unsigned int initialSize) : mBufferSi
if(!mIndexBuffer) if(!mIndexBuffer)
{ {
ERR("Out of memory allocating an index buffer of size %lu.", initialSize); ERR("Out of memory allocating an index buffer of size %u.", initialSize);
} }
} }
...@@ -216,7 +216,7 @@ void StreamingIndexBuffer::reserveSpace(unsigned int requiredSpace, GLenum type) ...@@ -216,7 +216,7 @@ void StreamingIndexBuffer::reserveSpace(unsigned int requiredSpace, GLenum type)
if(!mIndexBuffer) if(!mIndexBuffer)
{ {
ERR("Out of memory allocating an index buffer of size %lu.", mBufferSize); ERR("Out of memory allocating an index buffer of size %u.", mBufferSize);
} }
mWritePosition = 0; mWritePosition = 0;
......
...@@ -211,7 +211,7 @@ VertexBuffer::VertexBuffer(unsigned int size) : mVertexBuffer(NULL) ...@@ -211,7 +211,7 @@ VertexBuffer::VertexBuffer(unsigned int size) : mVertexBuffer(NULL)
if(!mVertexBuffer) if(!mVertexBuffer)
{ {
ERR("Out of memory allocating a vertex buffer of size %lu.", size); ERR("Out of memory allocating a vertex buffer of size %u.", size);
} }
} }
} }
...@@ -304,7 +304,7 @@ void StreamingVertexBuffer::reserveRequiredSpace() ...@@ -304,7 +304,7 @@ void StreamingVertexBuffer::reserveRequiredSpace()
if(!mVertexBuffer) if(!mVertexBuffer)
{ {
ERR("Out of memory allocating a vertex buffer of size %lu.", mBufferSize); ERR("Out of memory allocating a vertex buffer of size %u.", mBufferSize);
} }
mWritePosition = 0; mWritePosition = 0;
......
...@@ -170,7 +170,7 @@ StreamingIndexBuffer::StreamingIndexBuffer(unsigned int initialSize) : mIndexBuf ...@@ -170,7 +170,7 @@ StreamingIndexBuffer::StreamingIndexBuffer(unsigned int initialSize) : mIndexBuf
if(!mIndexBuffer) if(!mIndexBuffer)
{ {
ERR("Out of memory allocating an index buffer of size %lu.", initialSize); ERR("Out of memory allocating an index buffer of size %u.", initialSize);
} }
} }
...@@ -230,7 +230,7 @@ void StreamingIndexBuffer::reserveSpace(unsigned int requiredSpace, GLenum type) ...@@ -230,7 +230,7 @@ void StreamingIndexBuffer::reserveSpace(unsigned int requiredSpace, GLenum type)
if(!mIndexBuffer) if(!mIndexBuffer)
{ {
ERR("Out of memory allocating an index buffer of size %lu.", mBufferSize); ERR("Out of memory allocating an index buffer of size %u.", mBufferSize);
} }
mWritePosition = 0; mWritePosition = 0;
......
...@@ -225,7 +225,7 @@ VertexBuffer::VertexBuffer(unsigned int size) : mVertexBuffer(NULL) ...@@ -225,7 +225,7 @@ VertexBuffer::VertexBuffer(unsigned int size) : mVertexBuffer(NULL)
if(!mVertexBuffer) if(!mVertexBuffer)
{ {
ERR("Out of memory allocating a vertex buffer of size %lu.", size); ERR("Out of memory allocating a vertex buffer of size %u.", size);
} }
} }
} }
...@@ -318,7 +318,7 @@ void StreamingVertexBuffer::reserveRequiredSpace() ...@@ -318,7 +318,7 @@ void StreamingVertexBuffer::reserveRequiredSpace()
if(!mVertexBuffer) if(!mVertexBuffer)
{ {
ERR("Out of memory allocating a vertex buffer of size %lu.", mBufferSize); ERR("Out of memory allocating a vertex buffer of size %u.", mBufferSize);
} }
mWritePosition = 0; mWritePosition = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment