[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] [pecl-database-mysql_xdevapi] release/8.0.30: Fix compiler warnings.
From:       Rafal Somla <noreply () php ! net>
Date:       2022-07-26 10:54:16
Message-ID: aj5jJCoYO8jEYq1FHLj4Qu9qZOzccJH0ShJU9Ldyb8 () main ! php ! net
[Download RAW message or body]

Author: Rafal Somla (rsomla1)
Pusher: hramilison
Date: 2022-06-27T11:40:59+02:00

Commit: https://github.com/php/pecl-database-mysql_xdevapi/commit/2b2441983c18e61848755369cf1966cc4ed96c71
 Raw diff: https://github.com/php/pecl-database-mysql_xdevapi/commit/2b2441983c18e61848755369cf1966cc4ed96c71.diff


Fix compiler warnings.

Changed paths:
  M  mysqlx_exception.cc
  M  xmysqlnd/xmysqlnd_wireprotocol.cc


Diff:

diff --git a/mysqlx_exception.cc b/mysqlx_exception.cc
index 928f8c7c..54fee828 100644
--- a/mysqlx_exception.cc
+++ b/mysqlx_exception.cc
@@ -129,7 +129,7 @@ create_exception(int code, const util::string_view& sql_state, \
const util::strin  {
 	char* msg{nullptr};
 	DBG_ENTER("create_exception");
-	mnd_sprintf(&msg, 0, "[%*s] %*s", sql_state.length(), sql_state.data(), \
message.length(), message.data()); +	mnd_sprintf(&msg, 0, "[%*s] %*s", \
(int)sql_state.length(), sql_state.data(), message.length(), message.data());  if \
(msg) {  zend_throw_exception(mysqlx_exception_class_entry, msg, code);
 		mnd_efree(msg);
diff --git a/xmysqlnd/xmysqlnd_wireprotocol.cc b/xmysqlnd/xmysqlnd_wireprotocol.cc
index ce6e5b86..db07ba81 100644
--- a/xmysqlnd/xmysqlnd_wireprotocol.cc
+++ b/xmysqlnd/xmysqlnd_wireprotocol.cc
@@ -383,7 +383,13 @@ xmysqlnd_send_message(
 	char stack_buffer[SIZE_OF_STACK_BUFFER];
 	void* payload = stack_buffer;
 
-	const size_t payload_size = message.ByteSize();
+	const size_t payload_size =
+#if GOOGLE_PROTOBUF_VERSION < 3006001
+	message.ByteSize();
+#else
+	message.ByteSizeLong();
+#endif
+
 	if (payload_size > sizeof(stack_buffer)) {
 		payload = payload_size? mnd_emalloc(payload_size) : nullptr;
 		if (payload_size && !payload) {

-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]