freebsd-ports/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc
Tobias Kortkamp 7017780305 databases/libdrizzle-redux: Fix build with Clang 6
libdrizzle/binlog.cc:319:48: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
                          "packet size error:%"PRIu32":%"PRIu32, con->packet_size, binlog_event->length);
                                               ^

http://beefy12.nyi.freebsd.org/data/head-amd64-default/p479076_s338486/logs/errors/libdrizzle-redux-5.1.4_2.log

PR:		230958
Approved by:	jim@ohlste.in (maintainer timeout, 2 weeks)
2018-09-10 15:20:46 +00:00

20 lines
1.3 KiB
C++

--- libdrizzle/binlog.cc.orig 2018-08-27 19:29:31 UTC
+++ libdrizzle/binlog.cc
@@ -316,7 +316,7 @@ drizzle_return_t drizzle_state_binlog_read(drizzle_st
if (con->packet_size != binlog_event->length)
{
drizzle_set_error(con, "drizzle_state_binlog_read",
- "packet size error:%"PRIu32":%"PRIu32, con->packet_size, binlog_event->length);
+ "packet size error:%" PRIu32 ":%" PRIu32, con->packet_size, binlog_event->length);
con->binlog->error_fn(DRIZZLE_RETURN_UNEXPECTED_DATA, con, con->binlog->binlog_context);
return DRIZZLE_RETURN_UNEXPECTED_DATA;
}
@@ -374,7 +374,7 @@ drizzle_return_t drizzle_state_binlog_read(drizzle_st
event_crc= (uint32_t)crc32(0, binlog_event->raw_data, (binlog_event->raw_length - DRIZZLE_BINLOG_CRC32_LEN));
if (event_crc != binlog_event->checksum)
{
- drizzle_set_error(con, __func__, "CRC doesn't match: 0x%"PRIX32", 0x%"PRIX32, event_crc, binlog_event->checksum);
+ drizzle_set_error(con, __func__, "CRC doesn't match: 0x%" PRIX32 ", 0x%" PRIX32, event_crc, binlog_event->checksum);
con->binlog->error_fn(DRIZZLE_RETURN_BINLOG_CRC, con, con->binlog->binlog_context);
return DRIZZLE_RETURN_BINLOG_CRC;
}